[Libreoffice-commits] .: Branch 'feature/gbuild_java' - 8 commits - jvmfwk/Package_rcfiles.mk ridljar/com ridljar/Jar_ridl.mk ridljar/JunitTest_typedesc.mk ridljar/JunitTest_uno.mk ridljar/JunitTest_util.mk ridljar/Module_ridljar.mk ridljar/source ridljar/test ridljar/util solenv/gbuild unoil/Jar_unoil.mk
David Tardon
dtardon at kemper.freedesktop.org
Sun Dec 25 01:55:57 PST 2011
jvmfwk/Package_rcfiles.mk | 9 --
ridljar/Jar_ridl.mk | 9 +-
ridljar/JunitTest_typedesc.mk | 39 ++++++++++
ridljar/JunitTest_uno.mk | 41 ++++++++++
ridljar/JunitTest_util.mk | 39 ++++++++++
ridljar/Module_ridljar.mk | 8 ++
ridljar/com/makefile.mk | 64 -----------------
ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk | 35 ---------
ridljar/test/com/sun/star/lib/util/makefile.mk | 36 ---------
ridljar/test/com/sun/star/uno/makefile.mk | 38 ----------
ridljar/test/makefile.mk | 35 ---------
solenv/gbuild/Jar.mk | 11 ++
solenv/gbuild/JavaClassSet.mk | 24 ++++++
solenv/gbuild/platform/com_GCC_defs.mk | 2
solenv/gbuild/platform/windows.mk | 2
unoil/Jar_unoil.mk | 6 +
16 files changed, 174 insertions(+), 224 deletions(-)
New commits:
commit a0f247d73d450afdaba9997b70ad148884dfe7e4
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 25 10:55:29 2011 +0100
remove stray delzip files
diff --git a/ridljar/source/unoloader/delzip b/ridljar/source/unoloader/delzip
deleted file mode 100644
index e69de29..0000000
diff --git a/ridljar/util/delzip b/ridljar/util/delzip
deleted file mode 100644
index e69de29..0000000
commit 4761f27c047ce7eaa4aa8bb591611ed2f2fc17d8
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 25 10:53:32 2011 +0100
remove stray makefile.mk
diff --git a/ridljar/com/makefile.mk b/ridljar/com/makefile.mk
deleted file mode 100644
index df81636..0000000
--- a/ridljar/com/makefile.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..
-PRJNAME := ridljar
-TARGET := com
-
-PACKAGE := com
-
-.INCLUDE: settings.mk
-
-JAVAFILES = \
- sun$/star$/lib$/uno$/typedesc$/FieldDescription.java \
- sun$/star$/lib$/uno$/typedesc$/MemberDescriptionHelper.java \
- sun$/star$/lib$/uno$/typedesc$/MethodDescription.java \
- sun$/star$/lib$/uno$/typedesc$/TypeDescription.java \
- sun$/star$/lib$/uno$/typeinfo$/AttributeTypeInfo.java \
- sun$/star$/lib$/uno$/typeinfo$/ConstantTypeInfo.java \
- sun$/star$/lib$/uno$/typeinfo$/MemberTypeInfo.java \
- sun$/star$/lib$/uno$/typeinfo$/MethodTypeInfo.java \
- sun$/star$/lib$/uno$/typeinfo$/ParameterTypeInfo.java \
- sun$/star$/lib$/uno$/typeinfo$/TypeInfo.java \
- sun$/star$/lib$/util$/DisposeListener.java \
- sun$/star$/lib$/util$/DisposeNotifier.java \
- sun$/star$/lib$/util$/WeakMap.java \
- sun$/star$/uno$/Any.java \
- sun$/star$/uno$/Enum.java \
- sun$/star$/uno$/IBridge.java \
- sun$/star$/uno$/IEnvironment.java \
- sun$/star$/uno$/IFieldDescription.java \
- sun$/star$/uno$/IMapping.java \
- sun$/star$/uno$/IMemberDescription.java \
- sun$/star$/uno$/IMethodDescription.java \
- sun$/star$/uno$/IQueryInterface.java \
- sun$/star$/uno$/ITypeDescription.java \
- sun$/star$/uno$/Type.java \
- sun$/star$/uno$/Union.java \
- sun$/star$/uno$/UnoRuntime.java
-
-.INCLUDE: target.mk
commit 951bd1c5f90bc9baf4e62422a60281f69ee11e79
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 25 10:53:18 2011 +0100
convert ridljar unit tests
diff --git a/ridljar/JunitTest_typedesc.mk b/ridljar/JunitTest_typedesc.mk
new file mode 100644
index 0000000..2242e9d
--- /dev/null
+++ b/ridljar/JunitTest_typedesc.mk
@@ -0,0 +1,39 @@
+# -*- 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 at 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_JunitTest_JunitTest,ridljar_typedesc))
+
+$(eval $(call gb_JunitTest_add_jars,ridljar_typedesc,\
+ $(OUTDIR)/bin/OOoRunnerLight.jar \
+ $(OUTDIR)/bin/ridl.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_typedesc,\
+ ridljar/test/com/sun/star/lib/uno/typedesc/TypeDescription_Test \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk
new file mode 100644
index 0000000..62ca80c
--- /dev/null
+++ b/ridljar/JunitTest_uno.mk
@@ -0,0 +1,41 @@
+# -*- 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 at 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_JunitTest_JunitTest,ridljar_uno))
+
+$(eval $(call gb_JunitTest_add_jars,ridljar_uno,\
+ $(OUTDIR)/bin/OOoRunnerLight.jar \
+ $(OUTDIR)/bin/ridl.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_uno,\
+ ridljar/test/com/sun/star/uno/Any_Test \
+ ridljar/test/com/sun/star/uno/Type_Test \
+ ridljar/test/com/sun/star/uno/UnoRuntime_Test \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk
new file mode 100644
index 0000000..976554e
--- /dev/null
+++ b/ridljar/JunitTest_util.mk
@@ -0,0 +1,39 @@
+# -*- 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 at 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_JunitTest_JunitTest,ridljar_util))
+
+$(eval $(call gb_JunitTest_add_jars,ridljar_util,\
+ $(OUTDIR)/bin/OOoRunnerLight.jar \
+ $(OUTDIR)/bin/ridl.jar \
+))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,ridljar_util,\
+ ridljar/test/com/sun/star/lib/util/WeakMap_Test \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk
index c1cdfa6..dde756f 100644
--- a/ridljar/Module_ridljar.mk
+++ b/ridljar/Module_ridljar.mk
@@ -35,6 +35,14 @@ $(eval $(call gb_Module_add_targets,ridljar,\
Zip_ridl \
Zip_unoloader \
))
+
+# unfortunately, these tests depend on qadevOOo, which depends on
+# ridl.jar for build...
+$(eval $(call gb_Module_add_subsequentcheck_targets,ridljar,\
+ JunitTest_typedesc \
+ JunitTest_uno \
+ JunitTest_util \
+))
endif
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk b/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk
deleted file mode 100644
index e329026..0000000
--- a/ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..
-PRJNAME := ridljar
-TARGET := test_com_sun_star_lib_uno_typedesc
-
-PACKAGE := com$/sun$/star$/lib$/uno$/typedesc
-JAVATESTFILES := TypeDescription_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/ridljar/test/com/sun/star/lib/util/makefile.mk b/ridljar/test/com/sun/star/lib/util/makefile.mk
deleted file mode 100644
index 7da28b6..0000000
--- a/ridljar/test/com/sun/star/lib/util/makefile.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..
-PRJNAME := ridljar
-TARGET := test_com_sun_star_lib_util
-
-PACKAGE := com$/sun$/star$/lib$/util
-JAVATESTFILES := \
- WeakMap_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/ridljar/test/com/sun/star/uno/makefile.mk b/ridljar/test/com/sun/star/uno/makefile.mk
deleted file mode 100644
index 6f2fd83..0000000
--- a/ridljar/test/com/sun/star/uno/makefile.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..
-PRJNAME := ridljar
-TARGET := test_com_sun_star_uno
-
-PACKAGE := com$/sun$/star$/uno
-JAVATESTFILES := \
- Any_Test.java \
- Type_Test.java \
- UnoRuntime_Test.java
-
-.INCLUDE: javaunittest.mk
diff --git a/ridljar/test/makefile.mk b/ridljar/test/makefile.mk
deleted file mode 100644
index 86b432d..0000000
--- a/ridljar/test/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# Quick and dirty way to run all tests in sub-directories; probably only works
-# on Unix.
-# Can be removed once tests are included in regular builds.
-
-all .PHONY:
- cd com/sun/star/lib/uno/typedesc && dmake
- cd com/sun/star/lib/util && dmake
- cd com/sun/star/uno && dmake
commit 4882387c668308e93d6eabbc56d2fdc3751b32ca
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 25 10:36:12 2011 +0100
add dependency on package
diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk
index 7e3ba39..edc0471 100644
--- a/unoil/Jar_unoil.mk
+++ b/unoil/Jar_unoil.mk
@@ -27,10 +27,12 @@
$(eval $(call gb_Jar_Jar,unoil))
+$(eval $(call gb_Jar_add_package_dependencies,unoil,\
+ unoil_javamaker \
+))
+
$(eval $(call gb_Jar_add_packagedirs,unoil,\
$(WORKDIR)/CustomTarget/unoil/javamaker/com \
))
-$(call gb_Jar_get_target,unoil) : $(call gb_Package_get_target,unoil_javamaker)
-
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit ff9a64e01d7d46a9869327fb89a4adcc674eb433
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 25 10:32:01 2011 +0100
add dependency on package
diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
index 337c03f..b4c60e3 100644
--- a/ridljar/Jar_ridl.mk
+++ b/ridljar/Jar_ridl.mk
@@ -27,6 +27,10 @@
$(eval $(call gb_Jar_Jar,ridl))
+$(eval $(call gb_Jar_add_package_dependencies,ridl,\
+ ridljar_javamaker \
+))
+
$(eval $(call gb_Jar_add_jars,ridl,\
$(WORKDIR)/CustomTarget/ridljar/javamaker/class \
))
@@ -66,9 +70,4 @@ $(eval $(call gb_Jar_add_sourcefiles,ridl,\
ridljar/com/sun/star/uno/UnoRuntime \
))
-# gb_Jar_add_jars adds dependency on all "jars", but the .../class dir
-# is created by a custom target, so there is no visible rule for it,
-# which is something make does not like. We add one to satisfy it.
-$(WORKDIR)/CustomTarget/ridljar/javamaker/class :| $(call gb_Package_get_target,ridljar_javamaker)
-
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 78e56daa46a01f375684bc3d4c5767c6c0a9ac07
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 25 10:28:44 2011 +0100
impl. package deps for JavaClassSet
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index f1fe144..bf4ed12 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -201,6 +201,16 @@ $(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2))
endef
+define gb_Jar_add_package_dependency
+$(call gb_JavaClassSet_add_package_dependency,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
+endef
+
+define gb_Jar_add_package_dependencies
+$(call gb_JavaClassSet_add_package_dependencies,$(call gb_Jar_get_classsetname,$(1)),$(2))
+
+endef
+
# possible directories for jar files containing UNO services
gb_Jar_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
@@ -222,5 +232,4 @@ $(call gb_Jar_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_targe
endef
-
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 6befda1..100976f 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -29,6 +29,13 @@
gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
gb_JavaClassSet_JAVACDEBUG :=
+# Enforce dependency ordering.
+#
+# This target is used to enforce correct dependency order for possibly
+# generated stuff: generated sources, jars/classdirs etc. Everything but
+# source files depends on it.
+gb_JavaClassSet_get_preparation_target = $(WORKDIR)/JavaClassSet/$(1)/prepared
+
ifneq ($(gb_DEBUGLEVEL),0)
gb_JavaClassSet_JAVACDEBUG := -g
endif
@@ -60,8 +67,12 @@ $(call gb_JavaClassSet_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
+$(call gb_JavaClassSet_get_preparation_target,%) :
+ mkdir -p $(dir $@) && touch $@
+
define gb_JavaClassSet_JavaClassSet
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
+$(call gb_JavaClassSet_get_target,$(1)) :| $(call gb_JavaClassSet_get_preparation_target,$(1))
endef
@@ -85,7 +96,7 @@ endef
define gb_JavaClassSet_add_generated_sourcefile
$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet__get_generated_sourcefile,$(2))
-$(call gb_JavaClassSet__get_generated_sourcefile,$(2)) : $(gb_Helper_PHONY)
+$(call gb_JavaClassSet__get_generated_sourcefile,$(2)) :| $(call gb_JavaClassSet_get_preparation_target,$(1))
endef
@@ -105,6 +116,7 @@ define gb_JavaClassSet_add_jar
$(call gb_JavaClassSet_get_target,$(1)) : $(2)
$(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2))
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2)
+$(2) :| $(call gb_JavaClassSet_get_preparation_target,$(1))
endef
@@ -139,4 +151,14 @@ $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external)))
endef
+define gb_JavaClassSet_add_package_dependency
+$(call gb_JavaClassSet_get_preparation_target,$(1)) :| $(call gb_Package_get_target,$(2))
+
+endef
+
+define gb_JavaClassSet_add_package_dependencies
+$(foreach dependency,$(2),$(call gb_JavaClassSet_add_package_dependency,$(1),$(dependency)))
+
+endef
+
# vim: set noet sw=4:
commit 3cca9f67992d30f8cbcdf1f4f8b9272cfbbc2d8e
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 25 08:08:08 2011 +0100
use gb_Helper_get_rcfile here
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk
index 1caf644..68dad6f 100644
--- a/jvmfwk/Package_rcfiles.mk
+++ b/jvmfwk/Package_rcfiles.mk
@@ -27,13 +27,8 @@
$(eval $(call gb_Package_Package,jvmfwk_rcfiles,$(SRCDIR)/jvmfwk))
-ifeq ($(GUI),WNT)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/sunjavaplugin.ini,plugins/sunmajor/pluginlib/sunjavapluginrc))
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/jvmfwk3.ini,source/jvmfwk3rc))
-else
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/sunjavapluginrc,plugins/sunmajor/pluginlib/sunjavapluginrc))
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/jvmfwk3rc,source/jvmfwk3rc))
-endif
+$(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))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 804591d9564bb3bd815e414ccc1f99ef5077fbb6
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 25 08:05:10 2011 +0100
add helper func. to get rc file name
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 33aa936..864797c 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -162,3 +162,5 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
+
+gb_Helper_get_rcfile = $(1)rc
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 35658b2..56bddc7 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -29,6 +29,8 @@ GUI := WNT
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
+gb_Helper_get_rcfile = $(1).ini
+
gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
# vim:set noexpandtab:
More information about the Libreoffice-commits
mailing list