[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5631 to look at the new patch set (#5). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 21 insertions(+), 102 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/5631/5 -- To view, visit https://gerrit.libreoffice.org/5631 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Marcos Souza Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello Michael Stahl, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5631 to look at the new patch set (#4). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 21 insertions(+), 102 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/5631/4 -- To view, visit https://gerrit.libreoffice.org/5631 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ibb2c27a75d8cbaf5177f392930cc9e6effa48d1d Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Marcos Souza Gerrit-Reviewer: Michael Stahl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello LibreOffice gerrit bot, Björn Michaelsen, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5571 to look at the new patch set (#4). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 15 insertions(+), 134 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/5571/4 -- To view, visit https://gerrit.libreoffice.org/5571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: Björn Michaelsen Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello LibreOffice gerrit bot, Björn Michaelsen, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5571 to look at the new patch set (#3). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 17 insertions(+), 145 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/5571/3 -- To view, visit https://gerrit.libreoffice.org/5571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: Björn Michaelsen Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5571 to look at the new patch set (#2). Change subject: fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO .. fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 17 insertions(+), 145 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/5571/2 -- To view, visit https://gerrit.libreoffice.org/5571 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4267 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/4267/1 fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I7a3511172ac8ddd060c51c0339a4b9ff16216668 --- M Repository.mk M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_hidden_ooo.scp 3 files changed, 13 insertions(+), 64 deletions(-) diff --git a/Repository.mk b/Repository.mk index 543275e..151df15 100644 --- a/Repository.mk +++ b/Repository.mk @@ -296,6 +296,7 @@ log \ lng \ lnth \ + $(if $(filter $(OS),MACOSX),macbe1) \ $(if $(MERGELIBS),merged) \ migrationoo2 \ migrationoo3 \ @@ -378,7 +379,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabas \ adabasui \ - ado \ agg \ $(if $(filter $(OS),ANDROID),, \ basebmp \ @@ -387,10 +387,8 @@ oox \ ooxml \ sdbc \ - AppleRemote \ avmediaQuickTime \ filtertracer \ - MacOSXSpell \ mork \ mozab2 \ mozabdrv \ @@ -519,9 +517,20 @@ xmlsecurity \ xsec_fw \ xstor \ + $(if $(filter $(OS),WNT), \ + ado \ + $(if $(ENABLE_DIRECTX),avmediawin) \ + $(if $(DISABLE_ATL),,oleautobridge) \ + smplmail \ + wininetbe1 \ + ) \ + $(if $(filter $(OS),MACOSX), \ + AppleRemote \ + fps_aqua \ + MacOSXSpell \ + ) \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - avmediawin \ bluez_bluetooth \ emboleobj \ java_uno_accessbridge \ @@ -583,20 +592,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cmdmail \ - macbe1 \ OGLTrans \ pdfimport \ postgresql-sdbc \ postgresql-sdbc-impl \ pythonloader \ - $(if $(filter $(OS),MACOSX), \ - fps_aqua \ - ) \ - $(if $(filter $(OS),WNT), \ - oleautobridge \ - smplmail \ - wininetbe1 \ - ) \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 8e57fb7..cad2d7c 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -35,10 +35,6 @@ End #endif -#if defined(WNT) -STD_LIB_FILE( gid_File_Lib_Ado, ado) -#endif - #ifndef SYSTEM_CLUCENE File gid_File_Lib_CLucene LIB_FILE_BODY; @@ -215,15 +211,6 @@ #endif #ifdef MACOSX -STD_LIB_FILE( gid_File_Lib_Fps_Aqua, fps_aqua ) - -File gid_File_Lib_MacOSXSpell - LIB_FILE_BODY; - Styles = (PACKED); - Name = LIBNAME(MacOSXSpell); - Dir = SCP2_OOO_BIN_DIR; -End - #ifndef X86_64 File gid_File_Lib_avmediaQuickTime LIB_FILE_BODY; @@ -425,10 +412,6 @@ #endif #endif -#if defined(WNT) && !defined(DISABLE_ATL) -STD_LIB_FILE( gid_File_Lib_Ole, oleautobridge ) -#endif - #if defined ENABLE_NPAPI_FROM_BROWSER STD_LIB_FILE( gid_File_Lib_Pl , pl) #endif @@ -458,15 +441,6 @@ Dir = SCP2_OOO_BIN_DIR; End #endif -#endif - -#if defined(MACOSX) -File gid_File_Lib_AppleRemote -Name = LIBNAME(AppleRemote); -LIB_FILE_BODY; -Styles = (PACKED); -Dir = SCP2_OOO_BIN_DIR; -End #endif #if defined(MACOSX) @@ -535,10 +509,6 @@ #endif -#ifdef WNT -STD_LIB_FILE( gid_File_Lib_Smplmail, smplmail ) -#endif - #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_File_Lib_Spa @@ -568,15 +538,6 @@ Dir = SCP2_OOO_BIN_DIR; Name = "sysdtrans.dll"; End -#endif - - -#ifdef WNT -STD_LIB_FILE( gid_File_Lib_Wininetbe, wininetbe1 ) -#endif - -#ifdef MACOSX -STD_LIB_FILE( gid_File_Lib_Macbe, macbe1 ) #endif #ifndef DISABLE_NEON @@ -655,12 +616,6 @@ #endif #endif End -#endif - -#if defined WNT -#ifdef ENABLE_DIRECTX -SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin ) -#endif #endif #ifdef WNT diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 59ab1d4..6f5325e 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -147,7 +147,6 @@ gid_File_Lib_Oox, gid_File_Lib_Pl, gid_File_Lib_Spa, - gid_File_Lib_AVMediaWin, gid_File_Lib_Sysdtrans, gid_File_Lib_BaseBmp, gid_File_Lib_Zip, @@ -219,7 +218,6 @@ gid_File_Lib_Cmdmail, gid_File_Lib_I18n, gid_File_Lib_Accessbridge, - gid_File_Lib_Ado, gid_File_Lib_Dl, gid_File_Lib_Dnd, gid_File_Lib_Dtrans, @@ -228,14 +226,10 @@ gid_File_Lib_Ftransl, gid_File_Lib_sn_tools, GID_FILE_LIB_WPD, - gid_File_Lib_Ole, gid_File_Lib_Reg4allmsdoc, gid_File_Lib_Qslnkmsi, gid_File_Lib_Sd
[PATCH] fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO
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_F
