Skip to content

C
core
Kaydet (Commit) 5ebb1a59 authored tarafından Peter Foley's avatar Peter Foley
Dosyalara gözat
Seçenekler

cleanup gbuild output 

Change-Id: I53e1ccda41688975ea180f44bfd507ce4ca39bf2
üst a81f44c7
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 35 deletions
filter/Configuration_filter.mk
Dosyayı görüntüle @ 5ebb1a59
......@@ -201,7 +201,7 @@ filter_XcuResTarget_get_target = \
$(call gb_XcuResTarget_get_target,fcfg_langpack/$(1)/$(filter_XCU_filter))
$(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET)
$(call gb_Output_announce,$(filter_XcuFilterUiTarget),$(true),XCU,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XCU,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
RESPONSEFILE=`$(gb_MKTEMP)` && \
......
filter/CustomTarget_svg.mk
Dosyayı görüntüle @ 5ebb1a59
......@@ -43,7 +43,7 @@ filter_GEN_svg_Script_hxx := $(filter_SVGWORK)/svgscript.hxx
$(filter_GEN_svg_Tokens_gperf) : \
$(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens) \
| $(filter_SVGWORK)/.dir
$(call gb_Output_announce,$@,build,GPF,3)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,3)
$(call gb_Helper_abbreviate_dirs, \
$(PERL) $(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens) \
$(filter_GEN_svg_Tokens_hxx) $(filter_GEN_svg_Tokens_gperf))
......@@ -52,7 +52,7 @@ $(filter_GEN_svg_Tokens_gperf) : \
$(filter_GEN_svg_Tokens_hxx) : $(filter_GEN_svg_Tokens_gperf)
$(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
$(call gb_Output_announce,$@,build,GPF,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
$(call gb_Helper_abbreviate_dirs, \
$(GPERF) --compare-strncmp -C -m 20 $(filter_GEN_svg_Tokens_gperf) \
| sed -e "s/(char\*)0/(char\*)0$(COMMA) 0/g" \
......@@ -62,7 +62,7 @@ $(filter_GEN_svg_Script_hxx) : \
$(call gb_ExternalExecutable_get_dependencies,python) \
$(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) \
| $(filter_SVGWORK)/.dir
$(call gb_Output_announce,$@,build,PY ,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_ExternalExecutable_get_command,python) $(filter_SRC_svg_Js2Hxx) \
$(filter_SRC_svg_PresentationEngine) \
......
oox/CustomTarget_generated.mk
Dosyayı görüntüle @ 5ebb1a59
......@@ -18,12 +18,12 @@ $(oox_MISC)/vmlexport-shape-types.cxx : \
$(SRCDIR)/oox/source/export/preset-definitions-to-shape-types.pl \
$(SRCDIR)/oox/source/export/presetShapeDefinitions.xml \
$(SRCDIR)/oox/source/export/presetTextWarpDefinitions.xml
$(call gb_Output_announce,$@,build,PRL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1)
mkdir -p $(dir $@)
perl $^ > $@.in_progress 2> $@.log && mv $@.in_progress $@
$(oox_INC)/tokenhash.inc : $(oox_MISC)/tokenhash.gperf
$(call gb_Output_announce,$@,build,GPF,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
$(GPERF) --compare-strncmp $< | sed -e 's/(char\*)0/(char\*)0, 0/g' | grep -v '^#line' > $@
oox_GenTarget_get_target = $(oox_MISC)/$(1)
......@@ -35,7 +35,7 @@ $(oox_GENHEADERPATH)/$(1).hxx $(oox_MISC)/$(2)ids.inc $(oox_INC)/$(2)names.inc \
$(call oox_GenTarget_get_target,$(1)) : $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt \
$(oox_SRC)/$(1).hxx.head $(oox_SRC)/$(1).hxx.tail
$$(call gb_Output_announce,$$@,build,PRL,1)
$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1)
mkdir -p $(oox_MISC) $(oox_INC) $(oox_GENHEADERPATH)
perl $(oox_SRC)/$(1).pl $(oox_SRC)/$(1).txt $(oox_MISC)/$(2)ids.inc \
$(oox_INC)/$(2)names.inc $(if $(3),$(oox_MISC)/$(3)) \
......
postprocess/CustomTarget_registry.mk
Dosyayı görüntüle @ 5ebb1a59
......@@ -13,6 +13,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/registry))
# Variables
#
postprocess_UNZIP := unzip $(if $(VERBOSE)$(verbose),,-q)
postprocess_XCS := registry/schema/org/openoffice
postprocess_XCU := registry/data/org/openoffice
postprocess_MOD := registry/spool
......@@ -575,7 +577,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list :
$(call gb_Helper_abbreviate_dirs, \
cd $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_$*.unzip \
&& rm -rf * \
&& unzip $< \
&& $(postprocess_UNZIP) $< \
&& cd .. \
&& echo '<list>' > $@ \
&& ( find fcfg_langpack_$*.unzip -name *.xcu -size +0c -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>\n') >> $@ \
......@@ -597,7 +599,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list :
$(call gb_Helper_abbreviate_dirs, \
cd $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_$*.unzip \
&& rm -rf * \
&& unzip $(call gb_Zip_get_target,registry_$*) \
&& $(postprocess_UNZIP) $(call gb_Zip_get_target,registry_$*) \
&& cd .. \
&& (find registry_$*.unzip -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>\n') >> $@ \
)
......@@ -608,7 +610,7 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
$(foreach driver,$(postprocess_DRIVERS), \
&& cd $(call gb_CustomTarget_get_workdir,postprocess/registry)/$(driver)_$*.unzip \
&& rm -rf * \
&& unzip $(call gb_Zip_get_target,$(driver)_$*) \
&& $(postprocess_UNZIP) $(call gb_Zip_get_target,$(driver)_$*) \
&& cd .. \
&& (find $(driver)_$*.unzip -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>\n') >> $@ \
) \
......@@ -619,7 +621,7 @@ ifeq ($(ENABLE_ONLINE_UPDATE),TRUE)
$(call gb_Helper_abbreviate_dirs, \
cd $(call gb_CustomTarget_get_workdir,postprocess/registry)/updchk_$*.unzip \
&& rm -rf * \
&& unzip $(call gb_Zip_get_target,updchk_$*) \
&& $(postprocess_UNZIP) $(call gb_Zip_get_target,updchk_$*) \
&& cd .. \
&& (find updchk_$*.unzip -name *.xcu -print0 | xargs -n1 -0 -I '{}' echo '<filename>{}</filename>\n') >> $@ \
)
......
writerfilter/CustomTarget_source.mk
Dosyayı görüntüle @ 5ebb1a59
......@@ -106,101 +106,101 @@ writerfilter_SRC_ooxml_QNameToStr_xsl=$(writerfilter_SRC)/ooxml/qnametostr.xsl
writerfilter_SRC_ooxml_ResourceIds_xsl=$(writerfilter_SRC)/ooxml/resourceids.xsl
$(writerfilter_GEN_doctok_QNameToStr_cxx): $(writerfilter_SRC_doctok_QNameToStr_xsl) $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_ResourceTools_xsl) | $(writerfilter_WORK)/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_QNameToStr_xsl) $(writerfilter_SRC_doctok_Model)) > $@
$(writerfilter_GEN_doctok_ResourceIds_hxx) : $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_ResourceIds_xsl) | $(writerfilter_WORK)/doctok/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_ResourceIds_xsl) $(writerfilter_SRC_doctok_Model)) > $@
$(writerfilter_GEN_doctok_Resources_cxx) : $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_ResourcesImpl_xsl) $(writerfilter_SRC_doctok_ResourceTools_xsl) | $(writerfilter_WORK)/doctok/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_ResourcesImpl_xsl) $(writerfilter_SRC_doctok_Model)) > $@
$(writerfilter_GEN_doctok_Resources_hxx) : $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_Resources_xsl) | $(writerfilter_WORK)/doctok/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_Resources_xsl) $(writerfilter_SRC_doctok_Model)) > $@
$(writerfilter_GEN_doctok_SprmIds_hxx) : $(writerfilter_SRC_doctok_Model) $(writerfilter_SRC_doctok_SprmIds_xsl) | $(writerfilter_WORK)/doctok/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_SprmIds_xsl) $(writerfilter_SRC_doctok_Model)) > $@
$(writerfilter_GEN_model_SprmCodeToStr_cxx): $(writerfilter_SRC)/resourcemodel/sprmcodetostrheader $(writerfilter_GEN_model_SprmCodeToStr_tmp) $(writerfilter_SRC)/resourcemodel/sprmcodetostrfooter
$(call gb_Output_announce,$@,build,CAT,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1)
cat $^ > $@
$(writerfilter_GEN_model_SprmCodeToStr_tmp) : $(writerfilter_SRC_doctok_SprmCodeToStr_xsl) $(writerfilter_SRC_doctok_Model) | $(writerfilter_WORK)/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_doctok_SprmCodeToStr_xsl) $(writerfilter_SRC_doctok_Model)) > $@
$(writerfilter_GEN_ooxml_Factory_cxx) : $(writerfilter_SRC)/ooxml/factoryimpl.xsl $(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_Factory_hxx) : $(writerfilter_SRC)/ooxml/factoryinc.xsl $(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_FactoryValues_cxx) : $(writerfilter_SRC_ooxml_FactoryValuesImpl_xsl) $(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_FactoryValuesImpl_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_FactoryValues_hxx) : $(writerfilter_SRC_ooxml_FactoryValues_xsl) $(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_FactoryValues_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_FastTokens_hxx) : $(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml) | $(writerfilter_WORK)/ooxml/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_FastTokens_xsl) $(writerfilter_GEN_ooxml_Token_xml)) > $@
$(writerfilter_GEN_ooxml_GperfFastToken_hxx) : $(writerfilter_SRC_ooxml_GperfFastTokenHandler_xsl) $(writerfilter_GEN_ooxml_Token_xml)
$(call gb_Output_announce,$@,build,GPF,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_GperfFastTokenHandler_xsl) $(writerfilter_GEN_ooxml_Token_xml)) \
| tr -d '\r' | $(GPERF) -c -E -G -I -LC++ -S1 -t > $@
$(writerfilter_GEN_ooxml_Model_analyzed) : $(writerfilter_SRC_ooxml_Analyze_model_xsl) $(writerfilter_SRC_ooxml_Model) | $(writerfilter_WORK)/ooxml/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $^) > $@
$(writerfilter_GEN_ooxml_Model_processed) : $(writerfilter_GEN_ooxml_Namespacesmap_xsl) $(writerfilter_GEN_ooxml_Preprocess_xsl) $(writerfilter_SRC_ooxml_Model)
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_GEN_ooxml_Namespacesmap_xsl) $(writerfilter_SRC_ooxml_Model)) > $@
$(writerfilter_GEN_ooxml_NamespaceIds_hxx) : $(writerfilter_SRC_ooxml_NamespaceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed) | $(writerfilter_WORK)/ooxml/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_NamespaceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_Namespacesmap_xsl) : $(writerfilter_SRC_ooxml_Model) $(writerfilter_DEP_ooxml_Namespaces_txt) \
$(writerfilter_SRC_model_NamespacePreprocess) | $(writerfilter_WORK)/.dir
$(call gb_Output_announce,$@,build,PRL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PRL,1)
$(PERL) $(writerfilter_SRC_model_NamespacePreprocess) $(writerfilter_DEP_ooxml_Namespaces_txt) > $@
$(writerfilter_GEN_ooxml_Preprocess_xsl) : $(writerfilter_SRC_ooxml_Preprocess_xsl) | $(writerfilter_WORK)/.dir
$(call gb_Output_announce,$@,build,CPY,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1)
cp -f $(writerfilter_SRC_ooxml_Preprocess_xsl) $@
$(writerfilter_GEN_ooxml_QNameToStr_cxx): $(writerfilter_SRC_ooxml_QNameToStr_xsl) $(writerfilter_SRC_ooxml_FactoryTools_xsl) $(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_QNameToStr_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_ResourceIds_hxx) : $(writerfilter_SRC_ooxml_ResourceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed) | $(writerfilter_WORK)/ooxml/.dir
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_ResourceIds_xsl) $(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_Token_tmp) : $(OUTDIR)/inc/oox/tokens.txt | $(writerfilter_WORK)/.dir
$(call gb_Output_announce,$@,build,CAT,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1)
sed "s/\(.*\)/<fasttoken>\1<\/fasttoken>/" < $(OUTDIR)/inc/oox/tokens.txt > $@
$(writerfilter_GEN_ooxml_Token_xml) : $(writerfilter_SRC)/ooxml/tokenxmlheader $(writerfilter_GEN_ooxml_Token_tmp) $(writerfilter_SRC)/ooxml/tokenxmlfooter
$(call gb_Output_announce,$@,build,CAT,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1)
cat $(writerfilter_SRC)/ooxml/tokenxmlheader $(writerfilter_GEN_ooxml_Token_tmp) $(writerfilter_SRC)/ooxml/tokenxmlfooter > $@
$(writerfilter_WORK)/OOXMLFactory%.cxx : $(writerfilter_SRC)/ooxml/factoryimpl_ns.xsl $(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) --stringparam file $@ $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_WORK)/OOXMLFactory%.hxx : $(writerfilter_SRC)/ooxml/factory_ns.xsl $(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$@,build,XSL,1)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) --stringparam file $@ $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment