diff options
| -rw-r--r-- | jvmfwk/Module_jvmfwk.mk | 1 | ||||
| -rw-r--r-- | jvmfwk/Package_javavendors.mk | 56 | ||||
| -rw-r--r-- | jvmfwk/Package_rcfiles.mk | 32 | ||||
| -rw-r--r-- | testtools/source/bridgetest/makefile.mk | 6 |
4 files changed, 33 insertions, 62 deletions
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk index 84399db84dbe..381af369e716 100644 --- a/jvmfwk/Module_jvmfwk.mk +++ b/jvmfwk/Module_jvmfwk.mk @@ -37,7 +37,6 @@ ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,jvmfwk,\ Library_sunjavaplugin \ - Package_javavendors \ Package_jreproperties \ )) diff --git a/jvmfwk/Package_javavendors.mk b/jvmfwk/Package_javavendors.mk deleted file mode 100644 index 63457765511c..000000000000 --- a/jvmfwk/Package_javavendors.mk +++ /dev/null @@ -1,56 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Package_Package,jvmfwk_javavendors,$(SRCDIR)/jvmfwk/distributions/OpenOfficeorg)) - -# TODO: why are we delivering this stuff to two places? -ifeq ($(GUI),UNX) -ifeq ($(OS),FREEBSD) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_freebsd.xml)) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_freebsd.xml)) -else ifeq ($(OS),MACOSX) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_macosx.xml)) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_macosx.xml)) -else ifeq ($(OS),LINUX) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_linux.xml)) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_linux.xml)) -else ifeq ($(OS),AIX) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_linux.xml)) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_linux.xml)) -else -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_unx.xml)) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_unx.xml)) -endif -else ifeq ($(GUI),WNT) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,bin/javavendors.xml,javavendors_wnt.xml)) -$(eval $(call gb_Package_add_file,jvmfwk_javavendors,lib/javavendors.xml,javavendors_wnt.xml)) -else -$(call gb_Output_error,Unsupported platform) -endif - - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk index 68dad6fe5e5d..b86a88c3af3f 100644 --- a/jvmfwk/Package_rcfiles.mk +++ b/jvmfwk/Package_rcfiles.mk @@ -27,8 +27,36 @@ $(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk)) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,bin/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc)) -$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,bin/jvmfwk3),source/jvmfwk3rc)) $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/javasettingsunopkginstall.xml,source/javasettingsunopkginstall.xml)) +# 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 ($(GUI),WNT) +my_Package_jvmfwk_rcfiles_dir = bin +else +my_Package_jvmfwk_rcfiles_dir = lib +endif + +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(my_Package_jvmfwk_rcfiles_dir)/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc)) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(my_Package_jvmfwk_rcfiles_dir)/jvmfwk3),source/jvmfwk3rc)) + +ifeq ($(GUI),UNX) +ifeq ($(OS),FREEBSD) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml)) +else ifeq ($(OS),MACOSX) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml)) +else ifeq ($(OS),LINUX) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) +else ifeq ($(OS),AIX) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml)) +else +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml)) +endif +else ifeq ($(GUI),WNT) +$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml)) +else +$(call gb_Output_error,Unsupported platform) +endif + # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 142319085936..3e31ba6f8eb4 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -195,9 +195,9 @@ $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk $(GIVE_EXEC_RIGHTS) $@ $(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk - echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro services.rdb \ - -ro uno_services.rdb -ro uno_types.rdb \ - -s com.sun.star.test.bridge.BridgeTest \ + echo '$(AUGMENT_LIBRARY_PATH)' JAVA_HOME='$(JAVA_HOME)' \ + '$(SOLARBINDIR)'/uno -ro services.rdb -ro uno_services.rdb \ + -ro uno_types.rdb -s com.sun.star.test.bridge.BridgeTest \ -env:URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) \ -env:MY_CLASSDIR_URL=$(MY_LOCAL_CLASSDIR) \ -- com.sun.star.test.bridge.JavaTestObject noCurrentContext > $@ |