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 ---------- jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile | 48 ------------ jurt/util/Makefile | 38 --------- ridljar/CustomTarget_javamaker.mk | 40 ++++++++++ ridljar/Jar_ridl.mk | 4 - ridljar/Module_ridljar.mk | 2 ridljar/Package_javamaker.mk | 37 --------- ridljar/javamaker/Makefile | 39 --------- solenv/gbuild/Jar.mk | 12 ++- solenv/gbuild/JavaClassSet.mk | 9 +- solenv/gbuild/JunitTest.mk | 15 +++ solenv/gbuild/LinkTarget.mk | 7 + unoil/CustomTarget_climaker.mk | 71 ++++++++++++++++++ unoil/CustomTarget_javamaker.mk | 41 ++++++++++ unoil/Jar_unoil.mk | 4 - unoil/Module_unoil.mk | 3 unoil/Package_climaker.mk | 15 --- unoil/Package_javamaker.mk | 38 --------- unoil/climaker/Makefile | 64 ---------------- unoil/javamaker/Makefile | 40 ---------- unusedcode.easy | 3 vcl/inc/vcl/slider.hxx | 3 vcl/source/control/slider.cxx | 28 ------- 27 files changed, 250 insertions(+), 456 deletions(-)
New commits: commit 0168b4e6ec645ab3706a1c6104b2aba4a7002536 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Fri Apr 6 11:48:57 2012 +0200 make add_custom_headers better diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 996ef9c..cda3f46 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -907,7 +907,7 @@ $(2) :| $(call gb_LinkTarget_get_external_headers_target,$(1)) endef -define gb_LinkTarget_add_custom_headers +define gb_LinkTarget__add_custom_headers $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) ifeq ($(gb_FULLDEPS),$(true)) @@ -918,6 +918,11 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_t endef +define gb_LinkTarget_add_custom_headers +$(foreach customtarget,$(2),$(call gb_LinkTarget__add_custom_headers,$(1),$(customtarget))) + +endef + define gb_LinkTarget_add_package_headers $(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_Package_get_target,$(package)))) $(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package))) commit 9f92346e7c711786243d41bcd952b61cc922a21f Author: Thomas Collerton <tom.col...@gmail.com> Date: Wed Apr 4 17:10:01 2012 +0200 Remove unused code (vcl) diff --git a/unusedcode.easy b/unusedcode.easy index 19586de..91368d3 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -123,9 +123,6 @@ SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short) SfxNavigatorWrapper::GetChildWindowId() SfxPartChildWnd_Impl::GetChildWindowId() SfxRecordingFloatWrapper_Impl::GetChildWindowId() -Slider::SetRangeMax(long) -Slider::SetRangeMin(long) -Slider::Slider(Window*, ResId const&) SotStorage::GetProperty(String const&, String const&, com::sun::star::uno::Any&) SpanStyleManager::get(WPXString const&) const SpinButton::SpinButton(Window*, ResId const&) diff --git a/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx index 15f0495..c29959c 100644 --- a/vcl/inc/vcl/slider.hxx +++ b/vcl/inc/vcl/slider.hxx @@ -88,7 +88,6 @@ private: public: Slider( Window* pParent, WinBits nStyle = WB_HORZ ); - Slider( Window* pParent, const ResId& rResId ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); @@ -107,9 +106,7 @@ public: { mbFullDrag = bEnable; } sal_Bool IsDragEnabled() const { return mbFullDrag; } - void SetRangeMin( long nNewRange ); long GetRangeMin() const { return mnMinRange; } - void SetRangeMax( long nNewRange ); long GetRangeMax() const { return mnMaxRange; } void SetRange( const Range& rRange ); Range GetRange() const { return Range( GetRangeMin(), GetRangeMax() ); } diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 4ef3afc..dc79ca7 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -104,20 +104,6 @@ Slider::Slider( Window* pParent, WinBits nStyle ) : // ----------------------------------------------------------------------- -Slider::Slider( Window* pParent, const ResId& rResId ) : - Control( WINDOW_SLIDER ) -{ - rResId.SetRT( RSC_SCROLLBAR ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -// ----------------------------------------------------------------------- - void Slider::ImplLoadRes( const ResId& rResId ) { Control::ImplLoadRes( rResId ); @@ -1003,20 +989,6 @@ void Slider::EndSlide() // ----------------------------------------------------------------------- -void Slider::SetRangeMin( long nNewRange ) -{ - SetRange( Range( nNewRange, GetRangeMax() ) ); -} - -// ----------------------------------------------------------------------- - -void Slider::SetRangeMax( long nNewRange ) -{ - SetRange( Range( GetRangeMin(), nNewRange ) ); -} - -// ----------------------------------------------------------------------- - void Slider::SetRange( const Range& rRange ) { // Range einpassen commit c282d0a3d838433a44f953c2681f5df71551f34b Author: Matúš Kukan <matus.ku...@gmail.com> Date: Thu Apr 5 22:53:04 2012 +0200 jurt: use CustomTarget makefile diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk new file mode 100644 index 0000000..725cae6 --- /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 <dtar...@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_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 7431a84..a4ef410 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 50339cd..0501603 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 4ff0c66..0000000 --- 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 <dtar...@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,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 80b4870..0000000 --- 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 <dtar...@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,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 ffc0cd8..0000000 --- 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 <dtar...@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. - -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 3230b22..0000000 --- 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 <dtar...@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. - -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: commit 1dc52cbc244cc5188f4a8091d448e2d4a9dbf820 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Thu Apr 5 16:40:01 2012 +0200 ridljar: use CustomTarget makefile diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk new file mode 100644 index 0000000..ef72abd --- /dev/null +++ b/ridljar/CustomTarget_javamaker.mk @@ -0,0 +1,40 @@ +# -*- 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 <dtar...@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_CustomTarget_CustomTarget,ridljar/javamaker,new_style)) + +RJJM := $(call gb_CustomTarget_get_workdir,ridljar/javamaker) + +$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(RJJM)/done + +$(RJJM)/done : $(OUTDIR)/bin/udkapi.rdb \ + $(call gb_Executable_get_target_for_build,javamaker) | $(RJJM)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,javamaker -BUCR -O$(RJJM)/class $<) && touch $@) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk index b4c60e3..0dacfc3 100644 --- a/ridljar/Jar_ridl.mk +++ b/ridljar/Jar_ridl.mk @@ -27,8 +27,8 @@ $(eval $(call gb_Jar_Jar,ridl)) -$(eval $(call gb_Jar_add_package_dependencies,ridl,\ - ridljar_javamaker \ +$(eval $(call gb_Jar_add_customtarget_dependencies,ridl,\ + ridljar/javamaker \ )) $(eval $(call gb_Jar_add_jars,ridl,\ diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk index dde756f..206e735 100644 --- a/ridljar/Module_ridljar.mk +++ b/ridljar/Module_ridljar.mk @@ -29,9 +29,9 @@ $(eval $(call gb_Module_Module,ridljar)) ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,ridljar,\ + CustomTarget_javamaker \ Jar_ridl \ Jar_unoloader \ - Package_javamaker \ Zip_ridl \ Zip_unoloader \ )) diff --git a/ridljar/Package_javamaker.mk b/ridljar/Package_javamaker.mk deleted file mode 100644 index 2d73aea..0000000 --- a/ridljar/Package_javamaker.mk +++ /dev/null @@ -1,37 +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 <dtar...@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,ridljar_javamaker,$(WORKDIR)/CustomTarget/ridljar/javamaker)) - -$(eval $(call gb_Package_add_customtarget,ridljar_javamaker,ridljar/javamaker)) - -$(eval $(call gb_CustomTarget_add_outdir_dependencies,ridljar/javamaker,\ - $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \ - $(OUTDIR)/bin/udkapi.rdb \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/ridljar/javamaker/Makefile b/ridljar/javamaker/Makefile deleted file mode 100644 index d2fe741..0000000 --- a/ridljar/javamaker/Makefile +++ /dev/null @@ -1,39 +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 <dtar...@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. - -gb_PARTIALBUILD := T -include $(GBUILDDIR)/gbuild_simple.mk - -done : $(OUTDIR)/bin/udkapi.rdb - $(call gb_Helper_abbreviate_dirs_native, \ - $(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@) - -.DEFAULT_GOAL := all -.PHONY : all -all : done - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: commit c92c4ca8ed68092acba486159c5d30b09271caf5 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Thu Apr 5 15:55:19 2012 +0200 unoil: use CustomTarget makefiles diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk new file mode 100644 index 0000000..462a2b8 --- /dev/null +++ b/unoil/CustomTarget_climaker.mk @@ -0,0 +1,71 @@ +# -*- 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 <dtar...@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_CustomTarget_CustomTarget,unoil/climaker,new_style)) + +UICM := $(call gb_CustomTarget_get_workdir,unoil/climaker) + +$(call gb_CustomTarget_get_target,unoil/climaker) : \ + $(UICM)/cli_oootypes.dll \ + $(UICM)/cli_oootypes.config \ + $(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll + +include $(SRCDIR)/unoil/climaker/version.txt + +$(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \ + $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ + $(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \ + $(call gb_Executable_get_target_for_build,climaker) | $(UICM)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,climaker \ + $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ + --out $@ \ + --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \ + --assembly-company "LibreOffice" \ + --assembly-description "This assembly contains metadata for the LibreOffice API." \ + -X $(OUTDIR)/bin/udkapi.rdb \ + -r $(OUTDIR)/bin/cli_uretypes.dll \ + --keyfile $(OUTDIR)/bin/cliuno.snk \ + $(OUTDIR)/bin/offapi.rdb) > /dev/null) + +$(UICM)/cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config \ + $(SRCDIR)/unoil/climaker/version.txt | $(UICM)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Helper_abbreviate_dirs_native, \ + perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@) + +$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : $(UICM)/cli_oootypes.config \ + $(UICM)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1) + $(call gb_Helper_abbreviate_dirs_native, \ + al -out:$@ \ + -version:$(CLI_OOOTYPES_POLICY_VERSION) \ + -keyfile:$(OUTDIR)/bin/cliuno.snk \ + -link:$<) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk new file mode 100644 index 0000000..636a65d --- /dev/null +++ b/unoil/CustomTarget_javamaker.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 <dtar...@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_CustomTarget_CustomTarget,unoil/javamaker,new_style)) + +UIJM := $(call gb_CustomTarget_get_workdir,unoil/javamaker) + +$(call gb_CustomTarget_get_target,unoil/javamaker) : $(UIJM)/done + +$(UIJM)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \ + $(call gb_Executable_get_target_for_build,javamaker) | $(UIJM)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Helper_abbreviate_dirs_native, \ + $(call gb_Helper_execute,javamaker -BUCR -O$(UIJM) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ + touch $@) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk index edc0471..ff8f286 100644 --- a/unoil/Jar_unoil.mk +++ b/unoil/Jar_unoil.mk @@ -27,8 +27,8 @@ $(eval $(call gb_Jar_Jar,unoil)) -$(eval $(call gb_Jar_add_package_dependencies,unoil,\ - unoil_javamaker \ +$(eval $(call gb_Jar_add_customtarget_dependencies,unoil,\ + unoil/javamaker \ )) $(eval $(call gb_Jar_add_packagedirs,unoil,\ diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk index 826e5a7..40e7cdd 100644 --- a/unoil/Module_unoil.mk +++ b/unoil/Module_unoil.mk @@ -33,13 +33,14 @@ $(eval $(call gb_Module_add_targets,unoil,\ ifneq ($(SOLAR_JAVA),) $(eval $(call gb_Module_add_targets,unoil,\ + CustomTarget_javamaker \ Jar_unoil \ - Package_javamaker \ )) endif ifeq ($(COM),MSC) $(eval $(call gb_Module_add_targets,unoil,\ + CustomTarget_climaker \ Package_climaker \ )) endif diff --git a/unoil/Package_climaker.mk b/unoil/Package_climaker.mk index 0be46d0..1b92759 100644 --- a/unoil/Package_climaker.mk +++ b/unoil/Package_climaker.mk @@ -27,23 +27,8 @@ $(eval $(call gb_Package_Package,unoil_climaker,$(WORKDIR)/CustomTarget/unoil/climaker)) -$(eval $(call gb_Package_add_customtarget,unoil_climaker,unoil/climaker)) - $(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.config,cli_oootypes.config)) $(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.dll,cli_oootypes.dll)) $(eval $(call gb_Package_add_file,unoil_climaker,bin/policy.1.0.cli_oootypes.dll,policy.1.0.cli_oootypes.dll)) -$(eval $(call gb_CustomTarget_add_dependencies,unoil/climaker,\ - unoil/climaker/cli_oootypes_config \ - unoil/climaker/version.txt \ -)) - -$(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/climaker,\ - $(OUTDIR_FOR_BUILD)/bin/climaker$(gb_Executable_EXT_for_build) \ - $(OUTDIR)/bin/cli_uretypes.dll \ - $(OUTDIR)/bin/cliuno.snk \ - $(OUTDIR)/bin/offapi.rdb \ - $(OUTDIR)/bin/udkapi.rdb \ -)) - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/unoil/Package_javamaker.mk b/unoil/Package_javamaker.mk deleted file mode 100644 index 7b7fcb7..0000000 --- a/unoil/Package_javamaker.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 <dtar...@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,unoil_javamaker,$(WORKDIR)/CustomTarget/unoil/javamaker)) - -$(eval $(call gb_Package_add_customtarget,unoil_javamaker,unoil/javamaker)) - -$(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/javamaker,\ - $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \ - $(OUTDIR)/bin/offapi.rdb \ - $(OUTDIR)/bin/udkapi.rdb \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/unoil/climaker/Makefile b/unoil/climaker/Makefile deleted file mode 100644 index 0d029f7..0000000 --- a/unoil/climaker/Makefile +++ /dev/null @@ -1,64 +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 <dtar...@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. - -gb_PARTIALBUILD := T -include $(GBUILDDIR)/gbuild_simple.mk - -include $(SRCDIR)/unoil/climaker/version.txt - -cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt - $(call gb_Helper_abbreviate_dirs_native, \ - $(call gb_Helper_execute,climaker \ - $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ - --out $@ \ - --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \ - --assembly-company "LibreOffice" \ - --assembly-description "This assembly contains metadata for the LibreOffice API." \ - -X $(OUTDIR)/bin/udkapi.rdb \ - -r $(OUTDIR)/bin/cli_uretypes.dll \ - --keyfile $(OUTDIR)/bin/cliuno.snk \ - $(OUTDIR)/bin/offapi.rdb) > /dev/null) - -cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config $(SRCDIR)/unoil/climaker/version.txt - $(call gb_Helper_abbreviate_dirs_native, \ - perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@) - -$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : cli_oootypes.dll cli_oootypes.config - $(call gb_Helper_abbreviate_dirs_native, \ - al -out:$@ \ - -version:$(CLI_OOOTYPES_POLICY_VERSION) \ - -keyfile:$(OUTDIR)/bin/cliuno.snk \ - -link:cli_oootypes.config) - -.DEFAULT_GOAL := all -.PHONY : all -all : \ - cli_oootypes.dll \ - cli_oootypes.config \ - $(CLI_OOOTYPES_POLICY_ASSEMBLY).dll - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile deleted file mode 100644 index f239156..0000000 --- a/unoil/javamaker/Makefile +++ /dev/null @@ -1,40 +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 <dtar...@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. - -gb_PARTIALBUILD := T -include $(GBUILDDIR)/gbuild_simple.mk - -done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) - $(call gb_Helper_abbreviate_dirs_native, \ - $(call gb_Helper_execute,javamaker -BUCR -O. $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \ - touch $@) - -.DEFAULT_GOAL := all -.PHONY : all -all : done - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: commit 149cb468859e1f50e4a7ee1200f329791be97894 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Thu Apr 5 22:57:22 2012 +0200 gbuild: add customtarget dependencies for java stuff diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index d07467e..9efc1e7 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -201,13 +201,23 @@ $(call gb_JavaClassSet_use_externals,$(call gb_Jar_get_classsetname,$(1)),$(2)) endef +define gb_Jar_add_customtarget_dependency +$(call gb_JavaClassSet_add_customtarget_dependency,$(call gb_Jar_get_classsetname,$(1)),$(2)) + +endef + +define gb_Jar_add_customtarget_dependencies +$(foreach customtarget,$(2),$(call gb_Jar_add_customtarget_dependency,$(1),$(customtarget))) + +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)) +$(foreach package,$(2),$(call gb_Jar_add_package_dependency,$(1),$(package))) endef diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 8f48f5a..df96284 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -159,14 +159,15 @@ $(foreach external,$(2),$(call gb_JavaClassSet_use_external,$(1),$(external))) endef -define gb_JavaClassSet_add_package_dependency +define gb_JavaClassSet_add_customtarget_dependency $(call gb_JavaClassSet_get_preparation_target,$(1)) : \ - $(call gb_Package_get_target,$(2)) + $(call gb_CustomTarget_get_target,$(2)) endef -define gb_JavaClassSet_add_package_dependencies -$(foreach dependency,$(2),$(call gb_JavaClassSet_add_package_dependency,$(1),$(dependency))) +define gb_JavaClassSet_add_package_dependency +$(call gb_JavaClassSet_get_preparation_target,$(1)) : \ + $(call gb_Package_get_target,$(2)) endef diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 19b5e09..c861ea0 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -124,13 +124,23 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(call endef +define gb_JunitTest_add_customtarget_dependency +$(call gb_JavaClassSet_add_customtarget_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) + +endef + +define gb_JunitTest_add_customtarget_dependencies +$(foreach dependency,$(2),$(call gb_JunitTest_add_customtarget_dependency,$(1),$(dependency))) + +endef + define gb_JunitTest_add_package_dependency $(call gb_JavaClassSet_add_package_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) endef define gb_JunitTest_add_package_dependencies -$(call gb_JavaClassSet_add_package_dependencies,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$(foreach dependency,$(2),$(call gb_JunitTest_add_package_dependency,$(1),$(dependency))) endef @@ -152,6 +162,9 @@ gb_JunitTest_add_sourcefile := gb_JunitTest_add_sourcefiles := gb_JunitTest_add_jar := gb_JunitTest_add_jars := +gb_JunitTest_add_jar_classset := +gb_JunitTest_add_customtarget_dependency := +gb_JunitTest_add_customtarget_dependencies := gb_JunitTest_add_package_dependency := gb_JunitTest_add_package_dependencies :=
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits