From c282d0a3d838433a44f953c2681f5df71551f34b Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 5 Apr 2012 22:53:04 +0200 Subject: jurt: use CustomTarget makefile --- jurt/CustomTarget_test_urp.mk | 52 ++++++++++++++++++++++ jurt/JunitTest_urp.mk | 4 +- jurt/Module_jurt.mk | 8 +--- jurt/Package_jnilib.mk | 38 ---------------- jurt/Package_test_urp.mk | 43 ------------------ .../com/sun/star/lib/uno/protocols/urp/Makefile | 48 -------------------- jurt/util/Makefile | 38 ---------------- 7 files changed, 55 insertions(+), 176 deletions(-) create mode 100644 jurt/CustomTarget_test_urp.mk delete mode 100644 jurt/Package_jnilib.mk delete mode 100644 jurt/Package_test_urp.mk delete mode 100644 jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile delete mode 100644 jurt/util/Makefile (limited to 'jurt') diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk new file mode 100644 index 000000000000..725cae62ffd2 --- /dev/null +++ b/jurt/CustomTarget_test_urp.mk @@ -0,0 +1,52 @@ +# -*- 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 +# (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_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp,new_style)) + +JUTU := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/uno/protocols/urp) + +$(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp) : $(JUTU)/done + +$(JUTU)/done : $(JUTU)/registry.rdb $(OUTDIR)/bin/types.rdb \ + $(call gb_Executable_get_target_for_build,javamaker) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Helper_execute,javamaker -BUCR -O$(JUTU) -nD $< -X$(OUTDIR)/bin/types.rdb) && \ + touch $@ + +# TODO: would it be possible to reuse UnoApiTarget for this? +$(JUTU)/registry.rdb : $(JUTU)/interfaces.urd \ + $(call gb_Executable_get_target_for_build,regmerge) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RGM,1) + rm -f $@ && \ + $(call gb_Helper_execute,regmerge $@ /UCR $<) + +$(JUTU)/interfaces.urd : $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \ + $(call gb_Executable_get_target_for_build,idlc) | $(JUTU)/urd/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) + $(call gb_Helper_execute,idlc -O$(JUTU)/urd -I$(OUTDIR)/idl -cid -we $<) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk index 7431a8493415..a4ef41004021 100644 --- a/jurt/JunitTest_urp.mk +++ b/jurt/JunitTest_urp.mk @@ -27,8 +27,8 @@ $(eval $(call gb_JunitTest_JunitTest,jurt_urp)) -$(eval $(call gb_JunitTest_add_package_dependencies,jurt_urp,\ - jurt_test_urp \ +$(eval $(call gb_JunitTest_add_customtarget_dependencies,jurt_urp,\ + jurt/test/com/sun/star/lib/uno/protocols/urp \ )) $(eval $(call gb_JunitTest_add_jars,jurt_urp,\ diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk index 50339cd8d614..0501603d9a05 100644 --- a/jurt/Module_jurt.mk +++ b/jurt/Module_jurt.mk @@ -35,12 +35,6 @@ $(eval $(call gb_Module_add_targets,jurt,\ Zip_jurt \ )) -ifeq ($(OS),MACOSX) -$(eval $(call gb_Module_add_targets,jurt,\ - Package_jnilib \ -)) -endif - ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,jurt,\ Library_jpipx \ @@ -48,6 +42,7 @@ $(eval $(call gb_Module_add_targets,jurt,\ endif $(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\ + CustomTarget_test_urp \ JunitTest_bridgefactory \ JunitTest_connections \ JunitTest_java \ @@ -56,7 +51,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\ JunitTest_uno \ JunitTest_urp \ JunitTest_util \ - Package_test_urp \ )) endif diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk deleted file mode 100644 index 4ff0c6650cf7..000000000000 --- a/jurt/Package_jnilib.mk +++ /dev/null @@ -1,38 +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 -# (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,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util)) - -$(eval $(call gb_Package_add_file,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),,$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)))) - -$(eval $(call gb_Package_add_customtarget,jurt_jnilib,jurt/util)) - -$(eval $(call gb_CustomTarget_add_outdir_dependencies,jurt/util,\ - $(call gb_Library_get_target,jpipe) \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/Package_test_urp.mk b/jurt/Package_test_urp.mk deleted file mode 100644 index 80b4870c867b..000000000000 --- a/jurt/Package_test_urp.mk +++ /dev/null @@ -1,43 +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 -# (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,jurt_test_urp,$(WORKDIR)/CustomTarget/jurt/test/com/sun/star/lib/uno/protocols/urp)) - -$(eval $(call gb_Package_add_customtarget,jurt_test_urp,jurt/test/com/sun/star/lib/uno/protocols/urp)) - -$(eval $(call gb_CustomTarget_add_dependencies,jurt/test/com/sun/star/lib/uno/protocols/urp,\ - jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \ -)) - -$(eval $(call gb_CustomTarget_add_outdir_dependencies,jurt/test/com/sun/star/lib/uno/protocols/urp,\ - $(OUTDIR_FOR_BUILD)/bin/idlc$(gb_Executable_EXT_for_build) \ - $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \ - $(OUTDIR_FOR_BUILD)/bin/regmerge$(gb_Executable_EXT_for_build) \ - $(OUTDIR)/bin/types.rdb \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile b/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile deleted file mode 100644 index ffc0cd8c73dd..000000000000 --- a/jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile +++ /dev/null @@ -1,48 +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 -# (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. - -gb_PARTIALBUILD := T -include $(GBUILDDIR)/gbuild_simple.mk - -done : registry.rdb - $(call gb_Helper_execute,javamaker -BUCR -O$(dir .) -nD $< -X$(OUTDIR)/bin/types.rdb) && \ - touch $@ - -# TODO: would it be possible to reuse UnoApiTarget for this? -registry.rdb : interfaces.urd - rm -f $@ && \ - $(call gb_Helper_execute,regmerge $@ /UCR $<) - -interfaces.urd : $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl - mkdir urd && \ - $(call gb_Helper_execute,idlc -O$(dir ./urd) -I$(OUTDIR)/idl -cid -we $<) - -.DEFAULT_GOAL := all -.PHONY : all -all : done - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jurt/util/Makefile b/jurt/util/Makefile deleted file mode 100644 index 3230b22ce7e8..000000000000 --- a/jurt/util/Makefile +++ /dev/null @@ -1,38 +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 -# (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. - -gb_PARTIALBUID := T -include $(GBUILDDIR)/gbuild.mk - -libjpipe.jnilib : - $(SOLARENV)/bin/macosx-create-bundle $(call gb_Library_get_target,jpipe) - -.DEFAULT_GOAL := all -.PHONY : all -all : libjpipe.jnilib - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: -- cgit