mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#60924: Move more libs to autoinstallation

Browse Source 
Change-Id: I5c136760ca59278ba6bfcd1d11c56d810e9cfa76
This commit is contained in:
Marcos Paulo de Souza
2013-04-29 14:47:05 -03:00
committed by Matúš Kukan
parent ba69c0851b
commit 6e8b24cc45
3 changed files with 21 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Repository.mk
View File

@@ -220,6 +220,7 @@ endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
avmedia \ avmedia \
$(if $(DISABLE_SCRIPTING),,basctl) \ $(if $(DISABLE_SCRIPTING),,basctl) \
basegfx \
bib \ bib \
canvastools \ canvastools \
chartcore \ chartcore \
@@ -248,7 +249,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
ept \ ept \
era \ era \
eti \ eti \
evtatt \
exp \ exp \
flat \
file \ file \
filterconfig \ filterconfig \
for \ for \
@@ -262,6 +265,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwm \ fwm \
$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
i18npool \ i18npool \
hyphen \
icd \ icd \
icg \ icg \
idx \ idx \
@@ -276,13 +280,24 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
iti \ iti \
localebe1 \ localebe1 \
lng \ lng \
lnth \
$(if $(MERGELIBS),merged) \ $(if $(MERGELIBS),merged) \
msfilter \ msfilter \
mysql \
odbc \
odbcbase \ odbcbase \
odfflatxml \
offacc \
pcr \
pdffilter \
sax \ sax \
sb \ sb \
sdbt \ sdbt \
scn \
sd \
sdd \
sdfilt \ sdfilt \
sdui \
sfx \ sfx \
sot \ sot \
$(if $(ENABLE_HEADLESS),,spl) \ $(if $(ENABLE_HEADLESS),,spl) \
@@ -291,6 +306,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
svt \ svt \
svx \ svx \
svxcore \ svxcore \
sw \
tk \ tk \
tl \ tl \
$(if $(ENABLE_TELEPATHY),tubes) \ $(if $(ENABLE_TELEPATHY),tubes) \
@@ -301,7 +317,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
uui \ uui \
vcl \ vcl \
xmlscript \ xmlscript \
xmlfa \
xmlfd \
xo \ xo \
xof \
xsltdlg \
xsltfilter \
)) ))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
@@ -329,38 +350,27 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
) \ ) \
communi \ communi \
date \ date \
evtatt \
odbc \
oox \ oox \
ooxml \ ooxml \
sdbc \ sdbc \
AppleRemote \ AppleRemote \
avmediaQuickTime \ avmediaQuickTime \
basegfx \
calc \ calc \
dbp \ dbp \
dbu \ dbu \
evoab \ evoab \
filtertracer \ filtertracer \
flash \ flash \
flat \
graphicfilter \ graphicfilter \
guesslang \ guesslang \
hyphen \
jdbc \ jdbc \
kab1 \ kab1 \
kabdrv1 \ kabdrv1 \
lnth \
log \ log \
MacOSXSpell \ MacOSXSpell \
mork \ mork \
mozab2 \ mozab2 \
mozabdrv \ mozabdrv \
mysql \
odfflatxml \
offacc \
pcr \
pdffilter \
placeware \ placeware \
pricing \ pricing \
protocolhandler \ protocolhandler \
@@ -372,11 +382,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
sc \ sc \
scd \ scd \
scfilt \ scfilt \
scn \
scui \ scui \
sd \
sdd \
sdui \
simplecm \ simplecm \
sm \ sm \
smd \ smd \
@@ -385,7 +391,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
spell \ spell \
sts \ sts \
svgfilter \ svgfilter \
sw \
tdeab1 \ tdeab1 \
tdeabdrv1 \ tdeabdrv1 \
textconversiondlgs \ textconversiondlgs \
@@ -400,11 +405,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
vclplug_kde4 \ vclplug_kde4 \
vclplug_svp \ vclplug_svp \
wpftdraw \ wpftdraw \
xmlfa \
xmlfd \
xof \
xsltdlg \
xsltfilter \
)) ))
ifneq (,$(filter ANDROID IOS,$(OS))) ifneq (,$(filter ANDROID IOS,$(OS)))

