[PATCH] fdo#60924: Move some more libs to autoinstallation
Marcos Souza (via Code Review)
gerrit at gerrit.libreoffice.org
Fri May 3 06:10:17 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3758
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/3758/1
fdo#60924: Move some more libs to autoinstallation
Change-Id: I7383da4390995ad9ea2d4fb494098dab6287609f
---
M Repository.mk
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/module_hidden_ooo.scp
3 files changed, 10 insertions(+), 56 deletions(-)
diff --git a/Repository.mk b/Repository.mk
index d771646..84e4bff 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -263,6 +263,7 @@
fwk \
fwl \
fwm \
+ guesslang \
$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
i18npool \
hyphen \
@@ -278,6 +279,9 @@
ira \
itg \
iti \
+ $(if $(SOLAR_JAVA),jdbc) \
+ $(if $(filter unx,$(ENABLE_KAB)),kab1) \
+ $(if $(filter unx,$(ENABLE_KAB)),kabdrv1) \
localebe1 \
lng \
lnth \
@@ -290,6 +294,7 @@
offacc \
pcr \
pdffilter \
+ res \
sax \
sb \
sdbt \
@@ -307,6 +312,9 @@
svx \
svxcore \
sw \
+ $(if $(filter unx,$(ENABLE_TDEAB)),tdeab1) \
+ $(if $(filter unx,$(ENABLE_TDEAB)),tdeabdrv1) \
+ textconversiondlgs \
tk \
tl \
$(if $(ENABLE_TELEPATHY),tubes) \
@@ -316,6 +324,7 @@
utl \
uui \
vcl \
+ $(if $(filter unx,$(if $(filter MACOSX,,$(if $(filter LIBO_HEADLESS))))),vclplug_gen) \
xmlscript \
xmlfa \
xmlfd \
@@ -362,10 +371,6 @@
filtertracer \
flash \
graphicfilter \
- guesslang \
- jdbc \
- kab1 \
- kabdrv1 \
log \
MacOSXSpell \
mork \
@@ -375,7 +380,6 @@
pricing \
protocolhandler \
qstart_gtk \
- res \
rpt \
rptui \
rptxml \
@@ -391,13 +395,9 @@
spell \
sts \
svgfilter \
- tdeab1 \
- tdeabdrv1 \
- textconversiondlgs \
textfd \
updatecheckui \
$(if $(DISABLE_SCRIPTING),,vbahelper) \
- vclplug_gen \
vclplug_gtk \
vclplug_gtk3 \
vclplug_tde \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index b9155e2..2c51db4 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -310,16 +310,6 @@
#ifdef UNX
-#ifdef ENABLE_KAB
-STD_LIB_FILE(gid_File_Lib_Kab_1, kab1)
-STD_LIB_FILE(gid_File_Lib_Kab_Drv_1, kabdrv1)
-#endif
-
-#ifdef ENABLE_TDEAB
-STD_LIB_FILE(gid_File_Lib_Tdeab_1, tdeab1)
-STD_LIB_FILE(gid_File_Lib_Tdeab_Drv_1, tdeabdrv1)
-#endif
-
#ifdef MACOSX
File gid_File_Lib_Macab_1
LIB_FILE_BODY;
@@ -540,13 +530,6 @@
#endif
-
-#ifdef SOLAR_JAVA
-
-STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
-
-#endif
-
#ifdef SOLAR_JAVA
File gid_File_Lib_Hsqldb_2
LIB_FILE_BODY;
@@ -674,15 +657,6 @@
STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
-#if defined(UNX) && ! defined(MACOSX) && ! defined(LIBO_HEADLESS)
-File gid_File_Lib_Vclplug_Gen
- Name = LIBNAME(vclplug_gen);
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-
#if defined(UNX) && ! defined(MACOSX)
#ifdef ENABLE_GTK
File gid_File_Lib_Vclplug_Gtk
@@ -794,13 +768,6 @@
#endif /* WNT && HAVE_WINDOWS_SDK */
-File gid_File_Lib_Res
- Name = LIBNAME(res);
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
-End
-
STD_LIB_FILE( gid_File_Lib_Expwrap_Uno, expwrap )
STD_LIB_FILE( gid_File_Lib_Fastsax_Uno, fastsax )
@@ -858,8 +825,6 @@
#endif
SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
-
-STD_LIB_FILE( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
#if ! defined UNX
File gid_File_Lib_Sysdtrans
@@ -1070,8 +1035,6 @@
STD_LIB_FILE( gid_File_Lib_Migrationoo2, migrationoo2 )
STD_LIB_FILE( gid_File_Lib_Migrationoo3, migrationoo3 )
-
-STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang )
STD_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed )
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 4bc068c..4fa30ae 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -162,22 +162,18 @@
gid_File_Lib_Oox,
gid_File_Lib_Pl,
gid_File_Lib_Sf_Prothdlr,
- gid_File_Lib_Res,
gid_File_Lib_Spa,
gid_File_Lib_AVMediaWin,
gid_File_Lib_AVMediaGStreamer,
gid_File_Lib_AVMediaGStreamer_0_10,
gid_File_Lib_Sysdtrans,
- gid_File_Lib_TextConversionDlgs,
gid_File_Lib_Acc,
gid_File_Lib_BaseBmp,
gid_File_Lib_Zip,
- gid_File_Lib_Vclplug_Gen,
gid_File_Lib_Vclplug_Tde,
gid_File_Lib_Vclplug_Kde,
gid_File_Lib_Vclplug_Kde4,
- gid_File_Lib_Vclplug_Svp,
- gid_File_Lib_Guesslang);
+ gid_File_Lib_Vclplug_Svp);
End
Module gid_Module_Root_Files_5
@@ -209,10 +205,6 @@
gid_File_Lib_Dbpool,
gid_File_Lib_Embobj,
gid_File_Lib_Emboleobj,
- gid_File_Lib_Tdeab_1,
- gid_File_Lib_Tdeab_Drv_1,
- gid_File_Lib_Kab_1,
- gid_File_Lib_Kab_Drv_1,
gid_File_Lib_Macab_1,
gid_File_Lib_Macab_Drv_1,
gid_File_Lib_I18nsearch,
@@ -225,7 +217,6 @@
gid_File_Lib_Localedata_Euro,
gid_File_Lib_Localedata_Others,
gid_File_Lib_Hsqldb_2,
- gid_File_Lib_Jdbc,
gid_File_Lib_Mork,
gid_File_Lib_Mozabdrv,
gid_File_Lib_Mozbootstrap,
--
To view, visit https://gerrit.libreoffice.org/3758
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7383da4390995ad9ea2d4fb494098dab6287609f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza.org at gmail.com>
More information about the LibreOffice
mailing list