[Libreoffice-commits] .: 2 commits - solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Sat Apr 23 12:15:31 PDT 2011
solenv/gbuild/CppunitTest.mk | 43 ++++++++++++++++++++
solenv/gbuild/RdbTarget.mk | 81 +++++++++++++++++++++++++++++++++++++++
solenv/gbuild/TargetLocations.mk | 3 +
solenv/gbuild/gbuild.mk | 1
4 files changed, 127 insertions(+), 1 deletion(-)
New commits:
commit 6fd004e8fdcf6153f943742e395d4bb87c21b77a
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 23 18:04:39 2011 +0200
move common UNO stuff to CppunitTest
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 22b4dc2..0d3cc7f 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -43,6 +43,24 @@ gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunitt
gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(gb_CppunitTest_GDBTRACE) STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_CPPTESTTARGET)
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
+# TODO: move this to platform under suitable name
+gb_CppunitTarget__make_url = file://$(if $(filter WNT,$(OS)),/)$(1)
+
+gb_CppunitTest__get_uno_type_target = $(OUTDIR)/bin/$(1).rdb
+define gb_CppunitTest__make_args
+$(ARGS) \
+$(if $(strip $(UNO_TYPES)),\
+ "-env:UNO_TYPES=$(foreach rdb,udkapi $(UNO_TYPES),\
+ $(call gb_CppunitTarget__make_url,$(call gb_CppunitTest__get_uno_type_target,$(rdb))))") \
+$(if $(strip $(UNO_SERVICES)),\
+ "-env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \
+ $(foreach rdb,$(UNO_SERVICES),\
+ $(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \
+$(if $(URE),\
+ $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\
+ -env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)))
+endef
+
.PHONY : $(call gb_CppunitTest_get_clean_target,%)
$(call gb_CppunitTest_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
@@ -53,7 +71,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
$(call gb_Output_announce,$*,$(true),CUT,2)
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $@) && \
- $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(ARGS) > $@.log 2>&1 || (cat $@.log && false))
+ $(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) > $@.log 2>&1 || (cat $@.log && false))
define gb_CppunitTest_CppunitTest
$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1)))
@@ -73,6 +91,9 @@ $(call gb_CppunitTest_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
$(call gb_CppunitTest_CppunitTest_platform,$(1),$(2),$(gb_CppunitTest_DLLDIR)/$(call gb_CppunitTest_get_libfilename,$(1)))
$(call gb_CppunitTest_get_target,$(1)) : ARGS :=
+$(call gb_CppunitTest_get_target,$(1)) : URE := $(false)
+$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
+$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
$$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
endef
@@ -85,7 +106,27 @@ endef
# Once we build the services.rdb with gbuild we should use its *_get_target method
define gb_CppunitTest_uses_ure
$(call gb_CppunitTest_get_target,$(1)) : $(OUTDIR)/xml/ure/services.rdb
+$(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
+
+endef
+
+define gb_CppunitTest_add_type_rdb
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,$(2))
+$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES += $(2)
+endef
+
+define gb_CppunitTest_add_type_rdbs
+$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_type_rdb,$(1),$(rdb))))
+endef
+
+define gb_CppunitTest_add_service_rdb
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_RdbTarget_get_target,$(2))
+$(call gb_CppunitTest_get_clean_target,$(1)) : $(call gb_RdbTarget_get_clean_target,$(2))
+$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(2)
+endef
+define gb_CppunitTest_add_service_rdbs
+$(foreach rdb,$(2),$(eval $(call gb_CppunitTest_add_service_rdb,$(1),$(rdb))))
endef
define gb_CppunitTest__forward_to_Linktarget
commit 7d3a24747a16f0e81339a4e3ace36e0742075d6a
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 23 18:02:14 2011 +0200
add class for creating service rdbs
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
new file mode 100644
index 0000000..53548dd
--- /dev/null
+++ b/solenv/gbuild/RdbTarget.mk
@@ -0,0 +1,81 @@
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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_RdbTarget__get_old_component_target = $(OUTDIR)/xml/$(1).component
+
+$(call gb_RdbTarget_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),RDB,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && \
+ echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@ && \
+ $(gb_AWK) -- \
+ '/^<\?xml version.*/ { next; } \
+ { gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); print; }' \
+ $(foreach component,$(COMPONENTS),$(call gb_ComponentTarget_get_target,$(component))) \
+ $(foreach component,$(OLD_COMPONENTS),$(call gb_RdbTarget__get_old_component_target,$(component))) \
+ >> $@ && \
+ echo '</components>' >> $@)
+
+.PHONY : $(call gb_RdbTarget_get_clean_target,%)
+$(call gb_RdbTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),RDB,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_RdbTarget_get_outdir_target,$*) $(call gb_RdbTarget_get_target,$*))
+
+$(call gb_RdbTarget_get_external_target,%) :
+ $(call gb_Deliver_deliver,$<,$@)
+
+define gb_RdbTarget_RdbTarget
+$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS :=
+$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS :=
+$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS :=
+$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS :=
+ifeq ($(2),$(true))
+$(call gb_RdbTarget_get_outdir_target,$(1)) : $(call gb_RdbTarget_get_target,$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_RdbTarget_get_target,$(1)))
+endif
+endef
+
+define gb_RdbTarget_add_component
+$(call gb_RdbTarget_get_target,$(1)) : COMPONENTS += $(2)
+$(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS += $(2)
+endef
+
+define gb_RdbTarget_add_components
+$(foreach component,$(2),$(eval $(call gb_RdbTarget_add_component,$(1),$(component))))
+endef
+
+define gb_RdbTarget_add_old_component
+$(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS += $(2)
+$(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS += $(2)
+endef
+
+define gb_RdbTarget_add_old_components
+$(foreach component,$(2),$(eval $(call gb_RdbTarget_add_old_component,$(1),$(component))))
+endef
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 051b536..f2c7320 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -36,6 +36,7 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/bin \
gb_PackagePart_get_target = $(OUTDIR)/$(1)
+gb_RdbTarget_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
@@ -82,6 +83,7 @@ gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1)
gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch.d
gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.pch
+gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
@@ -117,6 +119,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
NoexPrecompiledHeader \
PackagePart \
PrecompiledHeader \
+ RdbTarget \
ResTarget \
SdiTarget \
SrsTarget \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 61055f9..b173717 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -270,6 +270,7 @@ include $(foreach class, \
Package \
CustomTarget \
PrecompiledHeaders \
+ RdbTarget \
CppunitTest \
JavaClassSet \
JunitTest \
More information about the Libreoffice-commits
mailing list