43
scp2/source/ooo/file_library_ooo.scp
View File

@@ -344,10 +344,6 @@ STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
#endif // #ifdef UNX #endif // #ifdef UNX
STD_LIB_FILE(gid_File_Lib_Evtatt, evtatt)
STD_LIB_FILE( gid_File_Lib_Flat, flat)
#ifdef WNT #ifdef WNT
File gid_File_Lib_Fps File gid_File_Lib_Fps
@@ -645,13 +641,8 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
#endif #endif
STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
// STD_LIB_FILE( gid_File_Lib_Ofa , ofa) // STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
STD_LIB_FILE( gid_File_Lib_Offacc, offacc)
#ifdef SOLAR_JAVA #ifdef SOLAR_JAVA
#ifndef MACOSX #ifndef MACOSX
@@ -675,12 +666,8 @@ STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
STD_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer ) STD_LIB_FILE( gid_File_Lib_Passwordcontainer, passwordcontainer )
STD_LIB_FILE( gid_File_Lib_Pcr, pcr)
STD_LIB_FILE( gid_File_Lib_Log, log) STD_LIB_FILE( gid_File_Lib_Log, log)
STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui) SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
#if defined ENABLE_NPAPI_FROM_BROWSER #if defined ENABLE_NPAPI_FROM_BROWSER
@@ -820,11 +807,6 @@ STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax )
STD_LIB_FILE( gid_File_Lib_Oox , oox) STD_LIB_FILE( gid_File_Lib_Oox , oox)
STD_LIB_FILE( gid_File_Lib_Scn, scn)
STD_LIB_FILE( gid_File_Lib_Sd , sd)
STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
STD_LIB_FILE( gid_File_Lib_Slideshow, slideshow ) STD_LIB_FILE( gid_File_Lib_Slideshow, slideshow )
File gid_File_Lib_Sdbc_2 File gid_File_Lib_Sdbc_2
@@ -838,8 +820,6 @@ File gid_File_Lib_Sdbc_2
#endif #endif
End End
STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
#if defined(WNT) && defined(HAVE_WINDOWS_SDK) #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
File gid_File_Lib_Instooofiltmsi File gid_File_Lib_Instooofiltmsi
@@ -881,8 +861,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs) STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
STD_LIB_FILE( gid_File_Lib_Sw , sw)
#if ! defined UNX #if ! defined UNX
File gid_File_Lib_Sysdtrans File gid_File_Lib_Sysdtrans
LIB_FILE_BODY; LIB_FILE_BODY;
@@ -977,28 +955,7 @@ STD_LIB_FILE(gid_File_Ucpext, ucpext)
STD_LIB_FILE(gid_File_Ucpcmis, ucpcmis1) STD_LIB_FILE(gid_File_Ucpcmis, ucpcmis1)
File gid_File_Lib_Lnth
LIB_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(lnth);
Dir = SCP2_OOO_BIN_DIR;
End
File gid_File_Lib_Hyph
LIB_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(hyphen);
Dir = SCP2_OOO_BIN_DIR;
End
STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
STD_LIB_FILE( gid_File_Lib_Xof, xof)
STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg )
STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter )
STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa )
STD_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd )
STD_LIB_FILE( gid_File_Lib_Textfd, textfd ) STD_LIB_FILE( gid_File_Lib_Textfd, textfd )
STD_LIB_FILE( gid_File_Lib_Odfflatxml, odfflatxml )
#ifndef SYSTEM_LIBXSLT #ifndef SYSTEM_LIBXSLT
File gid_File_Lib_Xslt File gid_File_Lib_Xslt

21
scp2/source/ooo/module_hidden_ooo.scp
View File

