mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Still copy jvmfwk support files to solver

Browse Source 
...instead of only to instdir, as happened after
2e47462d07 "jvmfwk: install also into instdir," so
that CppunitTests (which still run against solver) can use jvmfwk.  This will
become moot when solver is eventually dropped.

Change-Id: Ic2cdbf32e20a79f8cc6ac2088e4bc47dcd6f5cc5
This commit is contained in:
Stephan Bergmann
2013-09-16 11:25:47 +02:00
parent 9a07b739c8
commit a041f518af
3 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jvmfwk/Module_jvmfwk.mk
View File

@@ -16,7 +16,9 @@ $(eval $(call gb_Module_add_targets,jvmfwk,\
Library_jvmfwk \
Library_sunjavaplugin \
Package_jreproperties \
Package_jreproperties_solver \
Package_rcfiles \
Package_rcfiles_solver \
))
ifneq (,$(filter-out MACOSX WNT,$(OS)))

20
jvmfwk/Package_jreproperties_solver.mk Normal file
View File

@@ -0,0 +1,20 @@
# -*- 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/.
#
ifeq ($(OS),WNT)
jvmfwk_Package_jreproperties_solver_LIBDIR := bin
else
jvmfwk_Package_jreproperties_solver_LIBDIR := lib
endif
$(eval $(call gb_Package_Package,jvmfwk_jreproperties_solver,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
$(eval $(call gb_Package_add_file,jvmfwk_jreproperties_solver,$(jvmfwk_Package_jreproperties_solver_LIBDIR)/JREProperties.class,JREProperties.class))
# vim:set noet sw=4 ts=4:

35
jvmfwk/Package_rcfiles_solver.mk Normal file
View File

@@ -0,0 +1,35 @@
# -*- 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/.
#
ifeq ($(OS),WNT)
jvmfwk_Package_rcfiles_solver_LIBDIR := bin
else
jvmfwk_Package_rcfiles_solver_LIBDIR := lib
endif
$(eval $(call gb_Package_Package,jvmfwk_rcfiles_solver,$(SRCDIR)/jvmfwk))
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,jvmfwk3),source/jvmfwk3rc))
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/$(call gb_Helper_get_rcfile,sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc))
ifeq ($(OS),AIX)
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
else ifeq ($(OS),FREEBSD)
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml))
else ifeq ($(OS),LINUX)
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
else ifeq ($(OS),MACOSX)
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml))
else ifeq ($(OS),WNT)
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml))
else
$(eval $(call gb_Package_add_file,jvmfwk_rcfiles_solver,$(jvmfwk_Package_rcfiles_solver_LIBDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml))
endif
# vim:set noet sw=4 ts=4: