autoinstall more ure libraries

Change-Id: I7bbf716fb56726bceb3f84e757ff7ab6c3cc79e7

2 files changed, 20 insertions, 174 deletions

diff --git a/Repository.mk b/Repository.mk
index 0afc24bf670a..df136758b0f5 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -436,6 +436,26 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,URE, \
 	$(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
 ))
 
+$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,URE, \
+	acceptor \
+	binaryurp \
+	bootstrap \
+	connector \
+	introspection \
+	invocadapt \
+	invocation \
+	$(if $(SOLAR_JAVA),javaloader) \
+	$(if $(SOLAR_JAVA),javavm) \
+	namingservice \
+	proxyfac \
+	reflection \
+	stocservices \
+	streams \
+	textinstream \
+	textoutstream \
+	uuresolver \
+))
+
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
 	$(if $(filter MSC,$(COM)),cli_cppuhelper) \
 	$(if $(filter MSC,$(COM)),cli_uno) \
@@ -628,26 +648,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
-    acceptor \
-    binaryurp \
-    bootstrap \
-    connector \
-    introspection \
-    invocadapt \
-    invocation \
-    javaloader \
-    javavm \
-    namingservice \
-    proxyfac \
-    reflection \
-    stocservices \
-    streams \
     testtools_cppobj \
     testtools_bridgetest \
     testtools_constructors \
-    textinstream \
-    textoutstream \
-    uuresolver \
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 7a034ad3d207..2b4ac3a49e0c 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -478,146 +478,6 @@ File gid_File_Dl_Jpipx
 End
 #endif
 
-File gid_File_Dl_Acceptor
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("acceptor.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "31183C51-C9A4-4D7A-A2F4-103252E1FEB0";
-End
-
-File gid_File_Dl_Binaryurp
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("binaryurp.uno");
-    Styles = (PACKED);
-End
-
-File gid_File_Dl_Bootstrap
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("bootstrap.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "2620B307-25DB-498F-B2B8-46D928165331";
-End
-
-File gid_File_Dl_Connector
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("connector.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EBCE77E7-E244-40F6-96E2-5319D6571C5D";
-End
-
-File gid_File_Dl_Introspection
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("introspection.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "E99960CF-FE59-4332-A2AC-47418C3A17C1";
-End
-
-File gid_File_Dl_Invocadapt
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("invocadapt.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "77DDC112-1994-49D5-A086-FB16D4328AB9";
-End
-
-File gid_File_Dl_Invocation
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("invocation.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "A79ACB80-DA65-47CA-81BA-7CD9E191C84C";
-End
-
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Javaloader
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("javaloader.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "19A20968-E654-4E2C-9F58-7B66F07CA346";
-End
-#endif
-
-#if defined SOLAR_JAVA
-File gid_File_Dl_Javavm
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("javavm.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "F1266B2B-80AD-4248-A921-9161759FA4DA";
-End
-#endif
-
-File gid_File_Dl_Namingservice
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("namingservice.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DD22BE3A-AD21-447D-B3A3-89B0FCDB0B31";
-End
-
-File gid_File_Dl_Stocservices
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("stocservices.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "EBF6BBDE-EC50-4FB8-A0D4-BEC58F1C8C07";
-End
-
-File gid_File_Dl_Proxyfac
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("proxyfac.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "A2CDDEC3-B9C7-48C9-AB35-65008777BC2F";
-End
-
-File gid_File_Dl_Reflection
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("reflection.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "601C7946-CFEB-4F56-9429-6D5963188DF3";
-End
-
-File gid_File_Dl_Streams
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("streams.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "6028CF43-A9B7-40A8-8216-509CAB256A2B";
-End
-
-File gid_File_Dl_Textinstream
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("textinstream.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DAA39D01-D9C5-40C4-94EC-9E4B2F94EABA";
-End
-
-File gid_File_Dl_Textoutstream
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("textoutstream.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "DD01EB0C-A119-43AE-9100-F7A595D099E4";
-End
-
-File gid_File_Dl_Uuresolver
-    LIB_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_BARE("uuresolver.uno");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "377090E1-5008-424F-B0F6-A9EFC9F11206";
-End
-
 #if !defined SYSTEM_LIBXML
 File gid_File_Dl_Libxml2
     LIB_FILE_BODY;
@@ -837,23 +697,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Profile_Jvmfwk3rc,
             gid_File_Dl_Jpipe,
             gid_File_Dl_Jpipx,
-            gid_File_Dl_Acceptor,
-            gid_File_Dl_Binaryurp,
-            gid_File_Dl_Bootstrap,
-            gid_File_Dl_Connector,
-            gid_File_Dl_Introspection,
-            gid_File_Dl_Invocadapt,
-            gid_File_Dl_Invocation,
-            gid_File_Dl_Javaloader,
-            gid_File_Dl_Javavm,
-            gid_File_Dl_Namingservice,
-            gid_File_Dl_Proxyfac,
-            gid_File_Dl_Reflection,
-            gid_File_Dl_Stocservices,
-            gid_File_Dl_Streams,
-            gid_File_Dl_Textinstream,
-            gid_File_Dl_Textoutstream,
-            gid_File_Dl_Uuresolver,
             gid_File_Dl_Libxml2,
             gid_File_Lib_Mingw_GccS_Ure,
             gid_File_Lib_Mingw_Stdcpp_Ure,