diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-17 16:37:01 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:00 +0200 |
commit | 2e47462d076364725875e770a91a7bb6bbbec2c1 (patch) | |
tree | 1b170d3a8211b483ab277d790d915e405e18412a | |
parent | install images with filelists (diff) | |
download | core-2e47462d076364725875e770a91a7bb6bbbec2c1.tar.gz core-2e47462d076364725875e770a91a7bb6bbbec2c1.zip |
jvmfwk: install also into instdir
Change-Id: I4004361a85af4e6aed9dd0951d1154a2d99f97e7
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | jvmfwk/Module_jvmfwk.mk | 22 | ||||
-rw-r--r-- | jvmfwk/Package_jreproperties.mk | 5 | ||||
-rw-r--r-- | jvmfwk/Package_jreproperties_install.mk | 16 | ||||
-rw-r--r-- | jvmfwk/Package_rcfiles.mk | 28 | ||||
-rw-r--r-- | jvmfwk/Package_rcfiles_install.mk | 32 | ||||
-rw-r--r-- | scp2/source/ooo/ure.scp | 12 |
8 files changed, 25 insertions, 92 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 3b586aff0479..e5e1953c7cc2 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -313,6 +313,7 @@ export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@ export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@ export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@ export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@ +export LIBO_URE_SHARE_FOLDER=@LIBO_URE_SHARE_FOLDER@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@ export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@ diff --git a/configure.ac b/configure.ac index 53c5a06527c7..5381232b014f 100644 --- a/configure.ac +++ b/configure.ac @@ -2967,6 +2967,7 @@ AC_SUBST(LIBO_SHARE_HELP_FOLDER) AC_SUBST(LIBO_SHARE_PRESETS_FOLDER) AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER) AC_SUBST(LIBO_URE_LIB_FOLDER) +AC_SUBST(LIBO_URE_SHARE_FOLDER) AC_SUBST(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE) dnl =================================================================== diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk index 511448701794..00fd9c569008 100644 --- a/jvmfwk/Module_jvmfwk.mk +++ b/jvmfwk/Module_jvmfwk.mk @@ -12,31 +12,21 @@ $(eval $(call gb_Module_Module,jvmfwk)) ifeq ($(ENABLE_JAVA),TRUE) $(eval $(call gb_Module_add_targets,jvmfwk,\ - Library_jvmfwk \ - Package_rcfiles \ -)) - -$(eval $(call gb_Module_add_targets,jvmfwk,\ - CustomTarget_jreproperties \ - Library_sunjavaplugin \ - Package_jreproperties \ + CustomTarget_jreproperties \ + Library_jvmfwk \ + Library_sunjavaplugin \ + Package_jreproperties \ + Package_rcfiles \ )) ifneq (,$(filter-out MACOSX WNT,$(OS))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,jvmfwk,\ - Executable_javaldx \ + Executable_javaldx \ )) 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.mk b/jvmfwk/Package_jreproperties.mk index 7ca2ba8a95ed..1b3302fa97e3 100644 --- a/jvmfwk/Package_jreproperties.mk +++ b/jvmfwk/Package_jreproperties.mk @@ -9,7 +9,8 @@ $(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties))) -$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,bin/JREProperties.class,JREProperties.class)) -$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,lib/JREProperties.class,JREProperties.class)) +$(eval $(call gb_Package_set_outdir,jvmfwk_jreproperties,$(INSTDIR))) + +$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(LIBO_URE_LIB_FOLDER)/JREProperties.class,JREProperties.class)) # vim:set noet sw=4 ts=4: diff --git a/jvmfwk/Package_jreproperties_install.mk b/jvmfwk/Package_jreproperties_install.mk deleted file mode 100644 index a27fc3d5400a..000000000000 --- a/jvmfwk/Package_jreproperties_install.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- 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.mk b/jvmfwk/Package_rcfiles.mk index 2949e3cdcc68..22b9fbdfc31e 100644 --- a/jvmfwk/Package_rcfiles.mk +++ b/jvmfwk/Package_rcfiles.mk @@ -7,36 +7,24 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk)) +$(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk)) -# The below files (intended to be also used during the build) need to go into -# the same directory as dynamic libraries (either bin or lib): - -ifeq ($(OS),WNT) -jvmfwk_Package_RCFILESDIR := bin -else -jvmfwk_Package_RCFILESDIR := lib -endif - -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc)) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/jvmfwk3),source/jvmfwk3rc)) +$(eval $(call gb_Package_set_outdir,jvmfwk_javavendors,$(INSTDIR))) ifneq ($(OS),WNT) ifeq ($(OS),FREEBSD) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml)) else ifeq ($(OS),MACOSX) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml)) else ifeq ($(OS),LINUX) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) else ifeq ($(OS),AIX) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) else -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml)) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml)) endif -else ifeq ($(OS),WNT) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) else -$(call gb_Output_error,Unsupported platform) +$(eval $(call gb_Package_add_file,jvmfwk_javavendors,$(LIBO_URE_SHARE_FOLDER)/misc/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) endif # vim:set noet sw=4 ts=4: diff --git a/jvmfwk/Package_rcfiles_install.mk b/jvmfwk/Package_rcfiles_install.mk deleted file mode 100644 index 253f7eda3bda..000000000000 --- a/jvmfwk/Package_rcfiles_install.mk +++ /dev/null @@ -1,32 +0,0 @@ -# -*- 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/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 2c4e7f636239..3430b77198bd 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -275,9 +275,9 @@ End #if defined ENABLE_JAVA File gid_File_Dl_JrepropertiesClass TXT_FILE_BODY; - Dir = SCP2_URE_DL_DIR; - Name = "JREProperties.class"; - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); + Dir = FILELIST_DIR; + Name = "jvmfwk_jreproperties.filelist"; + Styles = (FILELIST, PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "0C4B8DCF-18D1-47D9-8BB7-A5C1D9268016"; End #endif @@ -602,9 +602,9 @@ End #if defined ENABLE_JAVA File gid_File_Misc_JavavendorsXml TXT_FILE_BODY; - Dir = GID_DIR_URE_SHARE_MISC; - Name = "javavendors.xml"; - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); + Dir = FILELIST_DIR; + Name = "jvmfwk_javavendors.filelist"; + Styles = (FILELIST, PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "403FCCFE-545B-44F6-91D1-5C75F846E587"; End #endif |