Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4232
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/4232/1
fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Change-Id: I1553317afe8df9877a41b1d4087c96d861ed1377
---
M Repository.mk
M scp2/source/ooo/file_library_ooo.scp
M scp2/source/ooo/module_hidden_ooo.scp
3 files changed, 25 insertions(+), 185 deletions(-)
diff --git a/Repository.mk b/Repository.mk
index 98ff1a3..13d8e10 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -216,6 +216,8 @@
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
acc \
avmedia \
+ $(if $(ENABLE_GSTREAMER),avmediagst) \
+ $(if $(ENABLE_GSTREAMER_0_10),avmediagst_0_10) \
$(if $(DISABLE_SCRIPTING),,basctl) \
$(if $(DISABLE_SCRIPTING),,basprov) \
basegfx \
@@ -227,23 +229,29 @@
chartcore \
chartcontroller \
cppcanvas \
+ collator_data \
configmgr \
ctl \
cui \
dba \
dbase \
dbmm \
+ dbpool2 \
$(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
dbaxml \
+ deploymentgui \
deploymentmisc \
$(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
$(if $(DISABLE_SCRIPTING),,dlgprov) \
+ dict_ja \
+ dict_zh \
$(if $(ENABLE_DIRECTX),directx9canvas) \
drawinglayer \
editeng \
egi \
eme \
+ embobj \
$(if $(filter WNT,$(OS)),$(if $(DISABLE_ATL),,emser)) \
epb \
epg \
@@ -275,6 +283,7 @@
$(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \
i18npool \
i18nsearch \
+ index_data \
hatchwindowfactory \
$(if $(SOLAR_JAVA),hsqldb) \
hyphen \
@@ -303,6 +312,8 @@
lng \
lnth \
$(if $(MERGELIBS),merged) \
+ migrationoo2 \
+ migrationoo3 \
msfilter \
$(if $(DISABLE_SCRIPTING),,msforms) \
mtfrenderer \
@@ -332,6 +343,7 @@
sot \
spell \
$(if $(ENABLE_HEADLESS),,spl) \
+ srtrs1 \
$(if $(DISABLE_SCRIPTING),,stringresource) \
svgio \
svl \
@@ -342,14 +354,25 @@
syssh \
$(if $(ENABLE_TDEAB),tdeab1) \
$(if $(ENABLE_TDEAB),tdeabdrv1) \
+ textconv_dict \
textconversiondlgs \
+ textfd \
tk \
tl \
$(if $(ENABLE_TELEPATHY),tubes) \
tvhlp1 \
ucpexpand1 \
+ ucpext \
+ ucpchelp1 \
+ ucpcmis1 \
+ ucptdoc1 \
+ ucpftp1 \
+ ucphier1 \
+ ucppkg1 \
+ unopkgapp \
unordf \
unoxml \
+ updatefeed \
utl \
uui \
$(if $(DISABLE_SCRIPTING),,vbaevents) \
@@ -357,9 +380,11 @@
vcl \
vclcanvas \
$(if $(and $(filter unx,$(GUIBASE)),$(filter-out
MACOSX,$(OS))),vclplug_gen) \
+ xsec_fw \
xmlscript \
xmlfa \
xmlfd \
+ xmlsecurity \
xo \
xof \
xsltdlg \
@@ -403,7 +428,6 @@
simplecm \
spa \
sts \
- textfd \
vclplug_tde \
vclplug_kde \
vclplug_kde4 \
@@ -497,18 +521,9 @@
xstor \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- avmediagst \
- avmediagst_0_10 \
avmediawin \
bluez_bluetooth \
- collator_data \
- dbpool2 \
- deploymentgui \
- dict_ja \
- dict_zh \
- embobj \
emboleobj \
- index_data \
java_uno_accessbridge \
libreoffice \
macab1 \
@@ -518,16 +533,7 @@
pyuno \
pyuno_wrapper \
recentfile \
- srtrs1 \
- textconv_dict \
ucpdav1 \
- ucpftp1 \
- ucpchelp1 \
- ucphier1 \
- ucppkg1 \
- unopkgapp \
- xmlsecurity \
- xsec_fw \
xsec_xmlsec \
$(if $(filter $(OS),ANDROID), \
lo-bootstrap \
@@ -578,17 +584,11 @@
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cmdmail \
macbe1 \
- migrationoo2 \
- migrationoo3 \
OGLTrans \
pdfimport \
postgresql-sdbc \
postgresql-sdbc-impl \
pythonloader \
- ucpcmis1 \
- ucpext \
- ucptdoc1 \
- updatefeed \
$(if $(filter $(OS),MACOSX), \
fps_aqua \
) \
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index 1e1a261..9a8bf6b 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -125,72 +125,6 @@
#endif
-File gid_File_Lib_Dbpool
- LIB_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
- #else
- Name = "dbpool2.dll";
- #endif
-End
-
-File gid_File_Lib_Dict_Ja
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libdict_ja,UNXSUFFIX));
- #else
- Name = "dict_ja.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_Dict_Zh
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libdict_zh,UNXSUFFIX));
- #else
- Name = "dict_zh.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_Collator_Data
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libcollator_data,UNXSUFFIX));
- #else
- Name = "collator_data.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_Index_Data
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libindex_data,UNXSUFFIX));
- #else
- Name = "index_data.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_Textconv_Dict
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libtextconv_dict,UNXSUFFIX));
- #else
- Name = "textconv_dict.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
#ifdef WNT
File gid_File_Lib_Dnd
@@ -212,8 +146,6 @@
End
#endif
-
-SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
/* fdo#60491 always need emboleobj library on non-WNT platforms */
#if !defined(WNT) || !defined(DISABLE_ATL)
@@ -497,8 +429,6 @@
STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge )
#endif
-SPECIAL_LIB_FILE(gid_File_Lib_DeploymentGui,deploymentgui)
-
#if defined ENABLE_NPAPI_FROM_BROWSER
STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
@@ -624,8 +554,6 @@
STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
#endif
-SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
-
#if ! defined UNX
File gid_File_Lib_Sysdtrans
LIB_FILE_BODY;
@@ -643,17 +571,6 @@
#ifdef MACOSX
STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 )
#endif
-
-File gid_File_Lib_Ucpchelp1
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
- #else
- Name = "ucpchelp1.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
#ifndef DISABLE_NEON
SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
@@ -694,20 +611,6 @@
#endif
-SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucphier1,ucphier1)
-
-SPECIAL_LIB_FILE(gid_File_Lib_Ucppkg1,ucppkg1)
-
-STD_LIB_FILE(gid_File_Ucptdoc1, ucptdoc1)
-
-STD_LIB_FILE(gid_File_Ucpext, ucpext)
-
-STD_LIB_FILE(gid_File_Ucpcmis, ucpcmis1)
-
-STD_LIB_FILE( gid_File_Lib_Textfd, textfd )
-
#ifndef SYSTEM_LIBXSLT
File gid_File_Lib_Xslt
LIB_FILE_BODY;
@@ -747,39 +650,11 @@
End
#endif
-#if defined ENABLE_GSTREAMER
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer, avmediagst )
-#endif
-#if defined ENABLE_GSTREAMER_0_10
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGStreamer_0_10, avmediagst_0_10 )
-#endif
#if defined WNT
#ifdef ENABLE_DIRECTX
SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
#endif
#endif
-
-File gid_File_Lib_XSec_XMLSecurity
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
- #else
- Name = "xmlsecurity.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
-File gid_File_Lib_XSec_Framework
- LIB_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT2(libxsec_fw,UNXSUFFIX));
- #else
- Name = "xsec_fw.dll";
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
#ifdef WNT
File gid_File_Lib_LibXMLSec_xmlseccore
@@ -818,12 +693,6 @@
#endif
#endif
-STD_LIB_FILE( gid_File_Lib_Migrationoo2, migrationoo2 )
-
-STD_LIB_FILE( gid_File_Lib_Migrationoo3, migrationoo3 )
-
-STD_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed )
-
#ifndef SYSTEM_OPENSSL
File gid_File_Lib_Openssl
LIB_FILE_BODY;
@@ -846,13 +715,6 @@
#endif
End
#endif
-
-File gid_File_Lib_Unopkgapp
- LIB_FILE_BODY;
- Dir = SCP2_OOO_BIN_DIR;
- Name = SCP2_URE_DL_NORMAL("unopkgapp");
- Styles = (PACKED);
-End
#if defined WNT && !defined _gcc3 && defined WITH_MOZAB4WIN
// see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 3fe65c8..f9a0838 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -90,7 +90,6 @@
gid_File_Bin_Uri_Encode,
gid_File_Bin_UIPreviewer,
gid_File_Exe_Nsplugin,
- gid_File_Lib_Unopkgapp,
gid_File_Txt_Pagein_Common,
gid_File_Txt_Pagein_Calc,
gid_File_Txt_Pagein_Draw,
@@ -150,8 +149,6 @@
gid_File_Lib_Sf_Prothdlr,
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_BaseBmp,
gid_File_Lib_Zip,
@@ -171,19 +168,12 @@
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Dat_Root5,
- gid_File_Lib_Dict_Ja,
- gid_File_Lib_Dict_Zh,
- gid_File_Lib_Collator_Data,
- gid_File_Lib_Index_Data,
- gid_File_Lib_Textconv_Dict,
gid_File_Lib_Crypto,
#if ! defined SYSTEM_CLUCENE
gid_File_Lib_CLucene,
#endif
gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
- gid_File_Lib_Dbpool,
- gid_File_Lib_Embobj,
gid_File_Lib_Emboleobj,
gid_File_Lib_Macab_1,
gid_File_Lib_Macab_Drv_1,
@@ -197,14 +187,9 @@
gid_File_Lib_Mozbootstrap,
gid_File_Lib_Officebean,
gid_File_Lib_Openssl,
- gid_File_Lib_DeploymentGui,
gid_File_Lib_Recentfile,
- gid_File_Lib_Srtrs1,
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
- gid_File_Lib_Migrationoo2,
- gid_File_Lib_Migrationoo3,
- gid_File_Ucptdoc1,
gid_File_Lib_Raptor,
gid_Unixlink_File_Lib_Raptor,
gid_File_Lib_Rasqal,
@@ -224,20 +209,14 @@
gid_File_Lib_Sqlite3,
gid_File_Lib_Ssl3,
gid_File_Lib_Sndfile,
- gid_File_Lib_Ucpchelp1,
gid_File_Lib_Ucpdav1,
gid_File_Lib_Neon,
- gid_File_Lib_Ucpftp1,
- gid_File_Lib_Ucphier1,
- gid_File_Lib_Ucppkg1,
gid_File_Lib_Xslt,
gid_Unixlink_File_Lib_Xslt,
gid_Unixlink_File_Lib_eXslt,
gid_File_Lib_LibXMLSec_xmlsecnss,
gid_File_Lib_LibXMLSec_xmlseccore,
gid_File_Lib_LibXMLSec_xmlsecmscrypto,
- gid_File_Lib_XSec_XMLSecurity,
- gid_File_Lib_XSec_Framework,
gid_File_Lib_XSec_XmlSec,
gid_File_Lib_Cmdmail,
gid_File_Lib_I18n,
@@ -259,7 +238,6 @@
gid_File_Lib_Smplmail,
gid_File_Lib_Wininetbe,
gid_File_Lib_Macbe,
- gid_File_Lib_Updatefeed,
gid_File_Lib_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Config);
--
To view, visit https://gerrit.libreoffice.org/4232
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1553317afe8df9877a41b1d4087c96d861ed1377
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza <marcos.souza....@gmail.com>
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
