From c9c963d3e6991d0dd73a95fc9734e38683d5be9c Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 11 Apr 2013 11:02:39 +0200 Subject: autoinstall ure private libraries Change-Id: Ia390c4d4a9be4b5520fd82a573029ea242f9ffb9 --- Repository.mk | 51 +++---- RepositoryFixes.mk | 3 - scp2/AutoInstallLibs_ure.mk | 12 ++ scp2/InstallModule_ure.mk | 3 +- scp2/Module_scp2.mk | 1 + scp2/inc/macros.inc | 8 ++ scp2/source/ooo/ure.scp | 231 ++++---------------------------- solenv/gbuild/Helper.mk | 2 +- solenv/gbuild/platform/IOS_ARM_GCC.mk | 1 - solenv/gbuild/platform/WNT_INTEL_GCC.mk | 1 - solenv/gbuild/platform/com_MSC_class.mk | 1 - solenv/gbuild/platform/macosx.mk | 1 - solenv/gbuild/platform/solaris.mk | 1 - solenv/gbuild/platform/unxgcc.mk | 1 - 14 files changed, 72 insertions(+), 245 deletions(-) create mode 100644 scp2/AutoInstallLibs_ure.mk diff --git a/Repository.mk b/Repository.mk index de3bbd508701..457efec281a9 100644 --- a/Repository.mk +++ b/Repository.mk @@ -414,36 +414,33 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ endif -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ - affine_uno \ - cli_cppuhelper \ - cli_uno \ - gcc3_uno \ - getuid \ - java_uno \ - jpipe \ - juh \ - juhx \ - log_uno \ - sal_textenc \ - sunjavaplugin \ - sunpro5_uno \ - unoidl \ - unsafe_uno \ - urelibs \ - xmlreader \ +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \ + affine_uno \ + $(if $(SOLAR_JAVA),java_uno) \ + $(if $(SOLAR_JAVA),juh) \ + $(if $(SOLAR_JAVA),juhx) \ + $(if $(SOLAR_JAVA),jvmaccess) \ + $(if $(SOLAR_JAVA),jvmfwk) \ + log_uno \ + reg \ + sal_textenc \ + store \ + $(if $(SOLAR_JAVA),sunjavaplugin) \ + unoidl \ + unsafe_uno \ + $(if $(URELIBS),urelibs) \ + xmlreader \ + $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(COMNAME)),msci,mscx),gcc3)_uno \ )) -ifeq ($(OS),WNT) - $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ - jpipx \ - msci_uno \ - mscx_uno \ + $(if $(filter MSC,$(COM)),cli_cppuhelper) \ + $(if $(filter MSC,$(COM)),cli_uno) \ + getuid \ + jpipe \ + $(if $(filter WNT,$(OS)),jpipx) \ )) -endif - $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ avmediagst \ avmediagst_0_10 \ @@ -552,7 +549,6 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \ cppuhelper \ - jvmaccess \ purpenvhelper \ salhelper \ )) @@ -651,10 +647,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ cppu \ - jvmfwk \ - reg \ sal \ - store \ )) $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 0479b92721cc..2a4969ef39d0 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -35,12 +35,9 @@ ifneq (,$(filter SOLARIS GCC,$(OS) $(COM))) gb_Library_FILENAMES := $(patsubst affine_uno:libaffine_uno%,affine_uno:libaffine_uno_uno%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES)) ifeq ($(OS),MACOSX) diff --git a/scp2/AutoInstallLibs_ure.mk b/scp2/AutoInstallLibs_ure.mk new file mode 100644 index 000000000000..567db0e8918c --- /dev/null +++ b/scp2/AutoInstallLibs_ure.mk @@ -0,0 +1,12 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,ure,URE,URE_PRIVATE_LIB(auto_Ure_Private_Lib_$$(1),$$(call gb_Library_get_runtime_filename,$$(1))))) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk index f98581695375..3d04217b84e7 100644 --- a/scp2/InstallModule_ure.mk +++ b/scp2/InstallModule_ure.mk @@ -27,9 +27,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ure)) +$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ure,ure)) + $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\ SYSTEM_LIBXML \ - URELIBS \ )) $(eval $(call gb_InstallModule_define_value_if_set,scp2/ure,\ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 4d12b8f8a3f9..ae0f312583d0 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_Module,scp2)) $(eval $(call gb_Module_add_targets,scp2,\ AutoInstallLibs_ooo \ + AutoInstallLibs_ure \ CustomTarget_langmacros \ InstallModule_accessories \ InstallModule_base \ diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 3d341de7e179..9435fab03aa3 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -455,5 +455,13 @@ End EXTRA_ALL_LANG_BUT_EN_US(file, ext); \ End +#define URE_PRIVATE_LIB(id,name) \ + File id \ + LIB_FILE_BODY; \ + Dir = SCP2_URE_DL_DIR; \ + Name = name; \ + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \ + End + #endif // MACROS_INC diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 5e6d681512a3..948c626bd425 100755 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#include "AutoInstallLibs/ure" + Directory gid_Dir_Ure_Bin #if defined MACOSX ParentID = gid_Dir_UreLink; @@ -213,13 +215,6 @@ Unixlink gid_Unixlink_File_Dl_Sal End #endif -File gid_File_Dl_Sal_TextEnc - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("sal_textenc"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -End - File gid_File_Dl_Salhelper LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -248,14 +243,6 @@ File gid_File_Dl_Profile_Uno // CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F"; End -File gid_File_Dl_Reg - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_VER("reg", "3"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "D5313B1F-D09F-401F-B180-891F70D489ED"; -End - #ifdef AIX Unixlink gid_Unixlink_File_Dl_Reg BIN_FILE_BODY; @@ -264,43 +251,7 @@ Unixlink gid_Unixlink_File_Dl_Reg Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); Target = SCP2_URE_DL_VER("reg", "3"); End -#endif - - - -File gid_File_Dl_Store - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_VER("store", "3"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066"; -End - -File gid_File_Dl_Unoidl - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("unoidl"); - Styles = (PACKED); -End - -File gid_File_Dl_Xmlreader - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("xmlreader"); - Styles = (PACKED); -End - -#ifdef URELIBS -File gid_File_Dl_Urelibs - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("urelibs"); - Styles = (PACKED); -End -#endif - -#ifdef AIX Unixlink gid_Unixlink_File_Dl_Store BIN_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -308,19 +259,9 @@ Unixlink gid_Unixlink_File_Dl_Store Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); Target = SCP2_URE_DL_VER("store", "3"); End -#endif #if defined SOLAR_JAVA -File gid_File_Dl_Jvmaccess - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "F3D6F794-DA6F-4522-B3A7-C15593C1A577"; -End - -#ifdef AIX Unixlink gid_Unixlink_File_Dl_Jvmaccess BIN_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -328,17 +269,7 @@ Unixlink gid_Unixlink_File_Dl_Jvmaccess Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); Target = SCP2_URE_DL_COMID_VER("jvmaccess", "3"); End -#endif -File gid_File_Dl_Jvmfwk - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_VER("jvmfwk", "3"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "4E128F82-FA30-4077-88DC-F745C3330093"; -End - -#ifdef AIX Unixlink gid_Unixlink_File_Dl_Jvmfwk BIN_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -346,25 +277,11 @@ Unixlink gid_Unixlink_File_Dl_Jvmfwk Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); Target = SCP2_URE_DL_VER("jvmfwk", "3"); End -#endif -File gid_File_Dl_Sunjavaplugin - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("sunjavaplugin"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "0AC6C688-876C-40C5-B24E-9257003FDC3E"; -End +#endif # JAVA -File gid_File_Dl_JrepropertiesClass - TXT_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = "JREProperties.class"; - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "0C4B8DCF-18D1-47D9-8BB7-A5C1D9268016"; -End +#endif # AIX -#endif File gid_File_Dl_Profile_Jvmfwk3rc TXT_FILE_BODY; @@ -374,21 +291,14 @@ File gid_File_Dl_Profile_Jvmfwk3rc // CompID = "1124A984-F905-47DC-ACEF-EDEC037F9B38"; End -File gid_File_Dl_ComnameUno - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL(STRING(COMNAME) "_uno"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "3FAFBDCB-96FE-4D9E-B655-CA86FE674711"; -End #if defined SOLAR_JAVA -File gid_File_Dl_JavaUno - LIB_FILE_BODY; +File gid_File_Dl_JrepropertiesClass + TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("java_uno"); + Name = "JREProperties.class"; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "5425A018-DAFD-4BC6-A550-377C899DC98A"; + // CompID = "0C4B8DCF-18D1-47D9-8BB7-A5C1D9268016"; End #endif @@ -401,28 +311,6 @@ Shortcut gid_Shortcut_Dl_JavaUno End #endif -File gid_File_Dl_UnsafeUnoUno - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("unsafe_uno_uno"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "74C2909A-FDCF-430A-B0F4-CA6D15690D76"; -End - -File gid_File_Dl_AffineUnoUno - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("affine_uno_uno"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "CF542EC3-7A51-4EAA-8480-65D5E8906D05"; -End - -File gid_File_Dl_LogUnoUno - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("log_uno_uno"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); -End #if defined _MSC_VER File gid_File_Dl_Cli_Uno @@ -432,9 +320,6 @@ File gid_File_Dl_Cli_Uno Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); End -#endif - -#if defined _MSC_VER File gid_File_Dl_Cli_Ure_Assembly TXT_FILE_BODY; @@ -449,10 +334,6 @@ File gid_File_Dl_Cli_Ure_Assembly ProcessorArchitecture = "MSIL"; End -#endif - -#if defined _MSC_VER - File gid_File_Dl_Policy_Cli_Ure_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -466,10 +347,6 @@ File gid_File_Dl_Policy_Cli_Ure_Assembly ProcessorArchitecture = "MSIL"; End -#endif - -#if defined _MSC_VER - File gid_File_Dl_Policy_Cli_Ure_Config TXT_FILE_BODY; Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH); @@ -478,10 +355,6 @@ File gid_File_Dl_Policy_Cli_Ure_Config AssignComponent = gid_File_Dl_Policy_Cli_Ure_Assembly; End -#endif - -#if defined _MSC_VER - File gid_File_Dl_Cli_Basetypes_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -495,10 +368,6 @@ File gid_File_Dl_Cli_Basetypes_Assembly ProcessorArchitecture = "MSIL"; End -#endif - -#if defined _MSC_VER - File gid_File_Dl_Policy_Cli_Basetypes_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -512,9 +381,6 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly ProcessorArchitecture = "MSIL"; End -#endif -#if defined _MSC_VER - File gid_File_Dl_Policy_Cli_Basetypes_Config TXT_FILE_BODY; Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH); @@ -523,11 +389,6 @@ File gid_File_Dl_Policy_Cli_Basetypes_Config AssignComponent = gid_File_Dl_Policy_Cli_Basetypes_Assembly; End -#endif - - -#if defined _MSC_VER - File gid_File_Dl_Cli_Uretypes_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -541,10 +402,6 @@ File gid_File_Dl_Cli_Uretypes_Assembly ProcessorArchitecture = "MSIL"; End -#endif - -#if defined _MSC_VER - File gid_File_Dl_Policy_Cli_Uretypes_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -558,10 +415,6 @@ File gid_File_Dl_Policy_Cli_Uretypes_Assembly ProcessorArchitecture = "MSIL"; End -#endif - -#if defined _MSC_VER - File gid_File_Dl_Policy_Cli_Uretypes_Config TXT_FILE_BODY; Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH); @@ -570,10 +423,6 @@ File gid_File_Dl_Policy_Cli_Uretypes_Config AssignComponent = gid_File_Dl_Policy_Cli_Uretypes_Assembly; End -#endif - -#if defined _MSC_VER - File gid_File_Lib_Cli_Cppuhelper_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -587,10 +436,6 @@ File gid_File_Lib_Cli_Cppuhelper_Assembly ProcessorArchitecture = "x86"; End -#endif - -#if defined _MSC_VER - File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly TXT_FILE_BODY; Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH); @@ -604,10 +449,6 @@ File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly ProcessorArchitecture = "x86"; End -#endif - -#if defined _MSC_VER - File gid_File_Lib_Policy_Cli_Cppuhelper_Config TXT_FILE_BODY; Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH); @@ -637,26 +478,6 @@ File gid_File_Dl_Jpipx End #endif -#if defined SOLAR_JAVA -File gid_File_Dl_Juh - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("juh"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "1A001FB0-C469-4517-A3D1-3FA56AD607AF"; -End -#endif - -#if defined SOLAR_JAVA -File gid_File_Dl_Juhx - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = SCP2_URE_DL_NORMAL("juhx"); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "B152234F-A46A-40BE-B632-48F35A33A29A"; -End -#endif - File gid_File_Dl_Acceptor LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -1003,36 +824,36 @@ Module gid_Module_Root_Ure_Hidden gid_Unixlink_File_Dl_PurpEnvHelper, gid_File_Dl_Sal, gid_Unixlink_File_Dl_Sal, - gid_File_Dl_Sal_TextEnc, gid_File_Dl_Salhelper, gid_Unixlink_File_Dl_Salhelper, gid_File_Dl_Profile_Uno, - gid_File_Dl_Reg, gid_Unixlink_File_Dl_Reg, gid_Unixlink_File_Dl_Rmcxt, - gid_File_Dl_Store, gid_Unixlink_File_Dl_Store, - gid_File_Dl_Unoidl, - gid_File_Dl_Xmlreader, -#ifdef URELIBS - gid_File_Dl_Urelibs, -#endif - gid_File_Dl_Jvmaccess, gid_Unixlink_File_Dl_Jvmaccess, - gid_File_Dl_Jvmfwk, gid_Unixlink_File_Dl_Jvmfwk, - gid_File_Dl_Sunjavaplugin, + auto_Ure_Private_Lib_affine_uno, + auto_Ure_Private_Lib_gcc3_uno, + auto_Ure_Private_Lib_java_uno, + auto_Ure_Private_Lib_juh, + auto_Ure_Private_Lib_juhx, + auto_Ure_Private_Lib_jvmaccess, + auto_Ure_Private_Lib_jvmfwk, + auto_Ure_Private_Lib_log_uno, + auto_Ure_Private_Lib_msci_uno, + auto_Ure_Private_Lib_mscx_uno, + auto_Ure_Private_Lib_reg, + auto_Ure_Private_Lib_sal_textenc, + auto_Ure_Private_Lib_store, + auto_Ure_Private_Lib_sunjavaplugin, + auto_Ure_Private_Lib_unoidl, + auto_Ure_Private_Lib_unsafe_uno, + auto_Ure_Private_Lib_urelibs, + auto_Ure_Private_Lib_xmlreader, gid_File_Dl_JrepropertiesClass, gid_File_Dl_Profile_Jvmfwk3rc, - gid_File_Dl_ComnameUno, - gid_File_Dl_JavaUno, - gid_File_Dl_UnsafeUnoUno, - gid_File_Dl_AffineUnoUno, - gid_File_Dl_LogUnoUno, gid_File_Dl_Jpipe, gid_File_Dl_Jpipx, - gid_File_Dl_Juh, - gid_File_Dl_Juhx, gid_File_Dl_Acceptor, gid_File_Dl_Binaryurp, gid_File_Dl_Bootstrap, diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index f5f205bb65f2..05e5489164fd 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -118,7 +118,7 @@ endef define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS -gb_Library_VALIDINSTALLMODULES := OOO +gb_Library_VALIDINSTALLMODULES := OOO URE gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_Jar_VALIDGROUPS := URE OOO OXT diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 466a82167aaa..fa070caf2f58 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -251,7 +251,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ -D_gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 42e1dda7f1e4..469bb5f92471 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -385,7 +385,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ -D_gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 12227ab7e27d..e3fc4d77cc69 100755 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -544,7 +544,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=MSC \ - -DCOMNAME=$(if $(filter INTEL,$(CPUNAME)),msci,mscx) \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index eababb85cef6..88e0953ec8d2 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -321,7 +321,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ -D_gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 968b1a30f153..d8bb1c8bf588 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -378,7 +378,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ $(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \ ) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index e295edba1de4..ae9081fef33b 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -373,7 +373,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\ $(gb_CPUDEFS) \ $(gb_OSDEFS) \ -DCOMID=gcc3 \ - -DCOMNAME=gcc3 \ -DSHORTSTDC3=$(gb_SHORTSTDC3) \ -DSHORTSTDCPP3=$(gb_SHORTSTDCPP3) \ -D_gcc3 \ -- cgit v1.2.3