copy more rc files to instdir

Change-Id: Ia4cc2b8e504f46734ea7bfaade60bf27509cce32

7 files changed, 74 insertions, 15 deletions

diff --git a/instsetoo_native/Package_config.mk b/instsetoo_native/Package_config.mk
index 6eef87be5b0d..01c708b8ef54 100644
--- a/instsetoo_native/Package_config.mk
+++ b/instsetoo_native/Package_config.mk
@@ -17,6 +17,4 @@ $(eval $(call gb_Package_add_files,instsetoo_native_config,program,\
 	unorc \
 ))
 
-$(eval $(call gb_Package_add_file,instsetoo_native_config,ure/lib/unorc,unorc.ure))
-
 # vim: set noet sw=4 ts=4:
diff --git a/instsetoo_native/config/unorc.ure b/instsetoo_native/config/unorc.ure
deleted file mode 100644
index 78d4d6ed2785..000000000000
--- a/instsetoo_native/config/unorc.ure
+++ /dev/null
@@ -1,13 +0,0 @@
-= 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/.
-=
-
-[Bootstrap]
-URE_INTERNAL_LIB_DIR=${ORIGIN}
-URE_INTERNAL_JAVA_DIR=${ORIGIN}../share/java
-URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
-UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}
-UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index 51ae323646ce..dbd8d2b761c1 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -30,6 +30,13 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\
 endif
 endif
 
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(eval $(call gb_Module_add_targets,jvmfwk,\
+	Package_jreproperties_install \
+	Package_rcfiles_install \
+))
+endif
+
 endif
 
 # vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_jreproperties_install.mk b/jvmfwk/Package_jreproperties_install.mk
new file mode 100644
index 000000000000..a27fc3d5400a
--- /dev/null
+++ b/jvmfwk/Package_jreproperties_install.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_jreproperties_install,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
+
+$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties_install,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties_install,ure/lib/JREProperties.class,JREProperties.class))
+
+# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_rcfiles_install.mk b/jvmfwk/Package_rcfiles_install.mk
new file mode 100644
index 000000000000..253f7eda3bda
--- /dev/null
+++ b/jvmfwk/Package_rcfiles_install.mk
@@ -0,0 +1,32 @@
+# -*- 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_rcfiles_install,$(SRCDIR)/jvmfwk))
+
+$(eval $(call gb_Package_set_outdir,jvmfwk_rcfiles_install,$(INSTDIR)))
+
+ifneq ($(OS),WNT)
+ifeq ($(OS),FREEBSD)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml))
+else ifeq ($(OS),MACOSX)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml))
+else ifeq ($(OS),LINUX)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
+else ifeq ($(OS),AIX)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
+else
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml))
+endif
+else ifeq ($(OS),WNT)
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_install,ure/share/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml))
+else
+$(call gb_Output_error,Unsupported platform)
+endif
+
+# vim:set noet sw=4 ts=4:
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 1d9178b6ed45..2a48f32734eb 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,ure))
 
 $(eval $(call gb_Module_add_targets,ure,\
     Package_distribution \
+	$(if $(gb_RUNNABLE_INSTDIR),Package_install) \
     Rdb_ure \
 ))
 
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
new file mode 100644
index 000000000000..de48dd4c9dba
--- /dev/null
+++ b/ure/Package_install.mk
@@ -0,0 +1,18 @@
+# -*- 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,ure_install,$(SRCDIR)/ure/source))
+
+$(eval $(call gb_Package_set_outdir,ure_install,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,ure_install,ure/bin/startup.sh,startup.sh))
+$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,jvmfwk3),jvmfwk3rc))
+$(eval $(call gb_Package_add_file,ure_install,ure/lib/$(call gb_Helper_get_rcfile,uno),unorc))
+
+# vim:set noet sw=4 ts=4: