autoinstall ure private libraries

Change-Id: Ia390c4d4a9be4b5520fd82a573029ea242f9ffb9

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, \

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)

scp2/AutoInstallLibs_ure.mk

+# -*- 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:

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,\

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 \

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
 

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
 

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) \
 )

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) \
 )

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) \
 )
 

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) \
 )

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) \
 )
 

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 \