[Libreoffice-commits] core.git: Repository.mk scp2/source
Marcos Paulo de Souza
marcos.souza.org at gmail.com
Fri May 3 02:24:01 PDT 2013
Repository.mk | 42 ++++++++++++++++-----------------
scp2/source/ooo/file_library_ooo.scp | 43 ----------------------------------
scp2/source/ooo/module_hidden_ooo.scp | 21 ----------------
3 files changed, 21 insertions(+), 85 deletions(-)
New commits:
commit 6e8b24cc45c1f59a8c0ce6529a211331ee4f2a3e
Author: Marcos Paulo de Souza <marcos.souza.org at gmail.com>
Date: Mon Apr 29 14:47:05 2013 -0300
fdo#60924: Move more libs to autoinstallation
Change-Id: I5c136760ca59278ba6bfcd1d11c56d810e9cfa76
diff --git a/Repository.mk b/Repository.mk
index b221f6d..d771646 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -220,6 +220,7 @@ endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
avmedia \
$(if $(DISABLE_SCRIPTING),,basctl) \
+ basegfx \
bib \
canvastools \
chartcore \
@@ -248,7 +249,9 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
ept \
era \
eti \
+ evtatt \
exp \
+ flat \
file \
filterconfig \
for \
@@ -262,6 +265,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
fwm \
$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
i18npool \
+ hyphen \
icd \
icg \
idx \
@@ -276,13 +280,24 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
iti \
localebe1 \
lng \
+ lnth \
$(if $(MERGELIBS),merged) \
msfilter \
+ mysql \
+ odbc \
odbcbase \
+ odfflatxml \
+ offacc \
+ pcr \
+ pdffilter \
sax \
sb \
sdbt \
+ scn \
+ sd \
+ sdd \
sdfilt \
+ sdui \
sfx \
sot \
$(if $(ENABLE_HEADLESS),,spl) \
@@ -291,6 +306,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
svt \
svx \
svxcore \
+ sw \
tk \
tl \
$(if $(ENABLE_TELEPATHY),tubes) \
@@ -301,7 +317,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
uui \
vcl \
xmlscript \
+ xmlfa \
+ xmlfd \
xo \
+ xof \
+ xsltdlg \
+ xsltfilter \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
@@ -329,38 +350,27 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
) \
communi \
date \
- evtatt \
- odbc \
oox \
ooxml \
sdbc \
AppleRemote \
avmediaQuickTime \
- basegfx \
calc \
dbp \
dbu \
evoab \
filtertracer \
flash \
- flat \
graphicfilter \
guesslang \
- hyphen \
jdbc \
kab1 \
kabdrv1 \
- lnth \
log \
MacOSXSpell \
mork \
mozab2 \
mozabdrv \
- mysql \
- odfflatxml \
- offacc \
- pcr \
- pdffilter \
placeware \
pricing \
protocolhandler \
@@ -372,11 +382,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
sc \
scd \
scfilt \
- scn \
scui \
- sd \
- sdd \
- sdui \
simplecm \
sm \
smd \
@@ -385,7 +391,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
spell \
sts \
svgfilter \
- sw \
tdeab1 \
tdeabdrv1 \
textconversiondlgs \
@@ -400,11 +405,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
vclplug_kde4 \
vclplug_svp \
wpftdraw \
- xmlfa \
- xmlfd \
- xof \
- xsltdlg \
- xsltfilter \
))
ifneq (,$(filter ANDROID IOS,$(OS)))
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index ab3105e..b9155e2 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -344,10 +344,6 @@ STD_LIB_FILE( gid_File_Lib_Evoab , evoab)
#endif // #ifdef UNX
-STD_LIB_FILE(gid_File_Lib_Evtatt, evtatt)
-
-STD_LIB_FILE( gid_File_Lib_Flat, flat)
-
#ifdef WNT
File gid_File_Lib_Fps
@@ -645,13 +641,8 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap)
#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_Offacc, offacc)
-
#ifdef SOLAR_JAVA
#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_Pcr, pcr)
-
STD_LIB_FILE( gid_File_Lib_Log, log)
-STD_LIB_FILE( gid_File_Lib_Pdffilter, pdffilter)
-
SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
#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_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 )
File gid_File_Lib_Sdbc_2
@@ -838,8 +820,6 @@ File gid_File_Lib_Sdbc_2
#endif
End
-STD_LIB_FILE( gid_File_Lib_Sdd , sdd)
-
#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
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_Sw , sw)
-
#if ! defined UNX
File gid_File_Lib_Sysdtrans
LIB_FILE_BODY;
@@ -977,28 +955,7 @@ STD_LIB_FILE(gid_File_Ucpext, ucpext)
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_Odfflatxml, odfflatxml )
#ifndef SYSTEM_LIBXSLT
File gid_File_Lib_Xslt
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index ddd1157d..4bc068c 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -158,35 +158,19 @@ Module gid_Module_Root_Files_4
Files = (gid_File_Dat_Root4,
auto_File_Lib_ALL
gid_File_Lib_Bib,
- gid_File_Lib_Flat,
gid_File_Lib_J,
- gid_File_Lib_Offacc,
gid_File_Lib_Oox,
- gid_File_Lib_Pcr,
- gid_File_Lib_Pdffilter,
gid_File_Lib_Pl,
gid_File_Lib_Sf_Prothdlr,
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_AVMediaWin,
gid_File_Lib_AVMediaGStreamer,
gid_File_Lib_AVMediaGStreamer_0_10,
- gid_File_Lib_BaseGfx,
gid_File_Lib_Sysdtrans,
- gid_File_Lib_Sw,
gid_File_Lib_TextConversionDlgs,
gid_File_Lib_Acc,
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_Vclplug_Gen,
gid_File_Lib_Vclplug_Tde,
@@ -231,7 +215,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Kab_Drv_1,
gid_File_Lib_Macab_1,
gid_File_Lib_Macab_Drv_1,
- gid_File_Lib_Evtatt,
gid_File_Lib_I18nsearch,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
@@ -246,8 +229,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Mork,
gid_File_Lib_Mozabdrv,
gid_File_Lib_Mozbootstrap,
- gid_File_Lib_Mysql,
- gid_File_Lib_Odbc,
gid_File_Lib_Officebean,
gid_File_Lib_Openssl,
gid_File_Lib_DeploymentGui,
@@ -548,7 +529,5 @@ Module gid_Module_Oo_Linguistic
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Lib_Spell,
- gid_File_Lib_Hyph,
- gid_File_Lib_Lnth,
gid_File_Share_Registry_Lingucomponent_Xcd);
End
More information about the Libreoffice-commits
mailing list