Fold URE: Linux ure/lib/* -> program/

The ../../../program/ links in the URE jar Class-Paths are a temporary kludge
(and juh.jar had lacked adaption for Mac OS X).

Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d

4 files changed, 55 insertions, 1 deletions

diff --git a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
new file mode 100644
index 000000000000..739112a67623
--- /dev/null
+++ b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
@@ -0,0 +1,36 @@
+# -*- 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/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jvmfwk3_ini))
+
+$(eval $(call gb_CustomTarget_register_targets,jvmfwk/jvmfwk3_ini, \
+    $(call gb_Helper_get_rcfile,jvmfwk3) \
+))
+
+$(call gb_CustomTarget_get_workdir,jvmfwk/jvmfwk3_ini)/$(call gb_Helper_get_rcfile,jvmfwk3): \
+            $(SRCDIR)/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	(   printf '[Bootstrap]\n' && \
+            printf 'UNO_JAVA_JFW_VENDOR_SETTINGS=$${ORIGIN}/../$(if $(filter-out MACOSX WNT,$(OS)),ure-link/)$(if $(filter-out WNT,$(OS)),share/)misc/javavendors.xml\n' && \
+            printf 'UNO_JAVA_JFW_SHARED_DATA=$${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}\n' && \
+            printf 'UNO_JAVA_JFW_USER_DATA=$${URE_OVERRIDE_JAVA_JFW_USER_DATA}\n' && \
+            printf 'UNO_JAVA_JFW_CLASSPATH_URLS=$${URE_MORE_JAVA_CLASSPATH_URLS}\n' \
+        ) > $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index 5ec28e5f8ead..396ed21de8d9 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -13,8 +13,10 @@ ifeq ($(ENABLE_JAVA),TRUE)
 
 $(eval $(call gb_Module_add_targets,jvmfwk,\
 	CustomTarget_jreproperties \
+	CustomTarget_jvmfwk_jvmfwk3_ini \
 	Library_jvmfwk \
 	Package_jreproperties \
+	Package_jvmfwk_jvmfwk3_ini \
 	Package_rcfiles \
 ))
 
diff --git a/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk b/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk
new file mode 100644
index 000000000000..51a933cea172
--- /dev/null
+++ b/jvmfwk/Package_jvmfwk_jvmfwk3_ini.mk
@@ -0,0 +1,16 @@
+# -*- 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_Package_Package,jvmfwk_jvmfwk3_ini,$(call gb_CustomTarget_get_workdir,jvmfwk/jvmfwk3_ini)))
+
+$(eval $(call gb_Package_add_files,jvmfwk_jvmfwk3_ini,$(LIBO_URE_ETC_FOLDER), \
+    $(call gb_Helper_get_rcfile,jvmfwk3) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 9bef1f2f6605..71479d2605bc 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -52,7 +52,7 @@ struct Bootstrap :
             buf.append(getLibraryLocation());
 #ifdef MACOSX
             // For some reason the jvmfwk3rc file is traditionally in
-            // "ure/lib", i.e.  in LIBO_URE_ETC_FOLDER
+            // LIBO_URE_ETC_FOLDER
             buf.appendAscii( "/../" LIBO_URE_ETC_FOLDER );
 #endif
             buf.appendAscii(SAL_CONFIGFILE("/jvmfwk3"));