From 9870a5f73dcfa6c2c15bc1fc6ba70fa3539f33ac Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Tue, 4 Feb 2014 18:03:46 +0100
Subject: scp2: move URE jars to AutoInstall

Change-Id: I68c5f5ac015e8c5d8efd60921f38eb31c6f8088d
---
 Repository.mk           |  9 +++++++--
 scp2/AutoInstall.mk     |  2 +-
 scp2/inc/macros.inc     |  8 ++++++++
 scp2/source/ooo/ure.scp | 54 -------------------------------------------------
 4 files changed, 16 insertions(+), 57 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 2e820e7937ac..576e5a4c9011 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -636,15 +636,19 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
 	passive_native \
 ))
 
-$(eval $(call gb_Helper_register_jars,URE, \
+ifneq ($(ENABLE_JAVA),)
+$(eval $(call gb_Helper_register_jars_for_install,URE,ure, \
 	java_uno \
 	juh \
 	jurt \
 	ridl \
-	testComponent \
 	unoloader \
 ))
 
+$(eval $(call gb_Helper_register_jars,URE, \
+	testComponent \
+))
+
 $(eval $(call gb_Helper_register_jars,OOO, \
 	ConnectivityTools \
 	ScriptFramework \
@@ -694,6 +698,7 @@ $(eval $(call gb_Helper_register_jars,NONE,\
 	test \
 	test-tools \
 ))
+endif
 
 # External executables
 $(eval $(call gb_ExternalExecutable_register_executables,\
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 6ec7d3220375..7871455d3533 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
 $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
 $(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
 
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 1ec649d652c6..a1580fdf6b28 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -222,6 +222,14 @@
         Styles   = (PACKED,DONT_OVERWRITE); \
     End
 
+#define URE_JAR_FILE(id,name) \
+    File id \
+        TXT_FILE_BODY; \
+        Name = name; \
+        Dir = GID_DIR_URE_JAVA; \
+        Styles = (PACKED); \
+    End
+
 #define JARFILENAME(name) STRING(CONCAT2(name,.jar))
 
 #define SPECIAL_COMPONENT_LIB_FILE(id,name) \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 3cf19c232cd8..8bd22f9d32d6 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -510,55 +510,6 @@ End
 
 #endif
 
-// Public JARs:
-
-#if defined ENABLE_JAVA
-File gid_File_Java_UnoloaderJar
-    TXT_FILE_BODY;
-    Dir = GID_DIR_URE_JAVA;
-    Name = "unoloader.jar";
-    Styles = (PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA
-File gid_File_Java_JuhJar
-    TXT_FILE_BODY;
-    Dir = GID_DIR_URE_JAVA;
-    Name = "juh.jar";
-    Styles = (PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA
-File gid_File_Java_JurtJar
-    TXT_FILE_BODY;
-    Dir = GID_DIR_URE_JAVA;
-    Name = "jurt.jar";
-    Styles = (PACKED);
-End
-#endif
-
-#if defined ENABLE_JAVA
-File gid_File_Java_RidlJar
-    TXT_FILE_BODY;
-    Dir = GID_DIR_URE_JAVA;
-    Name = "ridl.jar";
-    Styles = (PACKED);
-End
-#endif
-
-// Private JARs:
-
-#if defined ENABLE_JAVA
-File gid_File_Java_JavaUnoJar
-    TXT_FILE_BODY;
-    Dir = GID_DIR_URE_JAVA;
-    Name = "java_uno.jar";
-    Styles = (PACKED);
-End
-#endif
-
 // Public Miscellaneous Files:
 
 File gid_File_Misc_TypesRdb
@@ -647,11 +598,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Lib_Msvcp80_Ure,
             gid_File_Lib_Msvcm80_Ure,
             gid_File_Msvcm80crt_Manifest_Ure,
-            gid_File_Java_UnoloaderJar,
-            gid_File_Java_JuhJar,
-            gid_File_Java_JurtJar,
-            gid_File_Java_RidlJar,
-            gid_File_Java_JavaUnoJar,
             gid_File_Misc_TypesRdb,
             gid_File_Misc_ServicesRdb,
             gid_File_Misc_JavavendorsXml);
-- 
cgit