Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3689 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3689/1 fdo#60924: Move more libs to autoinstallation Change-Id: I5c136760ca59278ba6bfcd1d11c56d810e9cfa76 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 40 insertions(+), 88 deletions(-) diff --git a/Repository.mk b/Repository.mk index 296ffc8..a5a13e0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -218,8 +218,11 @@ endif $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ + abp \ + analysis \ avmedia \ $(if $(DISABLE_SCRIPTING),,basctl) \ + basegfx \ bib \ canvastools \ chartcore \ @@ -232,6 +235,8 @@ dbmm \ $(if $(DISABLE_DBCONNECTIVITY),,dbtools) \ dbaxml \ + dbp \ + dbu \ deploymentmisc \ $(if $(filter unx,$(GUIBASE)),desktop_detector) \ drawinglayer \ @@ -246,7 +251,9 @@ ept \ era \ eti \ + evtatt \ exp \ + flat \ file \ filterconfig \ for \ @@ -258,6 +265,7 @@ fwl \ fwm \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ + hyphen \ icd \ icg \ idx \ @@ -271,14 +279,38 @@ itg \ iti \ lng \ + lnth \ + log \ $(if $(MERGELIBS),merged) \ msfilter \ + mysql \ + odbc \ odbcbase \ + odfflatxml \ + offacc \ + oox \ + pcr \ + pdffilter \ + pricing \ + rpt \ + rptui \ + rptxml \ sax \ sb \ sdbt \ + sc \ + scd \ + scfilt \ + scui \ + scn \ + sd \ + sdd \ sdfilt \ + sdui \ sfx \ + sm \ + smd \ + solver \ sot \ $(if $(ENABLE_HEADLESS),,spl) \ svgio \ @@ -286,6 +318,9 @@ svt \ svx \ svxcore \ + sw \ + textconversiondlgs \ + textfd \ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ @@ -295,7 +330,12 @@ uui \ vcl \ xmlscript \ + xmlfa \ + xmlfd \ xo \ + xof \ + xsltdlg \ + xsltfilter \ )) $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \ @@ -310,80 +350,45 @@ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - abp \ acc \ adabas \ adabasui \ ado \ agg \ - analysis \ animcore \ $(if $(filter $(OS),ANDROID),, \ basebmp \ ) \ 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 \ qstart_gtk \ res \ - rpt \ - rptui \ - rptxml \ - sc \ - scd \ - scfilt \ - scn \ - scui \ - sd \ - sdd \ - sdui \ simplecm \ - sm \ - smd \ - solver \ spa \ spell \ sts \ svgfilter \ - sw \ tdeab1 \ tdeabdrv1 \ - textconversiondlgs \ - textfd \ updatecheckui \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vclplug_gen \ @@ -394,11 +399,6 @@ 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..5985728d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -645,12 +645,7 @@ #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 @@ -674,12 +669,6 @@ #endif 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) @@ -977,28 +966,7 @@ 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 43ddeef..a00355f 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -158,7 +158,6 @@ 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, @@ -167,26 +166,14 @@ 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, @@ -246,7 +233,6 @@ 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, @@ -618,7 +604,5 @@ 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 -- To view, visit https://gerrit.libreoffice.org/3689 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c136760ca59278ba6bfcd1d11c56d810e9cfa76 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