@@ -158,35 +158,19 @@ Module gid_Module_Root_Files_4
Files = (gid_File_Dat_Root4, Files = (gid_File_Dat_Root4,
auto_File_Lib_ALL auto_File_Lib_ALL
gid_File_Lib_Bib, gid_File_Lib_Bib,
gid_File_Lib_Flat,
gid_File_Lib_J, gid_File_Lib_J,
gid_File_Lib_Offacc,
gid_File_Lib_Oox, gid_File_Lib_Oox,
gid_File_Lib_Pcr,
gid_File_Lib_Pdffilter,
gid_File_Lib_Pl, gid_File_Lib_Pl,
gid_File_Lib_Sf_Prothdlr, gid_File_Lib_Sf_Prothdlr,
gid_File_Lib_Res, gid_File_Lib_Res,
gid_File_Lib_Scn,
gid_File_Lib_Sd,
gid_File_Lib_Sdd,
gid_File_Lib_Sdui,
gid_File_Lib_Spa, gid_File_Lib_Spa,
gid_File_Lib_AVMediaWin, gid_File_Lib_AVMediaWin,
gid_File_Lib_AVMediaGStreamer, gid_File_Lib_AVMediaGStreamer,
gid_File_Lib_AVMediaGStreamer_0_10, gid_File_Lib_AVMediaGStreamer_0_10,
gid_File_Lib_BaseGfx,
gid_File_Lib_Sysdtrans, gid_File_Lib_Sysdtrans,
gid_File_Lib_Sw,
gid_File_Lib_TextConversionDlgs, gid_File_Lib_TextConversionDlgs,
gid_File_Lib_Acc, gid_File_Lib_Acc,
gid_File_Lib_BaseBmp, gid_File_Lib_BaseBmp,
gid_File_Lib_Xmlfa,
gid_File_Lib_Xmlfd,
gid_File_Lib_Xof,
gid_File_Lib_Xsltdlg,
gid_File_Lib_Xsltfilter,
gid_File_Lib_Odfflatxml,
gid_File_Lib_Zip, gid_File_Lib_Zip,
gid_File_Lib_Vclplug_Gen, gid_File_Lib_Vclplug_Gen,
gid_File_Lib_Vclplug_Tde, gid_File_Lib_Vclplug_Tde,
@@ -231,7 +215,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Kab_Drv_1, gid_File_Lib_Kab_Drv_1,
gid_File_Lib_Macab_1, gid_File_Lib_Macab_1,
gid_File_Lib_Macab_Drv_1, gid_File_Lib_Macab_Drv_1,
gid_File_Lib_Evtatt,
gid_File_Lib_I18nsearch, gid_File_Lib_I18nsearch,
gid_File_Lib_Icudata, gid_File_Lib_Icudata,
gid_File_Lib_Icui18n, gid_File_Lib_Icui18n,
@@ -246,8 +229,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Mork, gid_File_Lib_Mork,
gid_File_Lib_Mozabdrv, gid_File_Lib_Mozabdrv,
gid_File_Lib_Mozbootstrap, gid_File_Lib_Mozbootstrap,
gid_File_Lib_Mysql,
gid_File_Lib_Odbc,
gid_File_Lib_Officebean, gid_File_Lib_Officebean,
gid_File_Lib_Openssl, gid_File_Lib_Openssl,
gid_File_Lib_DeploymentGui, gid_File_Lib_DeploymentGui,
@@ -548,7 +529,5 @@ Module gid_Module_Oo_Linguistic
Default = YES; Default = YES;
Styles = (HIDDEN_ROOT); Styles = (HIDDEN_ROOT);
Files = (gid_File_Lib_Spell, Files = (gid_File_Lib_Spell,
gid_File_Lib_Hyph,
gid_File_Lib_Lnth,
gid_File_Share_Registry_Lingucomponent_Xcd); gid_File_Share_Registry_Lingucomponent_Xcd);
End End