[Libreoffice-commits] .: 6 commits - offapi/UnoApi_offapi.mk offapi/UnoApi_types.mk oovbaapi/UnoApi_oovbaapi.mk solenv/gbuild udkapi/UnoApi_udkapi.mk udkapi/UnoApi_uretypes.mk writerfilter/source
Michael Stahl
mst at kemper.freedesktop.org
Fri Oct 21 11:20:43 PDT 2011
offapi/UnoApi_offapi.mk | 2
offapi/UnoApi_types.mk | 2
oovbaapi/UnoApi_oovbaapi.mk | 2
solenv/gbuild/CustomTarget.mk | 4 -
solenv/gbuild/LinkTarget.mk | 58 +++++++++-----------------
solenv/gbuild/UnoApiTarget.mk | 17 +++++--
solenv/gbuild/extensions/final_ObjectOwner.mk | 47 ---------------------
udkapi/UnoApi_udkapi.mk | 2
udkapi/UnoApi_uretypes.mk | 2
writerfilter/source/Makefile | 26 +++++++++++
10 files changed, 65 insertions(+), 97 deletions(-)
New commits:
commit c955cce91f21e6381f9d17b83c73671ad135d791
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Oct 21 20:14:52 2011 +0200
LinkTarget: remove old object owner implementation
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f9c9917..345fd4f 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -347,8 +347,6 @@ gb_AsmObject_AsmObject =
# LinkTarget class
gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS)
-gb_LinkTarget_OBJECTOWNER :=
-gb_LinkTarget_OBJECTS :=
# defined by platform
# gb_LinkTarget_CXXFLAGS
@@ -775,11 +773,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CObject_get_dep_target,$(2))
endif
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_CObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS += $(call gb_CObject_get_target,$(2))
-endif
-
endef
define gb_LinkTarget_add_cxxobject
@@ -798,11 +791,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CxxObject_get_dep_target,$(2))
endif
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_CxxObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS += $(call gb_CxxObject_get_target,$(2))
-endif
-
endef
define gb_LinkTarget_add_objcobject
@@ -821,11 +809,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCObject_get_dep_target,$(2))
endif
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_ObjCObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS += $(call gb_ObjCObject_get_target,$(2))
-endif
-
endef
define gb_LinkTarget_add_objcxxobject
@@ -844,11 +827,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_ObjCxxObject_get_dep_target,$(2))
endif
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_ObjCxxObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS += $(call gb_ObjCxxObject_get_target,$(2))
-endif
-
endef
define gb_LinkTarget_add_asmobject
@@ -866,11 +844,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : ASMOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_AsmObject_get_dep_target,$(2))
endif
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_AsmObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS += $(call gb_AsmObject_get_target,$(2))
-endif
-
endef
define gb_LinkTarget_add_generated_c_object
@@ -888,11 +861,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCObject_get_dep_target,$(2))
endif
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_GenCObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS += $(call gb_GenCObject_get_target,$(2))
-endif
-
endef
define gb_LinkTarget_add_generated_cxx_object
@@ -910,11 +878,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCxxObject_get_dep_target,$(2))
endif
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-gb_LinkTarget_OBJECTOWNER += $(call gb_GenCxxObject_get_target,$(2)):$(1)
-gb_LinkTarget_OBJECTS += $(call gb_GenCxxObject_get_target,$(2))
-endif
-
endef
define gb_LinkTarget_yacc_add_cpp_dep
diff --git a/solenv/gbuild/extensions/final_ObjectOwner.mk b/solenv/gbuild/extensions/final_ObjectOwner.mk
deleted file mode 100644
index f66a7a2..0000000
--- a/solenv/gbuild/extensions/final_ObjectOwner.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
-# Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen at canonical.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.
-
-ifeq ($(gb_CHECKOBJECTOWNER),$(true))
-
-define gb_LinkTarget_check_object_owner
-ifneq (1,$$(words $$(filter $(1):%,$$(gb_LinkTarget_OBJECTOWNER))))
-$$(info \
- $(patsubst $(WORKDIR)/%,%,$(1))\
- is linked in by\
- $$(patsubst $(1):%,%,$$(filter $(1):%,$$(gb_LinkTarget_OBJECTOWNER))))
-gb_CHECKOBJECTOWNER_VALID := $(false)
-endif
-endef
-
-gb_CHECKOBJECTOWNER_VALID := $(true)
-$(foreach object,$(sort $(gb_LinkTarget_OBJECTS)),$(eval $(call gb_LinkTarget_check_object_owner,$(object))))
-ifneq ($(gb_CHECKOBJECTOWNER_VALID),$(true))
-$(eval $(call gb_Output_warn,duplicate linked objects))
-endif
-
-endif
-# vim: set noet ts=4 sw=4:
commit 3e5eece31d93ed378613991c8a8bbe451aa5c081
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Oct 21 20:10:04 2011 +0200
LinkTarget: new check for duplicate objects
Always enabled, as this runs for me with an overhead in the range of
measurement error (in tail_build):
current implementation: time make -nsrj8
17.269s 16.470s 17.537s 16.754s 16.595s
disabled: time make -nsrj8 gb_CHECKOBJECTOWNER=
13.212s 13.345s 13.470s 13.852s 13.712s
new implementation: time make -nsrj8 gb_CHECKOBJECTOWNER=
13.477s 13.911s 13.624s 13.606s 13.535s
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 49dd076..f9c9917 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -90,6 +90,13 @@ endif
# dependencies prefixed with | are build-order only dependencies
+# check that objects are only linked into one link target:
+# multiple linking may cause problems because different link targets may
+# require different compiler flags
+define gb_Object__owner
+$$(if $$(OBJECTOWNER),\
+ $$(call gb_Output_warn,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2)
+endef
# For every object there is a dep file (if gb_FULLDEPS is active).
# The dep file depends on the object: the Object__command also updates the
@@ -760,6 +767,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : COBJECTS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CObject_get_target,$(2))
$(call gb_CObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
$(call gb_CObject_get_target,$(2)) : T_CFLAGS += $(3)
+$(call gb_CObject_get_target,$(2)) : \
+ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2)
@@ -781,6 +790,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : CXXOBJECTS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_CxxObject_get_target,$(2))
$(call gb_CxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
$(call gb_CxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
+$(call gb_CxxObject_get_target,$(2)) : \
+ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2)
@@ -802,6 +813,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : OBJCOBJECTS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCObject_get_target,$(2))
$(call gb_ObjCObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
$(call gb_ObjCObject_get_target,$(2)) : T_OBJCFLAGS += $(3)
+$(call gb_ObjCObject_get_target,$(2)) : \
+ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCOBJECTS += $(2)
@@ -823,6 +836,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : OBJCXXOBJECTS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_ObjCxxObject_get_target,$(2))
$(call gb_ObjCxxObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
$(call gb_ObjCxxObject_get_target,$(2)) : T_OBJCXXFLAGS += $(3)
+$(call gb_ObjCxxObject_get_target,$(2)) : \
+ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS += $(2)
@@ -843,6 +858,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : ASMOBJECTS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_AsmObject_get_target,$(2))
$(call gb_AsmObject_get_target,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
+$(call gb_AsmObject_get_target,$(2)) : \
+ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : ASMOBJECTS += $(2)
@@ -863,6 +880,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCObject_get_target,$(2))
$(call gb_GenCObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
$(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(3)
+$(call gb_GenCObject_get_target,$(2)) : \
+ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS += $(2)
@@ -883,6 +902,8 @@ $(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCxxObject_get_target,$(2))
$(call gb_GenCxxObject_get_source,$(2)) : | $(call gb_LinkTarget_get_headers_target,$(1))
$(call gb_GenCxxObject_get_target,$(2)) : T_CXXFLAGS += $(3)
+$(call gb_GenCxxObject_get_target,$(2)) : \
+ OBJECTOWNER := $(call gb_Object__owner,$(2),$(1))
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
commit 68cde28252e6b1b84b5b831200d0c89c247b203a
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 19 16:53:32 2011 +0200
UnoApiTarget: replace realpath calls
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 8ae72cb..1f3ab32 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi,SRCDIR))
$(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\
udkapi \
diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApi_types.mk
index df0da06..02b9953 100644
--- a/offapi/UnoApi_types.mk
+++ b/offapi/UnoApi_types.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,types,SRCDIR))
$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
udkapi \
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 340c5d0..c204aa6 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi,SRCDIR))
$(eval $(call gb_UnoApiTarget_add_rdbfiles,oovbaapi,\
udkapi \
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index a888e0c..3f87fae 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -47,6 +47,10 @@ $(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call gb_UnoApiTarget_get_ta
mkdir -p $$(dir $$@)
define gb_UnoApiTarget_UnoApiTarget
+$(if $(filter $(2),$(gb_Helper_REPOSITORYNAMES)),,\
+ $(error UnoApiTarget: no or invalid repository given; known repositories: \
+ $(gb_Helper_REPOSITORYNAMES)))
+gb_UnoApiTarget_REPO_$(1) := $(2)
$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1))))
$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
$(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
@@ -62,7 +66,8 @@ endef
define gb_UnoApiTarget_add_idlfiles
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl)))
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : $(foreach repo,$(gb_REPOS),$(foreach idl,$(3),$(realpath $(repo)/$(2)/$(idl).idl)))
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
+ $(foreach idl,$(3),$($(gb_UnoApiTarget_REPO_$(1)))/$(2)/$(idl).idl)
$(gb_UnoApiPartTarget__command)
endef
@@ -82,7 +87,8 @@ endef
define gb_UnoApiTarget_add_idlfiles_noheader
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(2),$(idl)))
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : $(foreach repo,$(gb_REPOS),$(foreach idl,$(3),$(realpath $(repo)/$(2)/$(idl).idl)))
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : \
+ $(foreach idl,$(3),$($(gb_UnoApiTarget_REPO_$(1)))/$(2)/$(idl).idl)
$(gb_UnoApiPartTarget__command)
endef
@@ -97,7 +103,8 @@ endef
define gb_UnoApiTarget_add_idlfiles_nohdl
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(2),$(idl)))
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : $(foreach repo,$(gb_REPOS),$(foreach idl,$(3),$(realpath $(repo)/$(2)/$(idl).idl)))
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : \
+ $(foreach idl,$(3),$($(gb_UnoApiTarget_REPO_$(1)))/$(2)/$(idl).idl)
$(gb_UnoApiPartTarget__command)
endef
@@ -136,9 +143,9 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$
endef
-#UNOAPI_REFERENCE_$(1) := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
define gb_UnoApiTarget_add_reference_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
+$(call gb_UnoApiTarget_get_target,$(1)) : \
+ UNOAPI_REFERENCE := $($(gb_UnoApiTarget_REPO_$(1)))/$(strip $(2)).rdb
endef
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index fb1ac94..1572c13 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi,SRCDIR))
$(eval $(call gb_UnoApiTarget_set_include,udkapi,\
$$(INCLUDE) \
diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApi_uretypes.mk
index d61d079..ad5c8f1 100644
--- a/udkapi/UnoApi_uretypes.mk
+++ b/udkapi/UnoApi_uretypes.mk
@@ -26,7 +26,7 @@
#
#*************************************************************************
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types,SRCDIR))
$(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\
udkapi \
commit 521001049dfb05a082737f668c83047100ec91bf
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 19 16:45:13 2011 +0200
writerfilter: add some bling to customtarget
diff --git a/writerfilter/source/Makefile b/writerfilter/source/Makefile
index 8b8b962..61a58db 100644
--- a/writerfilter/source/Makefile
+++ b/writerfilter/source/Makefile
@@ -48,15 +48,19 @@ wf_GEN_doctok_Resources_hxx=doctok/resources.hxx
wf_GEN_doctok_Resources_cxx=resources.cxx
$(wf_GEN_doctok_SprmIds_hxx) : doctok $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmIds_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_doctok_ResourceIds_hxx) : doctok $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourceIds_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_doctok_Resources_hxx) : doctok $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_Resources_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_doctok_Resources_cxx) : doctok $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model) $(wf_SRC_doctok_ResourceTools_xsl)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_ResourcesImpl_xsl) $(wf_SRC_doctok_Model)) > $@
# ooxml
@@ -90,44 +94,57 @@ wf_GEN_ooxml_Model_processed=model_preprocessed.xml
wf_GEN_ooxml_Model_analyzed=ooxml/model_analyzed.xml
$(wf_GEN_ooxml_token_tmp) : $(OUTDIR)/inc/oox/tokens.txt
+ $(call gb_Output_announce,$@,build,CAT,1)
cat $(OUTDIR)/inc/oox/tokens.txt \
| sed "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
$(wf_GEN_ooxml_token_xml) : $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter
+ $(call gb_Output_announce,$@,build,CAT,1)
cat $(WFDIR)ooxml/tokenxmlheader $(wf_GEN_ooxml_token_tmp) $(WFDIR)ooxml/tokenxmlfooter > $@
$(wf_GEN_ooxml_FastTokens_hxx) : $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FastTokens_xsl) $(wf_GEN_ooxml_token_xml)) > $@
$(wf_GEN_ooxml_Factory_hxx) : $(WFDIR)ooxml/factoryinc.xsl $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_Factory_cxx) : $(WFDIR)ooxml/factoryimpl.xsl $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $< $(wf_GEN_ooxml_Model_processed)) > $@
OOXMLFactory%.cxx : $(WFDIR)ooxml/factoryimpl_ns.xsl $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@
OOXMLFactory%.hxx : $(WFDIR)ooxml/factory_ns.xsl $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) --stringparam file $@ $< $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_FactoryValues_hxx) : $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValues_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_FactoryValues_cxx) : $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_FactoryValuesImpl_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_ResourceIds_hxx) : ooxml $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_ResourceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_NamespaceIds_hxx) : $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_NamespaceIds_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_ooxml_GperfFastToken_hxx) : $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,GPF,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_GperfFastTokenHandler_xsl) $(wf_GEN_ooxml_Model_processed)) \
| tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
$(wf_GEN_ooxml_Model_analyzed): $(wf_SRC_ooxml_Analyze_model_xsl) $(wf_SRC_ooxml_Model)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $^) > $@
# rtftok
@@ -157,27 +174,35 @@ wf_DEP_ooxml_namespaces_txt=$(OUTDIR)/inc$(UPDMINOREXT)/oox/namespaces.txt
wf_GEN_ooxml_preprocess_xsl=modelpreprocess.xsl
$(wf_GEN_ooxml_QNameToStr_tmp): $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_ooxml_QNameToStr_xsl) $(wf_GEN_ooxml_Model_processed)) > $@
$(wf_GEN_doctok_QnameToStr_tmp): $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_QNameToStr_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_model_QNameToStr_cxx): $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrheader $(WFDIR)resourcemodel/qnametostrfooter $(wf_SRC_ooxml_FactoryTools_xsl) $(wf_SRC_doctok_ResourceTools_xsl)
+ $(call gb_Output_announce,$@,build,CAT,1)
cat $(WFDIR)resourcemodel/qnametostrheader $(wf_GEN_ooxml_QNameToStr_tmp) $(wf_GEN_doctok_QnameToStr_tmp) $(WFDIR)resourcemodel/qnametostrfooter > $@
$(wf_GEN_model_SprmCodeToStr_tmp) : $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_SRC_doctok_SprmCodeToStr_xsl) $(wf_SRC_doctok_Model)) > $@
$(wf_GEN_model_SprmCodeToStr_cxx): $(WFDIR)resourcemodel/sprmcodetostrheader $(wf_GEN_model_SprmCodeToStr_tmp) $(WFDIR)resourcemodel/sprmcodetostrfooter
+ $(call gb_Output_announce,$@,build,CAT,1)
cat $^ > $@
$(wf_GEN_ooxml_Namespacesmap_xsl) : $(wf_SRC_ooxml_Model) $(wf_DEP_ooxml_namespaces_txt) $(wf_SRC_model_NamespacePreprocess)
+ $(call gb_Output_announce,$@,build,PRL,1)
$(PERL) $(wf_SRC_model_NamespacePreprocess) $(wf_DEP_ooxml_namespaces_txt) > $@
$(wf_GEN_ooxml_preprocess_xsl) : $(wf_SRC_ooxml_Preprocess_xsl)
+ $(call gb_Output_announce,$@,build,CPY,1)
cp -f $(wf_SRC_ooxml_Preprocess_xsl) $@
$(wf_GEN_ooxml_Model_processed) : $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_GEN_ooxml_preprocess_xsl) $(wf_SRC_ooxml_Model)
+ $(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Helper_abbreviate_dirs_native, $(gb_XSLTPROC) $(wf_GEN_ooxml_Namespacesmap_xsl) $(wf_SRC_ooxml_Model)) > $@
# all
@@ -201,3 +226,4 @@ all : \
$(wf_GEN_model_SprmCodeToStr_cxx) \
$(patsubst %,OOXMLFactory_%.hxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
$(patsubst %,OOXMLFactory_%.cxx,$(WRITERFILTER_OOXMLNAMESPACES)) \
+
commit 2c2cffff06d3285373b172dc0b8c98c0218eb0ad
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 19 16:40:04 2011 +0200
CustomTarget: remove unnecessary dependency
There already is a dependency from the library to the package, so this
dependency should not be necessary.
Furthermore, the command is executed spuriously always, because the .done
file is always newer than the generated files.
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 0df096a..644ba2c 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -59,8 +59,6 @@ $(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\
gb_CustomTarget_REPO_$(1) := $(2)
$(call gb_CustomTarget_get_target,$(1)) : \
$(call gb_CustomTarget__get_makefile,$($(2)),$(1))
-$(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1))
- test -f $@ || (echo "Missing file $@ which should have been generated from CustomTarget $(1), but was not." && false)
endef
commit ccc4b087303fd0fb1446056c41445ab68a415146
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Oct 19 14:41:58 2011 +0200
Revert "pass -s flag to custom target's make process"
This reverts commit 6c8a7e0e6ad223051442ef6ce1d1103086c3f4a0.
Doing this explicitly is unnecessary because make does it automatically.
Also, make will pass --jobserver-fds, which happens to match in
findstring as well.
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 20cd29a..0df096a 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -32,7 +32,7 @@ gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
define gb_CustomTarget__command
+$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
- $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< $(if $(findstring s,$(MAKEFLAGS)),-s) && \
+ $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
touch $(1))
endef
More information about the Libreoffice-commits
mailing list