diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-02-10 10:31:26 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-02-16 14:49:45 +0100 |
commit | 0adc9b615f118ebb78f5f2edfe0c1c0e41270d57 (patch) | |
tree | aa84e0793d6e95a94686b6caacc9a0b5e7e8611e /extras | |
parent | 52c998be025563802a5056a15352e4608311be1d (diff) |
GBUILD_TRACE, support for finding out where the build time is spent
See instructions in solenv/gbuild/Trace.mk . This generates a file than
can be viewed e.g. in the Chromium tracing view.
Change-Id: I5f90647c58ca729375525b6daed2d4918adc8188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88754
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'extras')
-rw-r--r-- | extras/CustomTarget_autocorr.mk | 6 | ||||
-rw-r--r-- | extras/CustomTarget_autotextshare.mk | 12 | ||||
-rw-r--r-- | extras/CustomTarget_autotextuser.mk | 6 | ||||
-rw-r--r-- | extras/CustomTarget_glade.mk | 2 | ||||
-rw-r--r-- | extras/CustomTarget_opensymbol.mk | 2 | ||||
-rw-r--r-- | extras/CustomTarget_tpl_styles.mk | 16 | ||||
-rw-r--r-- | extras/CustomTarget_tplofficorr.mk | 16 | ||||
-rw-r--r-- | extras/CustomTarget_tploffimisc.mk | 16 | ||||
-rw-r--r-- | extras/CustomTarget_tplpersonal.mk | 16 | ||||
-rw-r--r-- | extras/CustomTarget_tplpresnt.mk | 14 |
10 files changed, 106 insertions, 0 deletions
diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk index 41868dee54bf..63165f267f52 100644 --- a/extras/CustomTarget_autocorr.mk +++ b/extras/CustomTarget_autocorr.mk @@ -240,20 +240,26 @@ $(call gb_CustomTarget_get_target,extras/source/autocorr) : \ $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : $(SRCDIR)/extras/source/autocorr/lang/%/mimetype $(call gb_Output_announce,autocorr/$*/mimetype,$(true),CPY,1) + $(call gb_Trace_StartRange,autocorr/$*/mimetype,CPY) cp $< $@ + $(call gb_Trace_EndRange,autocorr/$*/mimetype,CPY) $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.xml : $(SRCDIR)/extras/source/autocorr/lang/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,autocorr/$*.xml,$(true),XSL,1) + $(call gb_Trace_StartRange,autocorr/$*.xml,XSL) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< + $(call gb_Trace_EndRange,autocorr/$*.xml,XSL) $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.dat : $(call gb_Output_announce,autocorr/$*.dat,$(true),ZIP,2) + $(call gb_Trace_StartRange,autocorr/$*.dat,ZIP) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_AUTOCORR_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_AUTOCORR_MIMEFILES_FILTER) && \ zip -qrX --must-match $@ $(EXTRAS_AUTOCORR_XMLFILES_FILTER) \ ) + $(call gb_Trace_EndRange,autocorr/$*.dat,ZIP) define extras_Autocorr_make_file_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/lang/$(2) \ diff --git a/extras/CustomTarget_autotextshare.mk b/extras/CustomTarget_autotextshare.mk index da2d364b366d..c7509f004b81 100644 --- a/extras/CustomTarget_autotextshare.mk +++ b/extras/CustomTarget_autotextshare.mk @@ -4463,32 +4463,44 @@ $(call gb_CustomTarget_get_target,extras/source/autotext) : \ $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%/mimetype : $(SRCDIR)/extras/source/autotext/lang/%/mimetype $(call gb_Output_announce,autotext/$*/mimetype,$(true),CPY,1) + $(call gb_Trace_StartRange,autotext/$*/mimetype,CPY) cp $< $@ + $(call gb_Trace_EndRange,autotext/$*/mimetype,CPY) $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.rdf : $(SRCDIR)/extras/source/autotext/lang/%.rdf $(call gb_Output_announce,autotext/$*.rdf,$(true),CPY,1) + $(call gb_Trace_StartRange,autotext/$*.rdf,CPY) cp $< $@ + $(call gb_Trace_EndRange,autotext/$*.rdf,CPY) $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.svm : $(SRCDIR)/extras/source/autotext/lang/%.svm $(call gb_Output_announce,autotext/$*.svm,$(true),CPY,1) + $(call gb_Trace_StartRange,autotext/$*.svm,CPY) cp $< $@ + $(call gb_Trace_EndRange,autotext/$*.svm,CPY) $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.png : $(SRCDIR)/extras/source/autotext/lang/%.png $(call gb_Output_announce,autotext/$*.png,$(true),CPY,1) + $(call gb_Trace_StartRange,autotext/$*.png,CPY) cp $< $@ + $(call gb_Trace_EndRange,autotext/$*.png,CPY) $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.xml : $(SRCDIR)/extras/source/autotext/lang/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,autotext/$*.xml,$(true),XSL,1) + $(call gb_Trace_StartRange,autotext/$*.xml,XSL) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< + $(call gb_Trace_EndRange,autotext/$*.xml,XSL) $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau : $(call gb_Output_announce,autotext/$*.bau,$(true),ZIP,2) + $(call gb_Trace_StartRange,autotext/$*.bau,ZIP) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_AUTOTEXTSHARE_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_AUTOTEXTSHARE_MIMEFILES_FILTER) && \ zip -qrX --must-match $@ $(EXTRAS_AUTOTEXTSHARE_XMLFILES_FILTER) \ ) + $(call gb_Trace_EndRange,autotext/$*.bau,ZIP) define extras_Autotextshare_make_file_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/lang/$(2) \ diff --git a/extras/CustomTarget_autotextuser.mk b/extras/CustomTarget_autotextuser.mk index 95d0bf080340..d4f662db9a12 100644 --- a/extras/CustomTarget_autotextuser.mk +++ b/extras/CustomTarget_autotextuser.mk @@ -27,20 +27,26 @@ $(call gb_CustomTarget_get_target,extras/source/autotext/user) : \ $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%/mimetype : $(SRCDIR)/extras/source/autotext/%/mimetype $(call gb_Output_announce,autotext/user/$*/mimetype,$(true),CPY,1) + $(call gb_Trace_StartRange,autotext/user/$*/mimetype,CPY) cp $< $@ + $(call gb_Trace_EndRange,autotext/user/$*/mimetype,CPY) $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,autotext/user/$*.xml,$(true),XSL,1) + $(call gb_Trace_StartRange,autotext/user/$*.xml,XSL) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< + $(call gb_Trace_EndRange,autotext/user/$*.xml,XSL) $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.bau : $(call gb_Output_announce,autotext/user/$*.bau,$(true),ZIP,2) + $(call gb_Trace_StartRange,autotext/user/$*.bau,ZIP) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_AUTOTEXTUSER_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_AUTOTEXTUSER_MIMEFILES_FILTER) && \ zip -qrX --must-match $@ $(EXTRAS_AUTOTEXTUSER_XMLFILES_FILTER) \ ) + $(call gb_Trace_EndRange,autotext/user/$*.bau,ZIP) define extras_Autotextuser_make_file_deps $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : $(SRCDIR)/$(1)/$(2) \ diff --git a/extras/CustomTarget_glade.mk b/extras/CustomTarget_glade.mk index fbd8c1606e2a..b25e095c532b 100644 --- a/extras/CustomTarget_glade.mk +++ b/extras/CustomTarget_glade.mk @@ -18,10 +18,12 @@ $(call gb_CustomTarget_get_workdir,extras/source/glade)/libreoffice-catalog.xml $(SRCDIR)/extras/source/glade/makewidgetgroup.xslt \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,4) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),XSL) $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@) && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ -o $@ $(SRCDIR)/extras/source/glade/makewidgetgroup.xslt $< \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),XSL) # vim: set noet sw=4 ts=4: diff --git a/extras/CustomTarget_opensymbol.mk b/extras/CustomTarget_opensymbol.mk index a27718feb377..c68480931044 100644 --- a/extras/CustomTarget_opensymbol.mk +++ b/extras/CustomTarget_opensymbol.mk @@ -15,7 +15,9 @@ ifneq (,$(FONTFORGE)) $(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \ $(SRCDIR)/extras/source/truetype/symbol/OpenSymbol.sfd $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),FNT,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),FNT) $(FONTFORGE) -lang=ff -c 'Open($$1); Generate($$2)' $< $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),FNT) else $(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \ $(TARFILE_LOCATION)/$(OPENSYMBOL_TTF) diff --git a/extras/CustomTarget_tpl_styles.mk b/extras/CustomTarget_tpl_styles.mk index 11a66332e6a4..107cc11d478f 100644 --- a/extras/CustomTarget_tpl_styles.mk +++ b/extras/CustomTarget_tpl_styles.mk @@ -33,40 +33,56 @@ $(call gb_CustomTarget_get_target,extras/source/templates/styles) : \ $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%/mimetype : $(SRCDIR)/extras/source/templates/styles/%/mimetype $(call gb_Output_announce,templates/styles/$*/mimetype,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/styles/$*/mimetype,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/styles/$*/mimetype,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.jpg : $(SRCDIR)/extras/source/templates/styles/%.jpg $(call gb_Output_announce,templates/styles/$*.jpg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/styles/$*.jpg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/styles/$*.jpg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.png : $(SRCDIR)/extras/source/templates/styles/%.png $(call gb_Output_announce,templates/styles/$*.png,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/styles/$*.png,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/styles/$*.png,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.rdf : $(SRCDIR)/extras/source/templates/styles/%.rdf $(call gb_Output_announce,templates/styles/$*.rdf,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/styles/$*.rdf,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/styles/$*.rdf,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.svg : $(SRCDIR)/extras/source/templates/styles/%.svg $(call gb_Output_announce,templates/styles/$*.svg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/styles/$*.svg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/styles/$*.svg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.svm : $(SRCDIR)/extras/source/templates/styles/%.svm $(call gb_Output_announce,templates/styles/$*.svm,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/styles/$*.svm,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/styles/$*.svm,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.xml : $(SRCDIR)/extras/source/templates/styles/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,templates/styles/$*.xml,$(true),XSL,1) + $(call gb_Trace_StartRange,templates/styles/$*.xml,XSL) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< + $(call gb_Trace_EndRange,templates/styles/$*.xml,XSL) $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.ott : $(call gb_Output_announce,templates/styles/$*.ott,$(true),ZIP,2) + $(call gb_Trace_StartRange,templates/styles/$*.ott,ZIP) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_STYLES_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_STYLES_MIMEFILES_FILTER) && \ zip -qrX --must-match $@ $(EXTRAS_STYLES_XMLFILES_FILTER) \ ) + $(call gb_Trace_EndRange,templates/styles/$*.ott,ZIP) define extras_Tplstyles_make_file_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \ diff --git a/extras/CustomTarget_tplofficorr.mk b/extras/CustomTarget_tplofficorr.mk index cc43e22c26aa..e6337b7f03b6 100644 --- a/extras/CustomTarget_tplofficorr.mk +++ b/extras/CustomTarget_tplofficorr.mk @@ -37,40 +37,56 @@ $(call gb_CustomTarget_get_target,extras/source/templates/officorr) : \ $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%/mimetype : $(SRCDIR)/extras/source/templates/officorr/%/mimetype $(call gb_Output_announce,templates/officorr/$*/mimetype,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/officorr/$*/mimetype,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/officorr/$*/mimetype,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.jpg : $(SRCDIR)/extras/source/templates/officorr/%.jpg $(call gb_Output_announce,templates/officorr/$*.jpg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/officorr/$*.jpg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/officorr/$*.jpg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.rdf : $(SRCDIR)/extras/source/templates/officorr/%.rdf $(call gb_Output_announce,templates/officorr/$*.rdf,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/officorr/$*.rdf,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/officorr/$*.rdf,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.png : $(SRCDIR)/extras/source/templates/officorr/%.png $(call gb_Output_announce,templates/officorr/$*.png,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/officorr/$*.png,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/officorr/$*.png,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.svg : $(SRCDIR)/extras/source/templates/officorr/%.svg $(call gb_Output_announce,templates/officorr/$*.svg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/officorr/$*.svg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/officorr/$*.svg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.svm : $(SRCDIR)/extras/source/templates/officorr/%.svm $(call gb_Output_announce,templates/officorr/$*.svm,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/officorr/$*.svm,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/officorr/$*.svm,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.xml : $(SRCDIR)/extras/source/templates/officorr/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,templates/officorr/$*.xml,$(true),XSL,1) + $(call gb_Trace_StartRange,templates/officorr/$*.xml,XSL) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< + $(call gb_Trace_EndRange,templates/officorr/$*.xml,XSL) $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.ott : $(call gb_Output_announce,templates/officorr/$*.ott,$(true),ZIP,2) + $(call gb_Trace_StartRange,templates/officorr/$*.ott,ZIP) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_OFFICORR_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_OFFICORR_MIMEFILES_FILTER) && \ zip -qrX --must-match $@ $(EXTRAS_OFFICORR_XMLFILES_FILTER) \ ) + $(call gb_Trace_EndRange,templates/officorr/$*.ott,ZIP) define extras_Tplofficorr_make_file_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \ diff --git a/extras/CustomTarget_tploffimisc.mk b/extras/CustomTarget_tploffimisc.mk index 4a1fc666e31f..a4582eb2686b 100644 --- a/extras/CustomTarget_tploffimisc.mk +++ b/extras/CustomTarget_tploffimisc.mk @@ -32,40 +32,56 @@ $(call gb_CustomTarget_get_target,extras/source/templates/offimisc) : \ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%/mimetype : $(SRCDIR)/extras/source/templates/offimisc/%/mimetype $(call gb_Output_announce,templates/offimisc/$*/mimetype,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/offimisc/$*/mimetype,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/offimisc/$*/mimetype,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.jpg : $(SRCDIR)/extras/source/templates/offimisc/%.jpg $(call gb_Output_announce,templates/offimisc/$*.jpg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/offimisc/$*.jpg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/offimisc/$*.jpg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.png : $(SRCDIR)/extras/source/templates/offimisc/%.png $(call gb_Output_announce,templates/offimisc/$*.png,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/offimisc/$*.png,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/offimisc/$*.png,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.rdf : $(SRCDIR)/extras/source/templates/offimisc/%.rdf $(call gb_Output_announce,templates/offimisc/$*.rdf,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/offimisc/$*.rdf,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/offimisc/$*.rdf,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.svg : $(SRCDIR)/extras/source/templates/offimisc/%.svg $(call gb_Output_announce,templates/offimisc/$*.svg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/offimisc/$*.svg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/offimisc/$*.svg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.svm : $(SRCDIR)/extras/source/templates/offimisc/%.svm $(call gb_Output_announce,templates/offimisc/$*.svm,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/offimisc/$*.svm,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/offimisc/$*.svm,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.xml : $(SRCDIR)/extras/source/templates/offimisc/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,templates/offimisc/$*.xml,$(true),XSL,1) + $(call gb_Trace_StartRange,templates/offimisc/$*.xml,XSL) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< + $(call gb_Trace_EndRange,templates/offimisc/$*.xml,XSL) $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.ott : $(call gb_Output_announce,templates/offimisc/$*.ott,$(true),ZIP,2) + $(call gb_Trace_StartRange,templates/offimisc/$*.ott,ZIP) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_OFFIMISC_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_OFFIMISC_MIMEFILES_FILTER) && \ zip -qrX --must-match $@ $(EXTRAS_OFFIMISC_XMLFILES_FILTER) \ ) + $(call gb_Trace_EndRange,templates/offimisc/$*.ott,ZIP) define extras_Tploffimisc_make_file_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \ diff --git a/extras/CustomTarget_tplpersonal.mk b/extras/CustomTarget_tplpersonal.mk index d4b82dadb533..3b39354da57a 100644 --- a/extras/CustomTarget_tplpersonal.mk +++ b/extras/CustomTarget_tplpersonal.mk @@ -37,40 +37,56 @@ $(call gb_CustomTarget_get_target,extras/source/templates/personal) : \ $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%/mimetype : $(SRCDIR)/extras/source/templates/personal/%/mimetype $(call gb_Output_announce,templates/personal/$*/mimetype,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/personal/$*/mimetype,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/personal/$*/mimetype,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.jpg : $(SRCDIR)/extras/source/templates/personal/%.jpg $(call gb_Output_announce,templates/personal/$*.jpg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/personal/$*.jpg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/personal/$*.jpg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.png : $(SRCDIR)/extras/source/templates/personal/%.png $(call gb_Output_announce,templates/personal/$*.png,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/personal/$*.png,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/personal/$*.png,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.rdf : $(SRCDIR)/extras/source/templates/personal/%.rdf $(call gb_Output_announce,templates/personal/$*.rdf,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/personal/$*.rdf,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/personal/$*.rdf,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.svg : $(SRCDIR)/extras/source/templates/personal/%.svg $(call gb_Output_announce,templates/personal/$*.svg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/personal/$*.svg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/personal/$*.svg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.svm : $(SRCDIR)/extras/source/templates/personal/%.svm $(call gb_Output_announce,templates/personal/$*.svm,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/personal/$*.svm,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/personal/$*.svm,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.xml : $(SRCDIR)/extras/source/templates/personal/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,templates/personal/$*.xml,$(true),XSL,1) + $(call gb_Trace_StartRange,templates/personal/$*.xml,XSL) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< + $(call gb_Trace_EndRange,templates/personal/$*.xml,XSL) $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.ott : $(call gb_Output_announce,templates/personal/$*.ott,$(true),ZIP,2) + $(call gb_Trace_StartRange,templates/personal/$*.ott,ZIP) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_PERSONAL_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_PERSONAL_MIMEFILES_FILTER) && \ zip -qrX --must-match $@ $(EXTRAS_PERSONAL_XMLFILES_FILTER) \ ) + $(call gb_Trace_EndRange,templates/personal/$*.ott,ZIP) define extras_Tplpersonal_make_file_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \ diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk index 0f9b604f6213..4073a3b2e829 100644 --- a/extras/CustomTarget_tplpresnt.mk +++ b/extras/CustomTarget_tplpresnt.mk @@ -216,36 +216,50 @@ $(call gb_CustomTarget_get_target,extras/source/templates/presnt) : \ $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%/mimetype : $(SRCDIR)/extras/source/templates/presnt/%/mimetype $(call gb_Output_announce,templates/presnt/$*/mimetype,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/presnt/$*/mimetype,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/presnt/$*/mimetype,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.jpg : $(SRCDIR)/extras/source/templates/presnt/%.jpg $(call gb_Output_announce,templates/presnt/$*.jpg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/presnt/$*.jpg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/presnt/$*.jpg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.svg : $(SRCDIR)/extras/source/templates/presnt/%.svg $(call gb_Output_announce,templates/presnt/$*.svg,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/presnt/$*.svg,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/presnt/$*.svg,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.png : $(SRCDIR)/extras/source/templates/presnt/%.png $(call gb_Output_announce,templates/presnt/$*.png,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/presnt/$*.png,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/presnt/$*.png,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.svm : $(SRCDIR)/extras/source/templates/presnt/%.svm $(call gb_Output_announce,templates/presnt/$*.svm,$(true),CPY,1) + $(call gb_Trace_StartRange,templates/presnt/$*.svm,CPY) cp $< $@ + $(call gb_Trace_EndRange,templates/presnt/$*.svm,CPY) $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.xml : $(SRCDIR)/extras/source/templates/presnt/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,templates/presnt/$*.xml,$(true),XSL,1) + $(call gb_Trace_StartRange,templates/presnt/$*.xml,XSL) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< + $(call gb_Trace_EndRange,templates/presnt/$*.xml,XSL) $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.otp : $(call gb_Output_announce,templates/presnt/$*.otp,$(true),ZIP,2) + $(call gb_Trace_StartRange,templates/presnt/$*.otp,ZIP) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_PRESENTATIONS_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_PRESENTATIONS_MIMEFILES_FILTER) && \ zip -qrX --must-match $@ $(EXTRAS_PRESENTATIONS_XMLFILES_FILTER) \ ) + $(call gb_Trace_EndRange,templates/presnt/$*.otp,ZIP) define extras_Tplpresnt_make_file_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \ |