Repository.mk | 28 ++++---- scp2/source/ooo/file_library_ooo.scp | 110 ---------------------------------- scp2/source/ooo/module_hidden_ooo.scp | 11 --- 3 files changed, 15 insertions(+), 134 deletions(-)
New commits: commit 3f8c36caef76ee1f688d35d39ac5bffe5d0f8319 Author: Marcos Paulo de Souza <[email protected]> Date: Wed Aug 21 11:55:18 2013 -0300 fdo#60924 autoinstall - gbuild/scp2: Move more libs to OOO Change-Id: I973a66c6f805727cfaa5a5663ce4a9c200412a66 Reviewed-on: https://gerrit.libreoffice.org/5571 Tested-by: LibreOffice gerrit bot <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> Tested-by: Thorsten Behrens <[email protected]> diff --git a/Repository.mk b/Repository.mk index 1433f1b..43ee143 100644 --- a/Repository.mk +++ b/Repository.mk @@ -359,7 +359,21 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ xsltfilter \ $(if $(filter $(OS),WNT), \ ado \ - $(if $(DISABLE_ATL),,oleautobridge) \ + dnd \ + dtrans \ + fps \ + ftransl \ + $(if $(ENABLE_JAVA),java_uno_accessbridge) \ + $(if $(DISABLE_ATL),,oleautobridge \ + inprocserv \ + ) \ + $(if $(WINDOWS_SDK_HOME),instooofiltmsi \ + qslnkmsi \ + reg4allmsdoc \ + sdqsmsi \ + sellangmsi \ + sn_tools \ + ) \ smplmail \ wininetbe1 \ ) \ @@ -530,7 +544,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ bluez_bluetooth \ emboleobj \ - java_uno_accessbridge \ libreoffice \ macab1 \ macabdrv1 \ @@ -551,28 +564,17 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - dnd \ - dtrans \ fop \ - fps \ - ftransl \ - inprocserv \ - instooofiltmsi \ jfregca \ ooofilt \ ooofilt_x64 \ propertyhdl \ propertyhdl_x64 \ - qslnkmsi \ - reg4allmsdoc \ regactivex \ regpatchactivex \ - sdqsmsi \ - sellangmsi \ shlxthdl \ shlxthdl_x64 \ shlxtmsi \ - sn_tools \ so_activex \ so_activex_x64 \ sysdtrans \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 2e370c5..5638439 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -26,13 +26,6 @@ ************************************************************************/ #include "macros.inc" -#if defined ENABLE_JAVA && defined WNT -File gid_File_Lib_Accessbridge - PACKED_LIB_FILE_BODY; - Name = "java_uno_accessbridge.dll"; -End -#endif - #ifndef SYSTEM_CLUCENE File gid_File_Lib_CLucene PACKED_LIB_FILE_BODY; @@ -117,38 +110,11 @@ End #endif -#ifdef WNT - -File gid_File_Lib_Dnd - PACKED_LIB_FILE_BODY; - Name = "dnd.dll"; -End - -#endif - -#ifdef WNT - -File gid_File_Lib_Dtrans - PACKED_LIB_FILE_BODY; - Name = "dtrans.dll"; -End - -#endif - /* fdo#60491 always need emboleobj library on non-WNT platforms */ #if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif -#if defined(WNT) && !defined(DISABLE_ATL) - -File gid_File_Lib_Inprocserv - PACKED_LIB_FILE_BODY; - Name = "inprocserv.dll"; -End - -#endif - #ifdef UNX #ifdef MACOSX @@ -165,15 +131,6 @@ End #endif // #ifdef UNX -#ifdef WNT - -File gid_File_Lib_Fps - PACKED_LIB_FILE_BODY; - Name = "fps.dll"; -End - -#endif - #if defined UNX && ! defined MACOSX #ifdef ENABLE_TDE File gid_File_Bin_TdeFilePicker @@ -260,15 +217,6 @@ End #endif -#ifdef WNT - -File gid_File_Lib_Ftransl - PACKED_LIB_FILE_BODY; - Name = "ftransl.dll"; -End - -#endif - #ifndef SYSTEM_ICU File gid_File_Lib_Icudata @@ -312,17 +260,6 @@ End #endif -#if defined(WNT) && defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_sn_tools - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH); - Dir = SCP2_OOO_LIB_DIR; - Name = "sn_tools.dll"; -End - -#endif - #if defined(WNT) #if defined WITH_MOZAB4WIN @@ -411,44 +348,8 @@ End #endif -#if defined(WNT) && defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_Reg4allmsdoc - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "reg4allmsdoc.dll"; -End - -File gid_File_Lib_Qslnkmsi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "qslnkmsi.dll"; -End - -File gid_File_Lib_Sdqsmsi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "sdqsmsi.dll"; -End - -#endif /* WNT && HAVE_WINDOWS_SDK */ - STD_LIB_FILE( gid_File_Lib_Oox , oox) -#if defined(WNT) && defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_Instooofiltmsi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = SCP2_OOO_BIN_DIR; - Name = "instooofiltmsi.dll"; -End - -#endif - #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS) File gid_File_Lib_Spa @@ -678,14 +579,3 @@ File gid_File_Lib_Rdf #endif End #endif // SYSTEM_REDLAND - -#if defined(WNT) && defined(HAVE_WINDOWS_SDK) - -File gid_File_Lib_sellangmsi - LIB_FILE_BODY; - Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); - Dir = gid_Brand_Dir_Program; - Name = "sellangmsi.dll"; -End - -#endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index fd1f892..1815346 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -109,7 +109,6 @@ Module gid_Module_Root_Files_3 Files = (gid_File_Dat_Root3, gid_File_Jar_Unoil, gid_File_Jar_Hsqldb_Sdbc, - gid_File_Jar_Accessbridge, gid_File_Jar_Officebean, gid_File_Jar_Report, gid_File_Jar_Smoketest, @@ -217,17 +216,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_I18n, gid_File_Lib_Accessbridge, gid_File_Lib_Dl, - gid_File_Lib_Dnd, - gid_File_Lib_Dtrans, - gid_File_Lib_Inprocserv, - gid_File_Lib_Fps, - gid_File_Lib_Ftransl, - gid_File_Lib_sn_tools, GID_FILE_LIB_WPD, - gid_File_Lib_Reg4allmsdoc, - gid_File_Lib_Qslnkmsi, - gid_File_Lib_Sdqsmsi, - gid_File_Lib_Instooofiltmsi, gid_File_Lib_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Assembly, gid_File_Lib_Policy_Cli_Oootypes_Config); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
