diff options
191 files changed, 979 insertions, 54 deletions
diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index b64c9245aeff..c735139fa06e 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -15,12 +15,14 @@ $(call gb_CustomTarget_get_target,android/loandroid3) : \ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MAK) cd $(SRCDIR)/android/source && $(MAKE) all # Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script # still looks for the .apk, and we want fresh daily builds to be uploaded. # Us "foo" instead of the old INPATH mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin ; fi + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MAK) $(call gb_CustomTarget_get_clean_target,android/loandroid3) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk index 2fbd54b682c0..1fa356db16b3 100644 --- a/desktop/CustomTarget_soffice.mk +++ b/desktop/CustomTarget_soffice.mk @@ -16,10 +16,12 @@ $(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh : \ $(SRCDIR)/desktop/scripts/soffice.sh \ | $(call gb_CustomTarget_get_workdir,desktop/soffice)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED) ifneq ($(JITC_PROCESSOR_TYPE),) sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@ else cp $< $@ endif + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/extensions/CustomTarget_automationtest.mk b/extensions/CustomTarget_automationtest.mk index 1c115b09a8b5..e895c0b2a337 100644 --- a/extensions/CustomTarget_automationtest.mk +++ b/extensions/CustomTarget_automationtest.mk @@ -17,11 +17,13 @@ extensions_AUTOMATIONTESTLOG2 := $(extensions_AUTOMATIONTESTDIR)/automationtest. $(call gb_CustomTarget_get_target,extensions/automationtest) : \ $(SRCDIR)/extensions/qa/ole/automationtest.vbs \ | $(extensions_AUTOMATIONTESTDIR)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),VBS,1) \ + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),VBS,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),VBS) SAL_LOG=+INFO.extensions.olebridge+WARN $(INSTDIR)/program/soffice 2>$(extensions_AUTOMATIONTESTLOG1) & sleep 10 $(call gb_Helper_abbreviate_dirs, \ cscript -nologo $(SRCDIR)/extensions/qa/ole/automationtest.vbs $(SRCDIR)) >$(extensions_AUTOMATIONTESTLOG2) || \ (cat $(extensions_AUTOMATIONTESTLOG1) $(extensions_AUTOMATIONTESTLOG2) && exit 1) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),VBS) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/extensions/CustomTarget_so_activex_idl.mk b/extensions/CustomTarget_so_activex_idl.mk index db1679434af1..b4d841aec524 100644 --- a/extensions/CustomTarget_so_activex_idl.mk +++ b/extensions/CustomTarget_so_activex_idl.mk @@ -21,6 +21,7 @@ $(extensions_AXIDLDIR)/so_activex.tlb : \ $(SRCDIR)/extensions/source/activex/so_activex.idl \ | $(extensions_AXIDLDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),IDL) $(call gb_Helper_abbreviate_dirs, \ midl.exe \ -tlb $@ \ @@ -31,5 +32,6 @@ $(extensions_AXIDLDIR)/so_activex.tlb : \ -Oicf \ $(INCLUDE) \ $<) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),IDL) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/apache-commons/ExternalProject_apache_commons_logging.mk b/external/apache-commons/ExternalProject_apache_commons_logging.mk index 47981ee9ecd6..640810d9c1ed 100644 --- a/external/apache-commons/ExternalProject_apache_commons_logging.mk +++ b/external/apache-commons/ExternalProject_apache_commons_logging.mk @@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\ )) $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) : + $(call gb_Trace_StartRange,apache_commons_logging,EXTERNAL) $(call gb_ExternalProject_run,build,\ ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \ $(ICECREAM_RUN) "$(ANT)" \ @@ -25,5 +26,6 @@ $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) : $(if $(debug),-Dcompile.debug="true",-Dcompile.debug="false") \ compile build-jar \ ) + $(call gb_Trace_EndRange,apache_commons_logging,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/apr/ExternalProject_apr.mk b/external/apr/ExternalProject_apr.mk index 00e3ab67086a..1c94480e5ab7 100644 --- a/external/apr/ExternalProject_apr.mk +++ b/external/apr/ExternalProject_apr.mk @@ -17,14 +17,17 @@ $(eval $(call gb_ExternalProject_use_nmake,apr,build)) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,apr,build): + $(call gb_Trace_StartRange,apr,EXTERNAL) $(call gb_ExternalProject_run,build,\ nmake -nologo -f apr.mak \ CFG="apr - Win32 $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)" \ RECURSE=0 \ ) + $(call gb_Trace_EndRange,apr,EXTERNAL) else $(call gb_ExternalProject_get_state_target,apr,build): + $(call gb_Trace_StartRange,apr,EXTERNAL) +$(call gb_ExternalProject_run,build,\ $(if $(ENABLE_MACOSX_SANDBOX),ac_cv_func_fdatasync=no) \ ./configure \ @@ -33,6 +36,7 @@ $(call gb_ExternalProject_get_state_target,apr,build): $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ && $(MAKE) libapr-1.la \ ) + $(call gb_Trace_EndRange,apr,EXTERNAL) endif diff --git a/external/apr/ExternalProject_apr_util.mk b/external/apr/ExternalProject_apr_util.mk index 4de76ba4c43a..a311f32e8e01 100644 --- a/external/apr/ExternalProject_apr_util.mk +++ b/external/apr/ExternalProject_apr_util.mk @@ -19,14 +19,17 @@ $(eval $(call gb_ExternalProject_use_nmake,apr_util,build)) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,apr_util,build): + $(call gb_Trace_StartRange,apr_util,EXTERNAL) $(call gb_ExternalProject_run,build,\ nmake -nologo -f aprutil.mak \ CFG="aprutil - Win32 $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)" \ RECURSE=0 \ ) + $(call gb_Trace_EndRange,apr_util,EXTERNAL) else $(call gb_ExternalProject_get_state_target,apr_util,build): + $(call gb_Trace_StartRange,apr_util,EXTERNAL) +$(call gb_ExternalProject_run,build,\ ./configure \ --enable-static --disable-shared \ @@ -35,6 +38,7 @@ $(call gb_ExternalProject_get_state_target,apr_util,build): --with-apr=$(call gb_UnpackedTarball_get_dir,apr)/apr-1-config \ && $(MAKE) libaprutil-1.la \ ) + $(call gb_Trace_EndRange,apr_util,EXTERNAL) endif diff --git a/external/beanshell/ExternalProject_beanshell.mk b/external/beanshell/ExternalProject_beanshell.mk index 6f43c9477e40..d6ce0af49ebe 100644 --- a/external/beanshell/ExternalProject_beanshell.mk +++ b/external/beanshell/ExternalProject_beanshell.mk @@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,beanshell,\ )) $(call gb_ExternalProject_get_state_target,beanshell,build) : + $(call gb_Trace_StartRange,beanshell,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -23,5 +24,6 @@ $(call gb_ExternalProject_get_state_target,beanshell,build) : -Dant.build.javac.target=$(JAVA_TARGET_VER) \ $(if $(debug),-Dbuild.debug="on") \ ) + $(call gb_Trace_EndRange,beanshell,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/breakpad/ExternalProject_breakpad.mk b/external/breakpad/ExternalProject_breakpad.mk index f95b4b2e65b4..9e7e72485849 100644 --- a/external/breakpad/ExternalProject_breakpad.mk +++ b/external/breakpad/ExternalProject_breakpad.mk @@ -19,10 +19,12 @@ ifeq ($(COM),MSC) else # !ifeq($(COM),MSC) $(call gb_ExternalProject_get_state_target,breakpad,build) : + $(call gb_Trace_StartRange,breakpad,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure CXXFLAGS="-O2 $(gb_VISIBILITY_FLAGS)" \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,breakpad,EXTERNAL) endif diff --git a/external/bzip2/ExternalProject_bzip2.mk b/external/bzip2/ExternalProject_bzip2.mk index 5b88ced29b10..8b37bcd27151 100644 --- a/external/bzip2/ExternalProject_bzip2.mk +++ b/external/bzip2/ExternalProject_bzip2.mk @@ -17,14 +17,18 @@ $(eval $(call gb_ExternalProject_use_nmake,bzip2,build)) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,bzip2,build): + $(call gb_Trace_StartRange,bzip2,EXTERNAL) $(call gb_ExternalProject_run,build,\ nmake -nologo -f makefile.msc \ ) + $(call gb_Trace_EndRange,bzip2,EXTERNAL) else $(call gb_ExternalProject_get_state_target,bzip2,build): + $(call gb_Trace_StartRange,bzip2,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(MAKE) \ ) + $(call gb_Trace_EndRange,bzip2,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 3dac98fc4362..43b4a7b53b2a 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -29,9 +29,11 @@ $(eval $(call gb_ExternalProject_register_targets,cairo,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,cairo,build) : + $(call gb_Trace_StartRange,cairo,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(MAKE) -f Makefile.win32 CFG=release ZLIB3RDLIB=zlib.lib \ ) + $(call gb_Trace_EndRange,cairo,EXTERNAL) else @@ -40,6 +42,7 @@ else # from cairo.h in non-overridable way $(call gb_ExternalProject_get_state_target,cairo,build) : + $(call gb_Trace_StartRange,cairo,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure \ $(if $(debug),STRIP=" ") \ @@ -69,6 +72,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : && cp cairo-version.h src/cairo-version.h \ && cd src && $(MAKE) \ ) + $(call gb_Trace_EndRange,cairo,EXTERNAL) endif diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk index 6dd2d6bed867..fec943762df8 100644 --- a/external/cairo/ExternalProject_pixman.mk +++ b/external/cairo/ExternalProject_pixman.mk @@ -16,9 +16,11 @@ $(eval $(call gb_ExternalProject_register_targets,pixman,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,pixman,build) : + $(call gb_Trace_StartRange,pixman,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(MAKE) -f Makefile.win32 MMX=on SSE2=on CFG=release \ ,pixman) + $(call gb_Trace_EndRange,pixman,EXTERNAL) else @@ -30,6 +32,7 @@ else # pixman-cpu.c to be hardcoded as TRUE and patch out the run-time # check? $(call gb_ExternalProject_get_state_target,pixman,build) : + $(call gb_Trace_StartRange,pixman,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,$(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static)) \ @@ -38,6 +41,7 @@ $(call gb_ExternalProject_get_state_target,pixman,build) : $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,pixman,EXTERNAL) endif diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index e2eeaf93ed8f..7c10b0576a62 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -15,6 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,coinmp,\ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,coinmp,build) : + $(call gb_Trace_StartRange,coinmp,EXTERNAL) $(call gb_ExternalProject_run,build,\ MSBuild.exe CoinMP.sln /t:Build \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ @@ -23,9 +24,11 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) : $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ ,CoinMP/MSVisualStudio/v9) + $(call gb_Trace_EndRange,coinmp,EXTERNAL) else $(call gb_ExternalProject_get_state_target,coinmp,build) : + $(call gb_Trace_StartRange,coinmp,EXTERNAL) +$(call gb_ExternalProject_run,build,\ ./configure COIN_SKIP_PROJECTS="Data/Sample" \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ @@ -50,6 +53,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) : $(EXTERNAL_WORKDIR)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \ $(EXTERNAL_WORKDIR)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \ ) + $(call gb_Trace_EndRange,coinmp,EXTERNAL) endif diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 4bacac8ffe80..b9ff8b50684b 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -15,6 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,cppunit,build) : + $(call gb_Trace_StartRange,cppunit,EXTERNAL) $(call gb_ExternalProject_run,build,\ PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ @@ -25,6 +26,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : && cd ../DllPlugInTester \ && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \ ,src/cppunit) + $(call gb_Trace_EndRange,cppunit,EXTERNAL) else cppunit_CXXFLAGS=$(CXXFLAGS) @@ -40,6 +42,7 @@ cppunit_CXXFLAGS+=-g endif $(call gb_ExternalProject_get_state_target,cppunit,build) : + $(call gb_Trace_StartRange,cppunit,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure \ --disable-dependency-tracking \ @@ -57,6 +60,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : && cd src \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,cppunit,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index fc5866df6115..cb6fd0809a37 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -38,6 +38,7 @@ endif # use --with-darwinssl on macOS >10.5 and iOS to get a native UI for SSL certs for CMIS usage # use --with-nss only on platforms other than macOS and iOS $(call gb_ExternalProject_get_state_target,curl,build): + $(call gb_Trace_StartRange,curl,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure \ $(if $(filter iOS MACOSX,$(OS)),\ @@ -67,12 +68,14 @@ $(call gb_ExternalProject_get_state_target,curl,build): && cd lib \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,curl,EXTERNAL) else ifeq ($(COM),MSC) $(eval $(call gb_ExternalProject_use_nmake,curl,build)) $(call gb_ExternalProject_get_state_target,curl,build): + $(call gb_Trace_StartRange,curl,EXTERNAL) $(call gb_ExternalProject_run,build,\ nmake -f Makefile.vc \ mode=dll \ @@ -84,6 +87,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): ENABLE_SSPI=yes \ ENABLE_WINSSL=yes \ ,winbuild) + $(call gb_Trace_EndRange,curl,EXTERNAL) endif diff --git a/external/epm/ExternalProject_epm.mk b/external/epm/ExternalProject_epm.mk index ca0c298509c6..68a61a78a744 100644 --- a/external/epm/ExternalProject_epm.mk +++ b/external/epm/ExternalProject_epm.mk @@ -14,11 +14,13 @@ $(eval $(call gb_ExternalProject_register_targets,epm,\ )) $(call gb_ExternalProject_get_state_target,epm,build) : + $(call gb_Trace_StartRange,epm,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure --disable-fltk \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \ && $(MAKE) \ && touch $@ \ ) + $(call gb_Trace_EndRange,epm,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/expat/ExternalProject_expat.mk b/external/expat/ExternalProject_expat.mk index 87886eab1f7e..4f4f0301c1bc 100644 --- a/external/expat/ExternalProject_expat.mk +++ b/external/expat/ExternalProject_expat.mk @@ -14,10 +14,12 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\ )) $(call gb_ExternalProject_get_state_target,expat,configure) : + $(call gb_Trace_StartRange,expat,EXTERNAL) $(call gb_ExternalProject_run,configure,\ ./configure --without-docbook \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ ,,expat_configure.log) + $(call gb_Trace_EndRange,expat,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index a70a53d0e9d5..ce99e909aee1 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -38,6 +38,7 @@ MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(EXTERNAL_WORKDIR)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0) $(call gb_ExternalProject_get_state_target,firebird,build): + $(call gb_Trace_StartRange,firebird,EXTERNAL) $(call gb_ExternalProject_run,build,\ unset MAKEFLAGS \ && FB_CPU_ARG='$(filter --jobserver-fds=%,$(MAKEFLAGS))' \ @@ -110,4 +111,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build): $(MAKE_POST); \ fi \ ) + $(call gb_Trace_EndRange,firebird,EXTERNAL) + # vim: set noet sw=4 ts=4: diff --git a/external/fontconfig/ExternalProject_fontconfig.mk b/external/fontconfig/ExternalProject_fontconfig.mk index 32fc03f52db7..b82c7657395b 100644 --- a/external/fontconfig/ExternalProject_fontconfig.mk +++ b/external/fontconfig/ExternalProject_fontconfig.mk @@ -19,6 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,fontconfig,\ )) $(call gb_ExternalProject_get_state_target,fontconfig,build) : + $(call gb_Trace_StartRange,fontconfig,EXTERNAL) $(call gb_ExternalProject_run,build,\ CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" $(if $(filter ANDROID,$(OS)),LIBS="-lm") \ ./configure \ @@ -30,5 +31,6 @@ $(call gb_ExternalProject_get_state_target,fontconfig,build) : --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ && $(MAKE) -C src \ ) + $(call gb_Trace_EndRange,fontconfig,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index 46c7972d0601..3f4a719d5663 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -15,12 +15,15 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,freetype,build) : + $(call gb_Trace_StartRange,freetype,EXTERNAL) $(call gb_ExternalProject_run,build,\ cd ../builds/win32/vc2010/ && \ msbuild.exe freetype.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ ,objs) + $(call gb_Trace_EndRange,freetype,EXTERNAL) else $(call gb_ExternalProject_get_state_target,freetype,build) : + $(call gb_Trace_StartRange,freetype,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure \ --disable-shared \ @@ -32,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : CFLAGS="$(if $(debug),-g) $(gb_VISIBILITY_FLAGS)" \ && $(MAKE) install \ && touch $@ ) + $(call gb_Trace_EndRange,freetype,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/gpgmepp/ExternalProject_gpgmepp.mk b/external/gpgmepp/ExternalProject_gpgmepp.mk index 8ecdf60e6f87..989844465f1f 100644 --- a/external/gpgmepp/ExternalProject_gpgmepp.mk +++ b/external/gpgmepp/ExternalProject_gpgmepp.mk @@ -24,6 +24,7 @@ ifeq ($(COM),MSC) gb_ExternalProject_gpgmepp_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) gb_ExternalProject_gpgmepp_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64) $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_get_target,cpp) + $(call gb_Trace_StartRange,gpgmepp,EXTERNAL) $(call gb_ExternalProject_run,build,\ autoreconf \ && ./configure \ @@ -43,8 +44,10 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(call gb_Executable_ MAKE=$(MAKE) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,gpgmepp,EXTERNAL) else $(call gb_ExternalProject_get_state_target,gpgmepp,build): + $(call gb_Trace_StartRange,gpgmepp,EXTERNAL) $(call gb_ExternalProject_run,build,\ autoreconf \ && ./configure \ @@ -76,6 +79,7 @@ $(call gb_ExternalProject_get_state_target,gpgmepp,build): $(EXTERNAL_WORKDIR)/src/.libs/libgpgme.11.dylib \ ) \ ) + $(call gb_Trace_EndRange,gpgmepp,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index 583ffc363bf7..7219d402df3c 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,harfbuzz,\ )) $(call gb_ExternalProject_get_state_target,harfbuzz,build) : + $(call gb_Trace_StartRange,harfbuzz,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(if $(CROSS_COMPILING),ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \ $(if $(SYSTEM_ICU),,ICU_CONFIG=$(SRCDIR)/external/icu/cross-bin/icu-config) \ @@ -53,5 +54,6 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : MAKE=$(MAKE) \ && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \ ) + $(call gb_Trace_EndRange,harfbuzz,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk index 4ecc00af978f..d253334549b7 100644 --- a/external/hsqldb/ExternalProject_hsqldb.mk +++ b/external/hsqldb/ExternalProject_hsqldb.mk @@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,hsqldb,\ )) $(call gb_ExternalProject_get_state_target,hsqldb,build) : + $(call gb_Trace_StartRange,hsqldb,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -24,5 +25,6 @@ $(call gb_ExternalProject_get_state_target,hsqldb,build) : $(if $(debug),-Dbuild.debug="on") \ jar \ ) + $(call gb_Trace_EndRange,hsqldb,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/hunspell/ExternalProject_hunspell.mk b/external/hunspell/ExternalProject_hunspell.mk index 3686f141f2c2..43da1c254e34 100644 --- a/external/hunspell/ExternalProject_hunspell.mk +++ b/external/hunspell/ExternalProject_hunspell.mk @@ -22,6 +22,7 @@ endif endif $(call gb_ExternalProject_get_state_target,hunspell,build): + $(call gb_Trace_StartRange,hunspell,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure --disable-shared --disable-nls --with-pic \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ @@ -30,5 +31,6 @@ $(call gb_ExternalProject_get_state_target,hunspell,build): CXXFLAGS="$(CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS))" \ && cd src/hunspell && $(MAKE) \ ) + $(call gb_Trace_EndRange,hunspell,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk index 9332cecd26b6..21cef66d85d0 100644 --- a/external/hyphen/ExternalProject_hyphen.mk +++ b/external/hyphen/ExternalProject_hyphen.mk @@ -16,11 +16,13 @@ $(eval $(call gb_ExternalProject_register_targets,hyphen,\ )) $(call gb_ExternalProject_get_state_target,hyphen,build): + $(call gb_Trace_StartRange,hyphen,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure --disable-shared \ $(if $(filter-out iOS,$(OS)),--with-pic) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,hyphen,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index b01190917497..1845ec3472a1 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -19,6 +19,7 @@ ifeq ($(OS),WNT) # Note: runConfigureICU ignores everything following the platform name! $(call gb_ExternalProject_get_state_target,icu,build) : + $(call gb_Trace_StartRange,icu,EXTERNAL) $(call gb_ExternalProject_run,build,\ export LIB="$(ILIB)" \ && CFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="-FS -arch:SSE $(SOLARINC) $(gb_DEBUGINFO_FLAGS)" \ @@ -28,6 +29,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : Cygwin/MSVC --disable-extras \ && $(MAKE) \ ,source) + $(call gb_Trace_EndRange,icu,EXTERNAL) else # $(OS) @@ -59,6 +61,7 @@ icu_LDFLAGS:=" \ # data directory/doesn't build the requested library in that case (icu/source/Makefile.in) # so we need to add it back to the list of subdirectories to build $(call gb_ExternalProject_get_state_target,icu,build) : + $(call gb_Trace_StartRange,icu,EXTERNAL) $(call gb_ExternalProject_run,build,\ CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \ CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \ @@ -84,6 +87,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : OOO \ $(EXTERNAL_WORKDIR)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)) \ ,source) + $(call gb_Trace_EndRange,icu,EXTERNAL) endif diff --git a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk index 38247c21f50f..ffa12623d191 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flow_engine.mk @@ -18,6 +18,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flow_engine,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : + $(call gb_Trace_StartRange,jfreereport_flow_engine,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -36,5 +37,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flow_engine,build) : -Dant.build.javac.target=$(JAVA_TARGET_VER) \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_flow_engine,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_flute.mk b/external/jfreereport/ExternalProject_jfreereport_flute.mk index e3b4167a3cfa..a9cb63819c87 100644 --- a/external/jfreereport/ExternalProject_jfreereport_flute.mk +++ b/external/jfreereport/ExternalProject_jfreereport_flute.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_flute,build) : + $(call gb_Trace_StartRange,jfreereport_flute,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_flute,build) : -Dproject.revision="$(FLUTE_VERSION)" \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_flute,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libbase.mk b/external/jfreereport/ExternalProject_jfreereport_libbase.mk index 8ad52770342d..2e236d192143 100644 --- a/external/jfreereport/ExternalProject_jfreereport_libbase.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libbase.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) : + $(call gb_Trace_StartRange,jfreereport_libbase,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libbase,build) : -Dproject.revision="$(LIBBASE_VERSION)" \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_libbase,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk index bf19cd112d21..b14644c80c3b 100644 --- a/external/jfreereport/ExternalProject_jfreereport_libfonts.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libfonts.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) : + $(call gb_Trace_StartRange,jfreereport_libfonts,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libfonts,build) : -Dproject.revision="$(LIBFONTS_VERSION)" \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_libfonts,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libformula.mk b/external/jfreereport/ExternalProject_jfreereport_libformula.mk index 4b0a21198e34..95c650e8fe64 100644 --- a/external/jfreereport/ExternalProject_jfreereport_libformula.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libformula.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) : + $(call gb_Trace_StartRange,jfreereport_libformula,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libformula,build) : -Dproject.revision="$(LIBFORMULA_VERSION)" \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_libformula,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk index 831711dd44c8..519368c2b649 100644 --- a/external/jfreereport/ExternalProject_jfreereport_liblayout.mk +++ b/external/jfreereport/ExternalProject_jfreereport_liblayout.mk @@ -30,6 +30,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_liblayout,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : + $(call gb_Trace_StartRange,jfreereport_liblayout,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -53,5 +54,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_liblayout,build) : -Dbuild.id="10682" \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_liblayout,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libloader.mk b/external/jfreereport/ExternalProject_jfreereport_libloader.mk index 02e913b2bff9..2b37d9a224b8 100644 --- a/external/jfreereport/ExternalProject_jfreereport_libloader.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libloader.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) : + $(call gb_Trace_StartRange,jfreereport_libloader,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libloader,build) : -Dproject.revision="$(LIBLOADER_VERSION)" \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_libloader,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_librepository.mk b/external/jfreereport/ExternalProject_jfreereport_librepository.mk index 046aba46aad4..e95610b854c6 100644 --- a/external/jfreereport/ExternalProject_jfreereport_librepository.mk +++ b/external/jfreereport/ExternalProject_jfreereport_librepository.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) : + $(call gb_Trace_StartRange,jfreereport_librepository,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_librepository,build) : -Dproject.revision="$(LIBREPOSITORY_VERSION)" \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_librepository,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk index 5bf76573f001..34614fb08b6a 100644 --- a/external/jfreereport/ExternalProject_jfreereport_libserializer.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libserializer.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) : + $(call gb_Trace_StartRange,jfreereport_libserializer,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libserializer,build) : -Dproject.revision="$(LIBSERIALIZER_VERSION)" \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_libserializer,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_libxml.mk b/external/jfreereport/ExternalProject_jfreereport_libxml.mk index fd4b6d832cc7..478a75747dc6 100644 --- a/external/jfreereport/ExternalProject_jfreereport_libxml.mk +++ b/external/jfreereport/ExternalProject_jfreereport_libxml.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) : + $(call gb_Trace_StartRange,jfreereport_libxml,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_libxml,build) : -Dproject.revision="$(LIBXML_VERSION)" \ $(if $(debug),-Dbuild.debug="on") jar \ ) + $(call gb_Trace_EndRange,jfreereport_libxml,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/jfreereport/ExternalProject_jfreereport_sac.mk b/external/jfreereport/ExternalProject_jfreereport_sac.mk index f6aeee2ad271..b78d8a970b15 100644 --- a/external/jfreereport/ExternalProject_jfreereport_sac.mk +++ b/external/jfreereport/ExternalProject_jfreereport_sac.mk @@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\ )) $(call gb_ExternalProject_get_state_target,jfreereport_sac,build) : + $(call gb_Trace_StartRange,jfreereport_sac,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -24,5 +25,6 @@ $(call gb_ExternalProject_get_state_target,jfreereport_sac,build) : -Dantcontrib.available="true" \ $(if $(debug),-Dbuild.debug="on") all \ ) + $(call gb_Trace_EndRange,jfreereport_sac,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 062a727e04fe..ceafec548b1b 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,lcms2,\ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,lcms2,build): + $(call gb_Trace_StartRange,lcms2,EXTERNAL) $(call gb_ExternalProject_run,build,\ MSBuild.exe lcms2_DLL.vcxproj \ $(if $(filter 150,$(VCVER)),/p:PlatformToolset=v141 /p:VisualStudioVersion=15.0 /ToolsVersion:15.0) \ @@ -24,8 +25,10 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:TargetName=lcms2 \ ,Projects/VC2017/lcms2_DLL) + $(call gb_Trace_EndRange,lcms2,EXTERNAL) else $(call gb_ExternalProject_get_state_target,lcms2,build): + $(call gb_Trace_StartRange,lcms2,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure --without-jpeg --without-tiff --with-pic \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ @@ -41,5 +44,6 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): && cd src \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,lcms2,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk index 4f71a5739a3b..50e66fdb76ca 100644 --- a/external/libabw/ExternalProject_libabw.mk +++ b/external/libabw/ExternalProject_libabw.mk @@ -23,6 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libabw,\ )) $(call gb_ExternalProject_get_state_target,libabw,build) : + $(call gb_Trace_StartRange,libabw,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -40,5 +41,6 @@ $(call gb_ExternalProject_get_state_target,libabw,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libabw,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libassuan/ExternalProject_libassuan.mk b/external/libassuan/ExternalProject_libassuan.mk index 83d79a520988..565d38ff9a1c 100644 --- a/external/libassuan/ExternalProject_libassuan.mk +++ b/external/libassuan/ExternalProject_libassuan.mk @@ -23,6 +23,7 @@ ifeq ($(COM),MSC) gb_ExternalProject_libassuan_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) gb_ExternalProject_libassuan_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64) $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executable_get_target,cpp) + $(call gb_Trace_StartRange,libassuan,EXTERNAL) $(call gb_ExternalProject_run,build,\ autoreconf \ && ./configure \ @@ -38,8 +39,10 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(call gb_Executabl MAKE=$(MAKE) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libassuan,EXTERNAL) else $(call gb_ExternalProject_get_state_target,libassuan,build): + $(call gb_Trace_StartRange,libassuan,EXTERNAL) $(call gb_ExternalProject_run,build,\ autoreconf \ && ./configure \ @@ -58,6 +61,7 @@ $(call gb_ExternalProject_get_state_target,libassuan,build): $(EXTERNAL_WORKDIR)/src/.libs/libassuan.0.dylib \ ) \ ) + $(call gb_Trace_EndRange,libassuan,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/libatomic_ops/ExternalProject_libatomic_ops.mk b/external/libatomic_ops/ExternalProject_libatomic_ops.mk index 2bb31a4003d3..20cefa39b4fe 100644 --- a/external/libatomic_ops/ExternalProject_libatomic_ops.mk +++ b/external/libatomic_ops/ExternalProject_libatomic_ops.mk @@ -16,11 +16,13 @@ $(eval $(call gb_ExternalProject_register_targets,libatomic_ops,\ )) $(call gb_ExternalProject_get_state_target,libatomic_ops,build) : + $(call gb_Trace_StartRange,libatomic_ops,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" CXXFLAGS="$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))") \ ./configure \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libatomic_ops,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index 503307cf3488..b3e78f469cbf 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -24,6 +24,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ )) $(call gb_ExternalProject_get_state_target,libcdr,build) : + $(call gb_Trace_StartRange,libcdr,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -42,5 +43,6 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libcdr,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index bac09b699b12..8ee2c7293e11 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -25,6 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libebook,\ )) $(call gb_ExternalProject_get_state_target,libebook,build) : + $(call gb_Trace_StartRange,libebook,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -47,5 +48,6 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libebook,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libeot/ExternalProject_libeot.mk b/external/libeot/ExternalProject_libeot.mk index e40186e9e849..75e8054a0a4c 100644 --- a/external/libeot/ExternalProject_libeot.mk +++ b/external/libeot/ExternalProject_libeot.mk @@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,libeot,\ )) $(call gb_ExternalProject_get_state_target,libeot,build) : + $(call gb_Trace_StartRange,libeot,EXTERNAL) $(call gb_ExternalProject_run,build,\ touch Makefile.in \ && export PKG_CONFIG="" \ @@ -25,5 +26,6 @@ $(call gb_ExternalProject_get_state_target,libeot,build) : CFLAGS='$(filter-out -std=gnu89,$(CFLAGS))' \ && $(MAKE) $(if $(verbose),V=1) \ ) + $(call gb_Trace_EndRange,libeot,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libepubgen/ExternalProject_libepubgen.mk b/external/libepubgen/ExternalProject_libepubgen.mk index 772a41daa2e4..54a9a3d68bdc 100644 --- a/external/libepubgen/ExternalProject_libepubgen.mk +++ b/external/libepubgen/ExternalProject_libepubgen.mk @@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,libepubgen,\ )) $(call gb_ExternalProject_get_state_target,libepubgen,build) : + $(call gb_Trace_StartRange,libepubgen,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -36,5 +37,6 @@ $(call gb_ExternalProject_get_state_target,libepubgen,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libepubgen,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 4eaa90bd99c3..0eabfe5f4ffb 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -26,6 +26,7 @@ $(eval $(call gb_ExternalProject_use_externals,libetonyek,\ )) $(call gb_ExternalProject_get_state_target,libetonyek,build) : + $(call gb_Trace_StartRange,libetonyek,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -61,5 +62,6 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : $(EXTERNAL_WORKDIR)/src/lib/.libs/libetonyek-0.1.1.dylib \ ) \ ) + $(call gb_Trace_EndRange,libetonyek,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libexttextcat/ExternalProject_libexttextcat.mk b/external/libexttextcat/ExternalProject_libexttextcat.mk index 842b369f2fee..1d729a103b33 100644 --- a/external/libexttextcat/ExternalProject_libexttextcat.mk +++ b/external/libexttextcat/ExternalProject_libexttextcat.mk @@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,libexttextcat,\ )) $(call gb_ExternalProject_get_state_target,libexttextcat,build): + $(call gb_Trace_StartRange,libexttextcat,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure --disable-shared --with-pic \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ @@ -24,5 +25,6 @@ $(call gb_ExternalProject_get_state_target,libexttextcat,build): $(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libexttextcat,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libffi/ExternalProject_libffi.mk b/external/libffi/ExternalProject_libffi.mk index bdf8fe61eb76..13a4b18db13d 100644 --- a/external/libffi/ExternalProject_libffi.mk +++ b/external/libffi/ExternalProject_libffi.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libffi,\ # set prefix so that it ends up in libffi.pc so that pkg-config in python3 works $(call gb_ExternalProject_get_state_target,libffi,build): + $(call gb_Trace_StartRange,libffi,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure \ --enable-option-checking=fatal \ @@ -29,5 +30,6 @@ $(call gb_ExternalProject_get_state_target,libffi,build): --disable-docs \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libffi,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk index 095ba47d6719..be3a478485aa 100644 --- a/external/libfreehand/ExternalProject_libfreehand.mk +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -24,6 +24,7 @@ $(eval $(call gb_ExternalProject_use_externals,libfreehand,\ )) $(call gb_ExternalProject_get_state_target,libfreehand,build) : + $(call gb_Trace_StartRange,libfreehand,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -42,5 +43,6 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libfreehand,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/ExternalProject_libgpg-error.mk b/external/libgpg-error/ExternalProject_libgpg-error.mk index 1fcd63180e20..cf0b594dca24 100644 --- a/external/libgpg-error/ExternalProject_libgpg-error.mk +++ b/external/libgpg-error/ExternalProject_libgpg-error.mk @@ -19,6 +19,7 @@ ifeq ($(COM),MSC) gb_ExternalProject_libgpg-error_host := $(if $(filter INTEL,$(CPUNAME)),i686-mingw32,x86_64-w64-mingw32) gb_ExternalProject_libgpg-error_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64) $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Executable_get_target,cpp) + $(call gb_Trace_StartRange,libgpg-error,EXTERNAL) $(call gb_ExternalProject_run,build,\ MAKE=$(MAKE) ./configure \ --enable-static \ @@ -31,8 +32,10 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(call gb_Execut RC='windres -O COFF --target=$(gb_ExternalProject_libgpg-error_target) --preprocessor='\''$(call gb_Executable_get_target,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libgpg-error,EXTERNAL) else $(call gb_ExternalProject_get_state_target,libgpg-error,build): + $(call gb_Trace_StartRange,libgpg-error,EXTERNAL) $(call gb_ExternalProject_run,build,\ MAKE=$(MAKE) ./configure \ --disable-rpath \ @@ -45,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,libgpg-error,build): $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libgpg-error,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk index 829d3dc0f53b..a6c8f0d77a2f 100644 --- a/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk +++ b/external/libjpeg-turbo/ExternalProject_libjpeg-turbo.mk @@ -18,11 +18,14 @@ $(eval $(call gb_ExternalProject_register_targets,libjpeg-turbo,\ )) $(call gb_ExternalProject_get_state_target,libjpeg-turbo,build) : $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) + $(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL) +$(call gb_ExternalProject_run,build,\ $(MAKE) \ ) + $(call gb_Trace_EndRange,libjpeg-turbo,EXTERNAL) $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) : + $(call gb_Trace_StartRange,libjpeg-turbo,EXTERNAL) $(call gb_ExternalProject_run,configure,\ MAKE=$(MAKE) ./configure \ --build=$(if $(filter WNT,$(OS)),$(if $(filter INTEL,$(CPUNAME)),i686-pc-cygwin,x86_64-pc-cygwin),$(BUILD_PLATFORM)) \ @@ -35,5 +38,6 @@ $(call gb_ExternalProject_get_state_target,libjpeg-turbo,configure) : $(if $(NASM),,--without-simd) \ CFLAGS='$(if $(debug),$(gb_DEBUGINFO_FLAGS)) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(CFLAGS) $(gb_VISIBILITY_FLAGS)' \ ) + $(call gb_Trace_EndRange,libjpeg-turbo,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/liblangtag/ExternalProject_liblangtag.mk b/external/liblangtag/ExternalProject_liblangtag.mk index 3fb5618f7fc1..060c6f3601a8 100644 --- a/external/liblangtag/ExternalProject_liblangtag.mk +++ b/external/liblangtag/ExternalProject_liblangtag.mk @@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,liblangtag,\ # liblangtag uses (-DBUILDDIR="\"$(abs_top_builddir)\"" and similar). # Results in "cl : Command line error D8003 : missing source filename" $(call gb_ExternalProject_get_state_target,liblangtag,build): + $(call gb_Trace_StartRange,liblangtrag,EXTERNAL) $(call gb_ExternalProject_run,build,\ MAKE=$(MAKE) ./configure --disable-modules --disable-test --disable-introspection --with-pic \ $(if $(or $(DISABLE_DYNLOADING),$(filter MSC,$(COM))), \ @@ -49,4 +50,6 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build): $(EXTERNAL_WORKDIR)/liblangtag/.libs/liblangtag.1.dylib \ ) \ ) + $(call gb_Trace_EndRange,liblangtrag,EXTERNAL) + # vim: set noet sw=4 ts=4: diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index 271aaf78e4d3..21121f091279 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -23,6 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\ )) $(call gb_ExternalProject_get_state_target,libmspub,build) : + $(call gb_Trace_StartRange,libmspub,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -40,5 +41,6 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libmspub,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk index a30af23e9bed..067de69002bd 100644 --- a/external/libmwaw/ExternalProject_libmwaw.mk +++ b/external/libmwaw/ExternalProject_libmwaw.mk @@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmwaw,\ )) $(call gb_ExternalProject_get_state_target,libmwaw,build) : + $(call gb_Trace_StartRange,libmwaw,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && ./configure \ @@ -48,5 +49,6 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : $(EXTERNAL_WORKDIR)/src/lib/.libs/libmwaw-0.3.3.dylib \ ) \ ) + $(call gb_Trace_EndRange,libmwaw,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libnumbertext/ExternalProject_libnumbertext.mk b/external/libnumbertext/ExternalProject_libnumbertext.mk index c2bdaeebfba9..f4dbe5f655c3 100644 --- a/external/libnumbertext/ExternalProject_libnumbertext.mk +++ b/external/libnumbertext/ExternalProject_libnumbertext.mk @@ -25,6 +25,7 @@ endif endif $(call gb_ExternalProject_get_state_target,libnumbertext,build): + $(call gb_Trace_StartRange,libnumbertext,EXTERNAL) $(call gb_ExternalProject_run,build,\ LIBS="$(gb_STDLIBS) $(LIBS)" \ $(SHELL) ./configure --disable-shared --with-pic \ @@ -36,5 +37,6 @@ $(call gb_ExternalProject_get_state_target,libnumbertext,build): CXXFLAGS="$(libnumbertext_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \ && cd src && $(MAKE) \ ) + $(call gb_Trace_EndRange,libnumbertext,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index c02b4f532d65..679598542b30 100644 --- a/external/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libodfgen,\ )) $(call gb_ExternalProject_get_state_target,libodfgen,build) : + $(call gb_Trace_StartRange,libodfgen,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && ./configure \ @@ -48,5 +49,6 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : $(EXTERNAL_WORKDIR)/src/.libs/libodfgen-0.1.1.dylib \ ) \ ) + $(call gb_Trace_EndRange,libodfgen,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 0bd36c379d9b..38658cc81908 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -91,6 +91,7 @@ endif endif $(call gb_ExternalProject_get_state_target,liborcus,build) : + $(call gb_Trace_StartRange,liborcus,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(if $(liborcus_LIBS),LIBS='$(liborcus_LIBS)') \ $(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \ @@ -126,5 +127,6 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.15.0.dylib \ ) \ ) + $(call gb_Trace_EndRange,liborcus,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libpagemaker/ExternalProject_libpagemaker.mk b/external/libpagemaker/ExternalProject_libpagemaker.mk index 91e494402cc1..34254b872713 100644 --- a/external/libpagemaker/ExternalProject_libpagemaker.mk +++ b/external/libpagemaker/ExternalProject_libpagemaker.mk @@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,libpagemaker,\ )) $(call gb_ExternalProject_get_state_target,libpagemaker,build) : + $(call gb_Trace_StartRange,libpagemaker,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -38,5 +39,6 @@ $(call gb_ExternalProject_get_state_target,libpagemaker,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libpagemaker,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libqxp/ExternalProject_libqxp.mk b/external/libqxp/ExternalProject_libqxp.mk index 04a34b57e4be..f1b63f6bfa38 100644 --- a/external/libqxp/ExternalProject_libqxp.mk +++ b/external/libqxp/ExternalProject_libqxp.mk @@ -22,6 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libqxp,\ )) $(call gb_ExternalProject_get_state_target,libqxp,build) : + $(call gb_Trace_StartRange,libqxp,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -41,5 +42,6 @@ $(call gb_ExternalProject_get_state_target,libqxp,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libqxp,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk index 9575f50e3b27..7c3e36761e22 100644 --- a/external/librevenge/ExternalProject_librevenge.mk +++ b/external/librevenge/ExternalProject_librevenge.mk @@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,librevenge,\ )) $(call gb_ExternalProject_get_state_target,librevenge,build) : + $(call gb_Trace_StartRange,librevenge,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && ./configure \ @@ -44,5 +45,6 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) : $(EXTERNAL_WORKDIR)/src/lib/.libs/librevenge-0.0.0.dylib \ ) \ ) + $(call gb_Trace_EndRange,librevenge,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libstaroffice/ExternalProject_libstaroffice.mk b/external/libstaroffice/ExternalProject_libstaroffice.mk index 3f6c19e2879f..8aad471e5d24 100644 --- a/external/libstaroffice/ExternalProject_libstaroffice.mk +++ b/external/libstaroffice/ExternalProject_libstaroffice.mk @@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_use_externals,libstaroffice,\ )) $(call gb_ExternalProject_get_state_target,libstaroffice,build) : + $(call gb_Trace_StartRange,libstaroffice,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && ./configure \ @@ -48,5 +49,6 @@ $(call gb_ExternalProject_get_state_target,libstaroffice,build) : $(EXTERNAL_WORKDIR)/src/lib/.libs/libstaroffice-0.0.0.dylib \ ) \ ) + $(call gb_Trace_EndRange,libstaroffice,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libtommath/ExternalProject_libtommath.mk b/external/libtommath/ExternalProject_libtommath.mk index f534e62a126d..ba2089eb82a5 100644 --- a/external/libtommath/ExternalProject_libtommath.mk +++ b/external/libtommath/ExternalProject_libtommath.mk @@ -17,11 +17,14 @@ $(eval $(call gb_ExternalProject_use_nmake,libtommath,build)) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,libtommath,build): + $(call gb_Trace_StartRange,libtommath,EXTERNAL) $(call gb_ExternalProject_run,build,\ nmake -nologo -f makefile.msvc \ ) + $(call gb_Trace_EndRange,libtommath,EXTERNAL) else $(call gb_ExternalProject_get_state_target,libtommath,build) : + $(call gb_Trace_StartRange,libtommath,EXTERNAL) $(call gb_ExternalProject_run,build,\ unset MAKEFLAGS \ && export CFLAGS=" \ @@ -29,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,libtommath,build) : " \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libtommath,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk index 8f34290a8e6e..0911fcd87c7c 100644 --- a/external/libvisio/ExternalProject_libvisio.mk +++ b/external/libvisio/ExternalProject_libvisio.mk @@ -23,6 +23,7 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\ )) $(call gb_ExternalProject_get_state_target,libvisio,build) : + $(call gb_Trace_StartRange,libvisio,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -41,5 +42,6 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libvisio,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index ddb8c2cd0147..c3b810c6acd7 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwpd,\ )) $(call gb_ExternalProject_get_state_target,libwpd,build) : + $(call gb_Trace_StartRange,libwpd,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -47,5 +48,6 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : $(EXTERNAL_WORKDIR)/src/lib/.libs/libwpd-0.10.10.dylib \ ) \ ) + $(call gb_Trace_EndRange,libwpd,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk index 2d2bc08aa126..01f31c55d771 100644 --- a/external/libwpg/ExternalProject_libwpg.mk +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_externals,libwpg,\ )) $(call gb_ExternalProject_get_state_target,libwpg,build) : + $(call gb_Trace_StartRange,libwpg,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -45,5 +46,6 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : $(EXTERNAL_WORKDIR)/src/lib/.libs/libwpg-0.3.3.dylib \ ) \ ) + $(call gb_Trace_EndRange,libwpg,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk index bb8a5d977b6e..a7c37aeddf7e 100644 --- a/external/libwps/ExternalProject_libwps.mk +++ b/external/libwps/ExternalProject_libwps.mk @@ -43,6 +43,7 @@ endif endif $(call gb_ExternalProject_get_state_target,libwps,build) : + $(call gb_Trace_StartRange,libwps,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && ./configure \ @@ -69,5 +70,6 @@ $(call gb_ExternalProject_get_state_target,libwps,build) : $(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.4.4.dylib \ ) \ ) + $(call gb_Trace_EndRange,libwps,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/libxml2/ExternalProject_libxml2.mk b/external/libxml2/ExternalProject_libxml2.mk index 0d8559dfb04f..778befade47f 100644 --- a/external/libxml2/ExternalProject_libxml2.mk +++ b/external/libxml2/ExternalProject_libxml2.mk @@ -19,14 +19,17 @@ $(call gb_ExternalProject_use_external_project,libxml2,icu) $(eval $(call gb_ExternalProject_use_nmake,libxml2,build)) $(call gb_ExternalProject_get_state_target,libxml2,build): + $(call gb_Trace_StartRange,libxml2,EXTERNAL) $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js \ iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \ $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ && nmake \ ,win32) + $(call gb_Trace_EndRange,libxml2,EXTERNAL) else # OS!=WNT $(call gb_ExternalProject_get_state_target,libxml2,build): + $(call gb_Trace_StartRange,libxml2,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure --disable-ipv6 --without-python --without-zlib --with-sax1 \ --without-lzma \ @@ -38,6 +41,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build): $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libxml2,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/libxslt/ExternalProject_libxslt.mk b/external/libxslt/ExternalProject_libxslt.mk index 16cc2a8b0d65..0602c320ea7d 100644 --- a/external/libxslt/ExternalProject_libxslt.mk +++ b/external/libxslt/ExternalProject_libxslt.mk @@ -18,6 +18,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_ExternalProject_use_nmake,libxslt,build)) $(call gb_ExternalProject_get_state_target,libxslt,build): + $(call gb_Trace_StartRange,libxslt,EXTERNAL) $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js \ $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ @@ -26,8 +27,10 @@ $(call gb_ExternalProject_get_state_target,libxslt,build): lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ && nmake \ ,win32) + $(call gb_Trace_EndRange,libxslt,EXTERNAL) else # OS!=WNT $(call gb_ExternalProject_get_state_target,libxslt,build): + $(call gb_Trace_StartRange,libxslt,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure --without-crypto --without-python \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ @@ -46,6 +49,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build): $(EXTERNAL_WORKDIR)/libxslt/.libs/libxslt.1.dylib \ ) \ ) + $(call gb_Trace_EndRange,libxslt,EXTERNAL) endif # vim: set noet sw=4 ts=4: diff --git a/external/libzmf/ExternalProject_libzmf.mk b/external/libzmf/ExternalProject_libzmf.mk index bb7d151c091c..c6593899f2c0 100644 --- a/external/libzmf/ExternalProject_libzmf.mk +++ b/external/libzmf/ExternalProject_libzmf.mk @@ -24,6 +24,7 @@ $(eval $(call gb_ExternalProject_use_externals,libzmf,\ )) $(call gb_ExternalProject_get_state_target,libzmf,build) : + $(call gb_Trace_StartRange,libzmf,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && MAKE=$(MAKE) ./configure \ @@ -42,5 +43,6 @@ $(call gb_ExternalProject_get_state_target,libzmf,build) : $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,libzmf,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/lpsolve/ExternalProject_lpsolve.mk b/external/lpsolve/ExternalProject_lpsolve.mk index 37a5b7ac4a6e..b23dddf47a29 100644 --- a/external/lpsolve/ExternalProject_lpsolve.mk +++ b/external/lpsolve/ExternalProject_lpsolve.mk @@ -15,12 +15,15 @@ $(eval $(call gb_ExternalProject_register_targets,lpsolve,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,lpsolve,build): + $(call gb_Trace_StartRange,lpsolve,EXTERNAL) $(call gb_ExternalProject_run,build,\ LIB="$(ILIB)" RUNTIME_FLAG="$(if $(MSVC_USE_DEBUG_RUNTIME),/MDd,/MD)" \ cmd /c cvc6.bat \ ,lpsolve55) + $(call gb_Trace_EndRange,lpsolve,EXTERNAL) else # $(OS)!=WNT $(call gb_ExternalProject_get_state_target,lpsolve,build): + $(call gb_Trace_StartRange,lpsolve,EXTERNAL) $(call gb_ExternalProject_run,build,\ CC="$(CC) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) $(if $(debug),$(gb_DEBUGINFO_FLAGS))" \ $(if $(filter MACOSX,$(OS)),EXTRA_LINKFLAGS='-install_name @__________________________________________________OOO/liblpsolve55.dylib') \ @@ -29,5 +32,6 @@ $(call gb_ExternalProject_get_state_target,lpsolve,build): $(if $(filter AIXGCC,$(OS)$(COM)),ccc.aix.gcc, \ ccc))) \ ,lpsolve55) + $(call gb_Trace_EndRange,lpsolve,EXTERNAL) endif # $(OS) # vim: set noet sw=4 ts=4: diff --git a/external/lxml/ExternalProject_lxml.mk b/external/lxml/ExternalProject_lxml.mk index aaadbd0a6974..371db12e1c8d 100644 --- a/external/lxml/ExternalProject_lxml.mk +++ b/external/lxml/ExternalProject_lxml.mk @@ -21,7 +21,8 @@ $(eval $(call gb_ExternalProject_register_targets,lxml,\ lxml_PYTHON := $(call gb_ExternalExecutable_get_command,python) $(call gb_ExternalProject_get_state_target,lxml,build): \ - $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_Trace_StartRange,lxml,EXTERNAL) $(call gb_ExternalProject_run,build,\ PYPATH=$${PYPATH:+$$PYPATH:}$(call gb_UnpackedTarball_get_dir,lxml)/install && \ $(if $(PYTHON_FOR_BUILD), \ @@ -39,5 +40,6 @@ $(call gb_ExternalProject_get_state_target,lxml,build): \ $(lxml_PYTHON) setup.py install \ --install-lib install \ ) + $(call gb_Trace_EndRange,lxml,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/mythes/ExternalProject_mythes.mk b/external/mythes/ExternalProject_mythes.mk index 13ebb0aacc40..b352e9b594d3 100644 --- a/external/mythes/ExternalProject_mythes.mk +++ b/external/mythes/ExternalProject_mythes.mk @@ -16,10 +16,12 @@ $(eval $(call gb_ExternalProject_register_targets,mythes,\ )) $(call gb_ExternalProject_get_state_target,mythes,build): + $(call gb_Trace_StartRange,mythes,EXTERNAL) $(call gb_ExternalProject_run,build,\ LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,mythes,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 57b0c961c611..acf418805772 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -17,6 +17,7 @@ $(eval $(call gb_ExternalProject_register_targets,nss,\ ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_Trace_StartRange,nss,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \ $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \ @@ -31,11 +32,13 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ NSS_DISABLE_GTESTS=1 \ ,nss) + $(call gb_Trace_EndRange,nss,EXTERNAL) else # OS!=WNT # make sure to specify NSPR_CONFIGURE_OPTS as env (before make command), so nss can append it's own defaults # OTOH specify e.g. CC and NSINSTALL as arguments (after make command), so they will overrule nss makefile values $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_Trace_StartRange,nss,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \ $(if $(filter ANDROID,$(OS)),$(if $(filter AARCH64,$(CPUNAME)),USE_64=1)) \ @@ -76,6 +79,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta $(EXTERNAL_WORKDIR)/dist/out/lib/libsoftokn3.dylib \ $(EXTERNAL_WORKDIR)/dist/out/lib/libssl3.dylib) \ ,nss) + $(call gb_Trace_EndRange,nss,EXTERNAL) endif diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk index 0c7aaa6ae17d..46e9168f5a91 100644 --- a/external/openldap/ExternalProject_openldap.mk +++ b/external/openldap/ExternalProject_openldap.mk @@ -27,6 +27,7 @@ openldap_LDFLAGS += -pthread endif $(call gb_ExternalProject_get_state_target,openldap,build) : + $(call gb_Trace_StartRange,openldap,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure \ --disable-slapd \ @@ -49,6 +50,7 @@ $(call gb_ExternalProject_get_state_target,openldap,build) : $(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS)") \ && MAKEFLAGS= && $(MAKE) \ ) + $(call gb_Trace_EndRange,openldap,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 5f5fb42c5eef..c35b1b24bd0f 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -58,6 +58,7 @@ ifeq ($(COM),MSC) $(eval $(call gb_ExternalProject_use_nmake,openssl,build)) $(call gb_ExternalProject_get_state_target,openssl,build): + $(call gb_Trace_StartRange,openssl,EXTERNAL) $(call gb_ExternalProject_run,build,\ export PERL="$(shell cygpath -w $(PERL))" \ && $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ @@ -65,9 +66,11 @@ $(call gb_ExternalProject_get_state_target,openssl,build): && nmake -f "ms\ntdll.mak" \ && mv inc32/* include/ \ ) + $(call gb_Trace_EndRange,openssl,EXTERNAL) else $(call gb_ExternalProject_get_state_target,openssl,build): + $(call gb_Trace_StartRange,openssl,EXTERNAL) $(call gb_ExternalProject_run,build,\ unset MAKEFLAGS && \ $(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS iOS,$(OS)), \ @@ -86,6 +89,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): $(if $(filter-out WNT MACOSX,$(OS)),-fvisibility=hidden)" \ && ln -s . lib \ ) + $(call gb_Trace_EndRange,openssl,EXTERNAL) # symlink lib dir for python3 endif diff --git a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk index a9d7591c1190..149becee9209 100644 --- a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk +++ b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk @@ -14,8 +14,10 @@ $(eval $(call gb_ExternalProject_register_targets,owncloud_android_lib,\ )) $(call gb_ExternalProject_get_state_target,owncloud_android_lib,build) : + $(call gb_Trace_StartRange,owncloud_android_lib,EXTERNAL) $(call gb_ExternalProject_run,build,\ ANDROID_HOME=$(ANDROID_SDK_HOME) $(SRCDIR)/android/source/gradlew assemble \ ) + $(call gb_Trace_EndRange,owncloud_android_lib,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index ba462a34a1a1..c437bb29a0a0 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -24,9 +24,11 @@ ifeq ($(OS),WNT) $(eval $(call gb_ExternalProject_use_nmake,postgresql,build)) $(call gb_ExternalProject_get_state_target,postgresql,build) : + $(call gb_Trace_StartRange,postgresql,EXTERNAL) $(call gb_ExternalProject_run,build,\ nmake -f win32.mak USE_SSL=1 USE_LDAP=1 \ ,src) + $(call gb_Trace_EndRange,postgresql,EXTERNAL) else @@ -57,6 +59,7 @@ endif $(call gb_ExternalProject_get_state_target,postgresql,build) : + $(call gb_Trace_StartRange,postgresql,EXTERNAL) $(call gb_ExternalProject_run,build,\ ./configure \ --without-readline --disable-shared --with-ldap \ @@ -70,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) : $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \ && cd src/interfaces/libpq \ && MAKEFLAGS= && $(MAKE) all-static-lib) + $(call gb_Trace_EndRange,postgresql,EXTERNAL) endif diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 6c958431cd97..65023da61756 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -33,6 +33,7 @@ ifeq ($(OS),WNT) # at least for MSVC 2008 it is necessary to clear MAKEFLAGS because # nmake is invoked $(call gb_ExternalProject_get_state_target,python3,build) : + $(call gb_Trace_StartRange,python3,EXTERNAL) $(call gb_ExternalProject_run,build,\ MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ @@ -45,6 +46,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(filter 160,$(VCVER)),/p:PlatformToolset=v142 /p:VisualStudioVersion=16.0 /ToolsVersion:Current) \ $(if $(filter 10,$(WINDOWS_SDK_VERSION)),/p:WindowsTargetPlatformVersion=$(UCRTVERSION)) \ ,PCBuild) + $(call gb_Trace_EndRange,python3,EXTERNAL) else @@ -69,6 +71,7 @@ ifneq (,$(ENABLE_VALGRIND)) endif $(call gb_ExternalProject_get_state_target,python3,build) : + $(call gb_Trace_StartRange,python3,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(if $(filter MACOSX,$(OS)), \ $(if $(filter 10.8 10.9 10.10 10.11,$(MACOSX_DEPLOYMENT_TARGET)), \ @@ -117,6 +120,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(SYSTEM_ZLIB),,ZLIB_INCDIR=$(WORKDIR)/UnpackedTarball/zlib) \ && ln -s build/lib.* LO_lib \ ) + $(call gb_Trace_EndRange,python3,EXTERNAL) endif diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk index 4309df17b246..4bc91c375b85 100644 --- a/external/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,raptor,\ )) $(call gb_ExternalProject_get_state_target,raptor,build): + $(call gb_Trace_StartRange,raptor,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(if $(filter iOS,$(OS)),LIBS="-liconv") \ CFLAGS="$(CFLAGS) $(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \ @@ -39,5 +40,6 @@ $(call gb_ExternalProject_get_state_target,raptor,build): $(if $(SYSTEM_LIBXML),$(if $(filter-out MACOSX,$(OS)),--without-xml2-config),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,raptor,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk index 92e7adce08ff..0e765e098eb9 100644 --- a/external/redland/ExternalProject_rasqal.mk +++ b/external/redland/ExternalProject_rasqal.mk @@ -20,6 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\ # note: this can intentionally only build against internal raptor (not system) $(call gb_ExternalProject_get_state_target,rasqal,build): + $(call gb_Trace_StartRange,rasqal,EXTERNAL) $(call gb_ExternalProject_run,build,\ CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ LDFLAGS=" \ @@ -48,5 +49,6 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ $(EXTERNAL_WORKDIR)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \ ) + $(call gb_Trace_EndRange,rasqal,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk index 166b31cfe08a..f6101f0d288e 100644 --- a/external/redland/ExternalProject_redland.mk +++ b/external/redland/ExternalProject_redland.mk @@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\ # note: this can intentionally only build against internal raptor/rasqal $(call gb_ExternalProject_get_state_target,redland,build): + $(call gb_Trace_StartRange,redland,EXTERNAL) $(call gb_ExternalProject_run,build,\ CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ LDFLAGS=" \ @@ -51,5 +52,6 @@ $(call gb_ExternalProject_get_state_target,redland,build): $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ $(EXTERNAL_WORKDIR)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \ ) + $(call gb_Trace_EndRange,redland,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/rhino/ExternalProject_rhino.mk b/external/rhino/ExternalProject_rhino.mk index 133b04f89e22..4d1b3e54409c 100644 --- a/external/rhino/ExternalProject_rhino.mk +++ b/external/rhino/ExternalProject_rhino.mk @@ -14,6 +14,7 @@ $(eval $(call gb_ExternalProject_register_targets,rhino,\ )) $(call gb_ExternalProject_get_state_target,rhino,build) : + $(call gb_Trace_StartRange,rhino,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ @@ -25,5 +26,6 @@ $(call gb_ExternalProject_get_state_target,rhino,build) : $(if $(debug),-Dbuild.debug="on") \ jar \ ) + $(call gb_Trace_EndRange,rhino,EXTERNAL) # vim: set noet sw=4 ts=4: diff --git a/external/serf/ExternalProject_serf.mk b/external/serf/ExternalProject_serf.mk index afa2018a73fa..043045654956 100644 --- a/external/serf/ExternalProject_serf.mk +++ b/external/serf/ExternalProject_serf.mk @@ -21,6 +21,7 @@ $(eval $(call gb_ExternalProject_use_nmake,serf,build)) ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,serf,build): + $(call gb_Trace_StartRange,serf,EXTERNAL) $(call gb_ExternalProject_run,build,\ APR_SRC="..\apr" \ APRUTIL_SRC="..\apr_util" \ @@ -29,10 +30,12 @@ $(call gb_ExternalProject_get_state_target,serf,build): nmake -nologo -f serf.mak \ $(if $(MSVC_USE_DEBUG_RUNTIME),DEBUG_BUILD=T Debug,Release)/serf-1.lib \ ) + $(call gb_Trace_EndRange,serf,EXTERNAL) else # serf is using SERF_LIBS variable, so pass it empty $(call gb_ExternalProject_get_state_target,serf,build): + $(call gb_Trace_StartRange,serf,EXTERNAL) +$(call gb_ExternalProject_run,build,\ ./configure SERF_LIBS= \ --enable-option-checking=fatal \ @@ -42,6 +45,7 @@ $(call gb_ExternalProject_get_state_target,serf,build): $(if $(SYSTEM_OPENSSL),,--with-openssl=$(call gb_UnpackedTarball_get_dir,openssl)) \ && $(MAKE) libserf-1.la \ ) + $(call gb_Trace_EndRange,serf,EXTERNAL) endif diff --git a/external/xmlsec/ExternalProject_xmlsec.mk b/external/xmlsec/ExternalProject_xmlsec.mk index 9e8cb75f0a68..aca7a2072057 100644 --- a/external/xmlsec/ExternalProject_xmlsec.mk +++ b/external/xmlsec/ExternalProject_xmlsec.mk @@ -22,6 +22,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_ExternalProject_use_nmake,xmlsec,build)) $(call gb_ExternalProject_get_state_target,xmlsec,build) : + $(call gb_Trace_StartRange,xmlsec,EXTERNAL) $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js crypto=mscng xslt=no iconv=no static=no \ lib=$(call gb_UnpackedTarball_get_dir,libxml2)/win32/bin.msvc \ @@ -29,10 +30,12 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : cflags="-arch:SSE $(SOLARINC) -I$(WORKDIR)/UnpackedTarball/libxml2/include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common" \ && nmake \ ,win32) + $(call gb_Trace_EndRange,xmlsec,EXTERNAL) else $(call gb_ExternalProject_get_state_target,xmlsec,build) : + $(call gb_Trace_StartRange,xmlsec,EXTERNAL) $(call gb_ExternalProject_run,build,\ $(if $(filter iOS MACOSX,$(OS)),ACLOCAL="aclocal -I $(SRCDIR)/m4/mac") \ $(if $(filter AIX,$(OS)),ACLOCAL="aclocal -I /opt/freeware/share/aclocal") \ @@ -51,6 +54,7 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : LDFLAGS="-L$(SYSBASE)/usr/lib $(if $(filter-out LINUX FREEBSD,$(OS)),",-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN)) \ && $(MAKE) \ ) + $(call gb_Trace_EndRange,xmlsec,EXTERNAL) endif 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) \ diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 97023325c94e..78984c60d8be 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -36,6 +36,7 @@ filter_XcuFilterTypesTarget_get_clean_target = \ $(call gb_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),FIT,1) + $(call gb_Trace_StartRange,$*,FIT) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ @@ -46,6 +47,7 @@ $(call gb_XcuFilterTypesTarget_get_target,%) : $(filter_MERGE_TARGET) fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \ outdir=$(dir $@) pkg=$@ xmlpackage=Types tcfg=$${RESPONSEFILE} && \ rm -f $${RESPONSEFILE}) + $(call gb_Trace_EndRange,$*,FIT) $(call filter_XcuFilterTypesTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),FIT,1) @@ -77,6 +79,7 @@ filter_XcuFilterFiltersTarget_get_clean_target = \ $(call gb_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),FIF,1) + $(call gb_Trace_StartRange,$*,FIF) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ @@ -87,6 +90,7 @@ $(call gb_XcuFilterFiltersTarget_get_target,%) : $(filter_MERGE_TARGET) fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \ outdir=$(dir $@) pkg=$@ xmlpackage=Filter fcfg=$${RESPONSEFILE} && \ rm -f $${RESPONSEFILE}) + $(call gb_Trace_EndRange,$*,FIF) $(call filter_XcuFilterFiltersTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),FIF,1) @@ -108,6 +112,7 @@ filter_XcuFilterOthersTarget_get_clean_target = \ $(call gb_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),FIO,1) + $(call gb_Trace_StartRange,$*,FIO) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ @@ -122,6 +127,7 @@ $(call gb_XcuFilterOthersTarget_get_target,%) : $(filter_MERGE_TARGET) outdir=$(dir $@) pkg=$@ xmlpackage=Misc \ lcfg=$${RESPONSEFILE} ccfg=$${RESPONSEFILE2} && \ rm -f $${RESPONSEFILE} $${RESPONSEFILE2}) + $(call gb_Trace_EndRange,$*,FIO) $(call filter_XcuFilterOthersTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),FIO,1) @@ -142,6 +148,7 @@ filter_XcuFilterInternalTarget_get_clean_target = \ $(call gb_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$*,$(true),FII,1) + $(call gb_Trace_StartRange,$*,FII) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ @@ -153,6 +160,7 @@ $(call gb_XcuFilterInternalTarget_get_target,%) : $(filter_MERGE_TARGET) outdir=$(dir $@) pkg=$@ xmlpackage=GraphicFilter \ fcfg=$${RESPONSEFILE} subdir_filters=internalgraphicfilters && \ rm -f $${RESPONSEFILE}) + $(call gb_Trace_EndRange,$*,FII) $(call filter_XcuFilterInternalTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),FII,1) @@ -188,6 +196,7 @@ filter_XcuResTarget_get_clean_target = \ $(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),FIU,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),FIU) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ @@ -198,6 +207,7 @@ $(filter_XcuFilterUiTarget) : $(filter_MERGE_TARGET) fragmentsdir=$(dir $(firstword $(filter %.xcu,$^))).. \ pkg=$@ xmlpackage=Filter fcfg=$${RESPONSEFILE} languagepack=true \ && rm -f $${RESPONSEFILE}) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),FIU) $(filter_XcuFilterUiCleanTarget) : $(call gb_Output_announce,$(filter_XcuFilterUiTarget),$(false),FIU,1) @@ -215,11 +225,13 @@ $$(call filter_XcuResTarget_get_target,$(1)) : \ $(filter_XSLT_langfilter) $(filter_XcuFilterUiTarget) \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $$(call gb_Output_announce,$(1),$(true),XCU,1) + $$(call gb_Trace_StartRange,$(1),XCU) $$(call gb_Helper_abbreviate_dirs,\ mkdir -p $$(dir $$@) && \ $(subst $$,$$$$,$(call gb_ExternalExecutable_get_command,xsltproc)) --nonet --stringparam lang $(1) \ $(filter_XSLT_langfilter) \ $(filter_XcuFilterUiTarget) > $$@) + $$(call gb_Trace_EndRange,$(1),XCU) endef diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk index 862dcebbd3f3..dee46a31f0b1 100644 --- a/i18npool/CustomTarget_breakiterator.mk +++ b/i18npool/CustomTarget_breakiterator.mk @@ -21,8 +21,10 @@ $(i18npool_BIDIR)/dict_%.data : \ $(call gb_Executable_get_runtime_dependencies,gendict) \ | $(i18npool_BIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC) $(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),DIC) else $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \ @@ -33,8 +35,10 @@ $(i18npool_BIDIR)/dict_%.cxx : \ $(call gb_Executable_get_runtime_dependencies,gendict) \ | $(i18npool_BIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC) $(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@)) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),DIC) endif @@ -68,6 +72,7 @@ $(i18npool_BIDIR)/OpenOffice_dat.c : $(SRCDIR)/i18npool/CustomTarget_breakiterat $(patsubst %.brk,$(i18npool_BIDIR)/%_brk.c,$(i18npool_BRKTXTS)) \ $(call gb_ExternalExecutable_get_dependencies,gencmn) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMN,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CMN) $(call gb_Helper_abbreviate_dirs,\ RESPONSEFILE=$(shell $(gb_MKTEMP)) && \ $(foreach brk,$(i18npool_BRKTXTS),echo '$(brk)' >> $${RESPONSEFILE} && ) \ @@ -77,19 +82,24 @@ $(i18npool_BIDIR)/OpenOffice_dat.c : $(SRCDIR)/i18npool/CustomTarget_breakiterat echo '#pragma warning( disable : 4229 )' >> $@ && \ echo '#endif' >> $@ && \ cat $(subst _dat,_tmp,$@) >> $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CMN) $(i18npool_BIDIR)/%_brk.c : $(i18npool_BIDIR)/%.brk $(call gb_ExternalExecutable_get_dependencies,genccode) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CCD,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CCD) $(call gb_Helper_abbreviate_dirs,\ $(call gb_ExternalExecutable_get_command,genccode) -n OpenOffice -d $(i18npool_BIDIR)/ $< \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CCD) $(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(call gb_ExternalExecutable_get_dependencies,genbrk) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),BRK) $(call gb_Helper_abbreviate_dirs,\ $(call gb_ExternalExecutable_get_command,genbrk) \ $(if $(SYSTEM_ICU),,-i $(call gb_UnpackedTarball_get_dir,icu)/source/data/out/tmp) \ -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),BRK) # fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4 # * Prepend set empty as of Unicode Version 6.1 / ICU 49, which bails out if used. diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index ccecfabb28f8..2e64e2043dce 100644 --- a/i18npool/CustomTarget_collator.mk +++ b/i18npool/CustomTarget_collator.mk @@ -55,13 +55,17 @@ $(i18npool_CODIR)/collator_%.cxx : \ $(call gb_Executable_get_runtime_dependencies,gencoll_rule) \ | $(i18npool_CODIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CLR) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,gencoll_rule) $< $@ $*) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CLR) $(i18npool_CODIR)/lrl_include.hxx : $(SRCDIR)/i18npool/CustomTarget_collator.mk \ $(SRCDIR)/i18npool/source/collator/data | $(i18npool_CODIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(i18npool_COTXTS), \ $(firstword $(subst _, ,$(txt)))))"' > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # vim: set noet sw=4 ts=4: diff --git a/i18npool/CustomTarget_indexentry.mk b/i18npool/CustomTarget_indexentry.mk index bec83aacf5e3..650e66f60eea 100644 --- a/i18npool/CustomTarget_indexentry.mk +++ b/i18npool/CustomTarget_indexentry.mk @@ -29,9 +29,11 @@ $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx : \ $(call gb_Executable_get_runtime_dependencies,genindex_data) \ | $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IND,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),IND) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,genindex_data) $< $@.tmp $* && \ sed 's/\(^.*get_\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),IND) # vim: set noet sw=4 ts=4: diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk index c03bbbc5f8be..348b360376ab 100644 --- a/i18npool/CustomTarget_localedata.mk +++ b/i18npool/CustomTarget_localedata.mk @@ -20,6 +20,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \ $(SRCDIR)/i18npool/source/localedata/data/$(1).xml \ $(call gb_Executable_get_runtime_dependencies,saxparser) $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),SAX,1) + $$(call gb_Trace_StartRange,$$(subst $(WORKDIR)/,,$$@),SAX) $$(call gb_Helper_abbreviate_dirs, \ $$(call gb_Helper_print_on_error, \ $$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \ @@ -27,6 +28,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser))) && \ sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \ rm $$@.tmp) + $$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),SAX) endef diff --git a/i18npool/CustomTarget_textconversion.mk b/i18npool/CustomTarget_textconversion.mk index 19dbf72524b7..d91906c4dc45 100644 --- a/i18npool/CustomTarget_textconversion.mk +++ b/i18npool/CustomTarget_textconversion.mk @@ -18,9 +18,11 @@ $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx : \ $(call gb_Executable_get_runtime_dependencies,genconv_dict) \ | $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CDC,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CDC) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,genconv_dict) $* $< $@.tmp && \ sed 's/\(^.*get\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \ rm $@.tmp) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CDC) # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index ab620d5844ed..b9991d208dd4 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -100,6 +100,7 @@ endef $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) rm -rf $(instsetoo_OUT) ifeq (TRUE,$(LIBO_TEST_INSTALL)) $(call instsetoo_native_install_command,openoffice,en-US,,,archive) @@ -130,6 +131,7 @@ ifneq (WNT,$(OS)) endif endif # LIBO_TEST_INSTALL touch $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) TIMESTAMPURL ?= "http://timestamp.globalsign.com/scripts/timestamp.dll" $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_signing.done: \ @@ -137,7 +139,9 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_signing.done: \ $(if $(filter ODK,$(BUILD_TYPE)),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done) \ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.done $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) touch $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done \ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done \ @@ -146,6 +150,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.done: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ -l $(subst .done,_log.txt,$@) \ $(if $(verbose),-v) \ @@ -155,9 +160,11 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ $(WORKDIR)/installation/$(PRODUCTNAME)/msi/install/*/*.msi \ && touch $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ -l $(subst .done,_log.txt,$@) \ $(if $(verbose),-v) \ @@ -167,9 +174,11 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signin -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ Helppack \ $(WORKDIR)/installation/$(PRODUCTNAME)_helppack/msi/install/*/*.msi \ && touch $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ -l $(subst .done,_log.txt,$@) \ $(if $(verbose),-v) \ @@ -179,5 +188,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.don -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ SDK \ $(WORKDIR)/installation/$(PRODUCTNAME)_SDK/msi/install/*/*.msi \ && touch $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 2c22c9a3445a..9757f435dc91 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -35,6 +35,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,bootstrap) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ( \ echo '[Bootstrap]' \ && echo 'InstallMode=<installmode>' \ @@ -43,9 +44,11 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \ && echo 'UserInstallation=$$ORIGIN/..') \ ) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ( \ echo '[Bootstrap]' \ && echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \ @@ -70,9 +73,11 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'URE_MORE_SERVICES=$${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_SERVICES} <$$ORIGIN/services>*' \ && echo 'URE_MORE_TYPES=<$$ORIGIN/types>* $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_TYPES}' \ ) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,louno) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ( \ echo '[Bootstrap]' \ && echo 'PKG_BundledUnoFile=$$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc' \ @@ -88,20 +93,25 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'UNO_USER_PACKAGES=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/uno_packages' \ && echo 'UNO_USER_PACKAGES_CACHE=$$UNO_USER_PACKAGES/cache' \ ) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ( \ echo '[Bootstrap]' \ && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \ ) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,setup) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ( \ echo '[Bootstrap]' \ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ ) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # for release-builds (building installers) adjust values in openoffice.lst.in # Added 'SecureUserConfig' flags to enable and safe user config files @@ -116,6 +126,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ # are installed, which are activated) - default is true $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ( \ echo '[Bootstrap]' \ && echo 'CrashDirectory=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/crash' \ @@ -138,9 +149,11 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'SecureUserConfigNumCopies=2' \ && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \ ) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ( \ echo '[Bootstrap]' \ && echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter MACOSX,$(OS)),/../../../Frameworks)' \ @@ -149,6 +162,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'UNO_TYPES=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/)types.rdb $${URE_MORE_TYPES}' \ && echo 'UNO_SERVICES=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/)services.rdb $${URE_MORE_SERVICES}' \ ) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) @@ -173,6 +187,7 @@ endef .PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) printf '[Version]\n' > $@ && \ printf 'AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US)\n' >> $@ && \ @@ -188,5 +203,6 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) else $(file > $@, $(call instsetoo_native_genversionini)) endif + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # vim: set noet sw=4 ts=4: diff --git a/ios/CustomTarget_iOS_link.mk b/ios/CustomTarget_iOS_link.mk index fc4d88ee8f0f..240f38d071b4 100644 --- a/ios/CustomTarget_iOS_link.mk +++ b/ios/CustomTarget_iOS_link.mk @@ -48,6 +48,7 @@ $(IOSOBJ): $(IOSSRC) $(call gb_CustomTarget_get_target,ios/iOS_setup) $(IOSKIT): $(IOSOBJ) $(IOSLIBS) $(call gb_Output_announce,iOS dylib,$(true),LNK,2) + $(call gb_Trace_StartRange,iOS dylib,LNK) $(gb_CC) -dynamiclib \ -Xlinker -rpath -Xlinker @executable_path/Frameworks \ -Xlinker -rpath -Xlinker @loader_path/Frameworks \ @@ -77,6 +78,7 @@ ifeq ($(origin IOS_CODEID),undefined) else codesign -s "$(IOS_CODEID)" $(IOSKIT) endif + $(call gb_Trace_EndRange,iOS dylib,LNK) #- clean ios ----------------------------------------------------------------- diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index ec6a2492cb47..914a2aacf4b7 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -33,7 +33,9 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h #- create directories -------------------------------------------------------- $(IOSDIRS): $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MKD,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MKD) mkdir -p $(IOSDIRS) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MKD) #- Generate resources -------------------------------------------------------- @@ -43,6 +45,8 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ $(IOSGEN) \ $(IOSDIRS) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),EN2,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),EN2) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),EN2) # generate native-code.h (used by LibreOffice.c) $(SRCDIR)/solenv/bin/native-code.py \ diff --git a/jvmfwk/CustomTarget_jreproperties.mk b/jvmfwk/CustomTarget_jreproperties.mk index 678163efa4d1..ac8f7c053373 100644 --- a/jvmfwk/CustomTarget_jreproperties.mk +++ b/jvmfwk/CustomTarget_jreproperties.mk @@ -15,7 +15,9 @@ $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/JREProperties.class : \ $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \ | $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JCS,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JCS) $(call gb_Helper_abbreviate_dirs, \ cd $(dir $@) && $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JCS) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk index 7dd4f19846ec..bd9621fd27e0 100644 --- a/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk +++ b/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk @@ -26,11 +26,13 @@ $(eval $(call gb_CustomTarget_register_targets,jvmfwk/jvmfwk3_ini, \ $(call gb_CustomTarget_get_workdir,jvmfwk/jvmfwk3_ini)/$(call gb_Helper_get_rcfile,jvmfwk3): \ $(SRCDIR)/jvmfwk/CustomTarget_jvmfwk_jvmfwk3_ini.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ( printf '[Bootstrap]\n' && \ printf 'UNO_JAVA_JFW_VENDOR_SETTINGS=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/)javavendors.xml\n' && \ printf 'UNO_JAVA_JFW_SHARED_DATA=$${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}\n' && \ printf 'UNO_JAVA_JFW_USER_DATA=$${URE_OVERRIDE_JAVA_JFW_USER_DATA}\n' && \ printf 'UNO_JAVA_JFW_CLASSPATH_URLS=$${URE_MORE_JAVA_CLASSPATH_URLS}\n' \ ) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # vim: set noet sw=4 ts=4: diff --git a/librelogo/CustomTarget_librelogo.mk b/librelogo/CustomTarget_librelogo.mk index 6cc693f34aa2..c60997d3155c 100644 --- a/librelogo/CustomTarget_librelogo.mk +++ b/librelogo/CustomTarget_librelogo.mk @@ -36,6 +36,7 @@ $(librelogo_DIR)/LibreLogo_%.properties : \ $(call gb_Executable_get_runtime_dependencies,propex) \ | $(librelogo_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRP) $(call gb_Helper_abbreviate_dirs, \ $(if $(filter-out qtz,$(LANGUAGE)), \ MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \ @@ -53,6 +54,7 @@ $(librelogo_DIR)/LibreLogo_%.properties : \ -l $(LANGUAGE) \ ) \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRP) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk index 3c28f0cfcfe1..ea632209ea6b 100644 --- a/odk/CustomTarget_allheaders.mk +++ b/odk/CustomTarget_allheaders.mk @@ -34,6 +34,7 @@ $(odk_allheaders_DIR)/allheaders.hxx : \ $(call gb_Package_get_target,odk_headers_generated) \ | $(odk_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) printf '// Generated list of sal includes\n' > $@ && \ printf '#ifdef _WIN32\n' >> $@ && \ @@ -49,5 +50,6 @@ else $(call odk_genincludesheader) \ $(foreach file,$(shell cat $^),$(call odk_geninclude,$(file),$(findstring /win32/,$(file))))) endif + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index f0b63489f054..b9dc8d358072 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -43,12 +43,14 @@ ifneq ($(gb_SUPPRESS_TESTS),) @true else $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CHK) $(call gb_Helper_print_on_error,\ $(PERL) $< \ $(INSTDIR)/$(SDKDIRNAME) \ $(odk_PLATFORM) '$(gb_Executable_EXT)' \ ,$@.log \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CHK) endif # vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 9a28a54c21d7..a693adebde34 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -39,6 +39,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \ $(SRCDIR)/odk/docs/cpp/Doxyfile \ $(gb_Module_CURRENTMAKEFILE) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED) sed -e 's!^INPUT = %$$!INPUT = $(call odk_cygwin_path,$(odk_cpp_DOXY_INPUT))!' \ -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(call odk_cygwin_path,$(odk_cpp_DOXY_WORKDIR))!' \ -e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"!' \ @@ -46,6 +47,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile : \ -e 's!^QUIET = %$$!QUIET = $(if $(verbose),NO,YES)!' \ -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(call odk_cygwin_path,$(odk_cpp_PREFIX))!' \ $< > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED) $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/doxygen.log : \ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile \ @@ -54,7 +56,9 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/doxygen.log : \ $(call gb_Package_get_target,odk_headers) \ $(call gb_Package_get_target,odk_headers_generated) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN) rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN) $(eval $(call gb_CustomTarget_register_targets,odk/docs,\ idl/Doxyfile \ @@ -78,6 +82,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \ $(call gb_UnoApi_get_target,offapi) \ $(gb_Module_CURRENTMAKEFILE) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED) sed -e 's!^INPUT = %$$!INPUT = $(call odk_cygwin_path,$(odk_idl_DOXY_INPUT))!' \ -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(call odk_cygwin_path,$(odk_idl_DOXY_WORKDIR))!' \ -e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = "$(PRODUCTNAME) $(PRODUCTVERSION) SDK API Reference"!' \ @@ -86,11 +91,14 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile : \ -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(call odk_cygwin_path,$(odk_idl_PREFIX))!' \ -e 's!^SHORT_NAMES = %$$!SHORT_NAMES = $(if $(filter WNT,$(OS)),YES,NO)!' \ $< > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED) $(call gb_CustomTarget_get_workdir,odk/docs)/idl/doxygen.log : \ $(call gb_CustomTarget_get_workdir,odk/docs)/idl/Doxyfile \ $(SRCDIR)/odk/docs/idl/main.dox $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GEN) rm -rf $(odk_idl_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GEN) # vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_html.mk b/odk/CustomTarget_html.mk index ba3b55b7c271..750b7777bef0 100644 --- a/odk/CustomTarget_html.mk +++ b/odk/CustomTarget_html.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CustomTarget_register_targets,odk/html,\ $(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html $(call gb_Output_announce,$*.html,$(true),SED,1) + $(call gb_Trace_StartRange,$*.html,SED) sed -e 's|%PRODUCT_RELEASE%|$(PRODUCTVERSION)|g' \ -e 's|%DOXYGEN_PREFIX0%|$(if $(DOXYGEN),.,https://api.libreoffice.org)|g' \ -e 's|%DOXYGEN_PREFIX1%|$(if $(DOXYGEN),..,https://api.libreoffice.org)|g' \ @@ -26,5 +27,6 @@ $(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html -e 's|%JAVADOC_PREFIX0%|$(if $(ENABLE_JAVA),.,https://api.libreoffice.org)|g' \ -e 's|%JAVADOC_PREFIX1%|$(if $(ENABLE_JAVA),..,https://api.libreoffice.org)|g' \ < $< > $@ + $(call gb_Trace_EndRange,$*.html,SED) # vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk index f4562f092d50..eefc26fd58ec 100644 --- a/odk/CustomTarget_javadoc.mk +++ b/odk/CustomTarget_javadoc.mk @@ -31,6 +31,7 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/%.html : \ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \ $(call gb_Jar_get_target,ridl) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JDC,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JDC) $(call gb_Helper_abbreviate_dirs,\ $(JAVADOC) -source $(JAVA_SOURCE_VER) -J-Xmx120m -use -splitindex \ -windowtitle "Java UNO Runtime Reference" \ @@ -44,5 +45,6 @@ $(call gb_CustomTarget_get_workdir,odk/docs/java/ref)/javadoc_log.txt : \ $(odk_JAVAPACKAGES) \ $(if $(JAVADOCISGJDOC),,-notimestamp) \ > $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JDC) # vim: set noet sw=4 ts=4: diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk index 750716926930..3f19735e1cc6 100644 --- a/officecfg/CustomTarget_registry.mk +++ b/officecfg/CustomTarget_registry.mk @@ -23,6 +23,7 @@ endef $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/officecfg_qa_allheaders.hxx: \ $(SRCDIR)/officecfg/files.mk $(call gb_Output_announce,officecfg_qa_allheaders.hxx,$(true),CAT,1) + $(call gb_Trace_StartRange,officecfg_qa_allheaders.hxx,CAT) ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) mkdir -p $(dir $@) && \ rm -f $@ \ @@ -31,6 +32,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) else mv $(call var2file,$(shell mkdir -p $(dir $@) && cat /dev/null >$@.tmp && echo $@.tmp),100,$(foreach file,$(officecfg_XCSFILES),$(call officecfg_geninclude,$(file)))) $@ endif + $(call gb_Trace_EndRange,officecfg_qa_allheaders.hxx,CAT) # pass the stem as space separated path elements and get a set of --stringparam ns<level> <element> in return officecfg_xsltparams=$(if $(filter-out $(lastword $1),$1),$(call officecfg_xsltparams,$(filter-out $(lastword $1),$1))) --stringparam ns$(words $1) $(lastword $1) @@ -40,9 +42,11 @@ $(call gb_CustomTarget_get_workdir,officecfg/registry)/officecfg/%.hxx: \ $(SRCDIR)/officecfg/registry/cppheader.xsl\ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),XSL) $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@) && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet $(call officecfg_xsltparams,$(subst /, ,$*)) \ -o $@ $(SRCDIR)/officecfg/registry/cppheader.xsl $<) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),XSL) # vim: set noet sw=4 ts=4: diff --git a/postprocess/CustomTarget_check_dynamic_objects.mk b/postprocess/CustomTarget_check_dynamic_objects.mk index aedf589eb51e..d81321cad18a 100644 --- a/postprocess/CustomTarget_check_dynamic_objects.mk +++ b/postprocess/CustomTarget_check_dynamic_objects.mk @@ -18,7 +18,9 @@ $(call gb_CustomTarget_get_workdir,postprocess/check_dynamic_objects)/check.done $(call gb_Postprocess_get_target,AllExecutables) \ $(call gb_Postprocess_get_target,AllPackages) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CHK) # currently we only check ELF objects $(SRCDIR)/bin/check-elf-dynamic-objects -p + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CHK) # vim: set noet sw=4 ts=4: diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index f1e32f0b28ff..691db4bd0294 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -49,6 +49,7 @@ $(packimages_DIR)/images_%.zip : \ $(call gb_Helper_get_imagelists) \ | $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(call gb_Helper_abbreviate_dirs, \ ILSTFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.ilst,$^)) && \ $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/solenv/bin/pack_images.py \ @@ -61,6 +62,7 @@ $(packimages_DIR)/images_%.zip : \ -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \ rm -rf $${ILSTFILE}) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) # turn the #defines foo "resource.png" of hlst into the final ilst format $(packimages_DIR)/sourceimagelist.ilst : \ @@ -94,19 +96,23 @@ $(packimages_DIR)/sourceimagelist.ilst : \ $(packimages_DIR)/commandimagelist.ilst : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(call gb_Helper_abbreviate_dirs, \ $(FIND) $(SRCDIR)/icon-themes -name "*.png" -o -name "*.svg" | \ grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | \ sed "s#^#%MODULE%#" | \ LC_ALL=C $(SORT) -u > $@.tmp && \ $(call gb_Helper_replace_if_different_and_touch,$@.tmp,$@)) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) $(packimages_DIR)/sorted.lst : \ $(SRCDIR)/postprocess/packimages/image-sort.lst \ $(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SRCDIR)/solenv/bin/image-sort.pl \ $< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) # vim: set noet sw=4 ts=4: diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index b032dfd31681..0e2af975255f 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -567,6 +567,7 @@ $(call gb_XcdTarget_get_target,main.xcd) \ : $(BUILDDIR)/config_host.mk.stamp \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,main,$(true),XCD,3) + $(call gb_Trace_StartRange,main,XCD) $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@) && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ @@ -574,25 +575,31 @@ $(call gb_XcdTarget_get_target,main.xcd) \ $(call gb_CustomTarget_get_workdir,postprocess/registry)/main.list \ | sed $(postprocess_main_SED) > $@ \ ) + $(call gb_Trace_EndRange,main,XCD) $(call gb_XcdTarget_get_target,%.xcd) : \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$*,$(true),XCD,3) + $(call gb_Trace_StartRange,$*,XCD) $(call gb_Helper_abbreviate_dirs, \ mkdir -p $(dir $@) && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ -o $@ $(SRCDIR)/solenv/bin/packregistry.xslt $< \ ) + $(call gb_Trace_EndRange,$*,XCD) $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) echo '<list><dependency file="main"/><filename>$(call gb_XcuLangpackTarget_get_target,Langpack-$*.xcu)</filename></list>' > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # It can happen that localized fcfg_langpack_*.zip contains # zero-sized org/openoffice/TypeDetection/Filter.xcu; filter them out in the # find shell command below (see issue 110041): $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),AWK) $(call gb_Helper_abbreviate_dirs,\ $(FIND) $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) \ -name *.xcu -size +0c \ @@ -601,9 +608,11 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list : {print "<filename>"$$0"</filename>"} \ END {print "</list>"}' > $@ \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),AWK) $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),AWK) $(call gb_Helper_abbreviate_dirs,\ $(FIND) $(call gb_XcuResTarget_get_target,registry/$*/) \ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\ @@ -617,12 +626,15 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : {print "<filename>"$$0"</filename>"} \ END {print "</list>"}' > $@ \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),AWK) $(call gb_CustomTarget_get_workdir,postprocess/registry)/%.list : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) mv $(call var2file,$@.tmp,70,<list> $(foreach i,$(postprocess_DEPS_$*), <dependency file='$i'/>) \ $(foreach i,$(postprocess_OPTDEPS_$*), <dependency file='$i' optional='true'/>) \ $(foreach i,$(postprocess_FILES_$*), <filename>$(i)</filename>) </list>) \ $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # vim: set noet sw=4 ts=4: diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 7ba7c5832f17..a00faa857f2a 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -27,6 +27,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: \ $(call gb_CustomTarget_get_workdir,postprocess/signing)/signing.done: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) ifeq ($(COM),MSC) ifneq ($(ENABLE_DBGUTIL),TRUE) EXCLUDELIST=$(shell $(gb_MKTEMP)) && \ @@ -55,5 +56,6 @@ endif else @echo "Nothing to do, signing is Windows (MSC) only." endif + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) # vim: set noet sw=4 ts=4: diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk index 203258bf94e3..541620304d89 100644 --- a/pyuno/CustomTarget_python_shell.mk +++ b/pyuno/CustomTarget_python_shell.mk @@ -24,13 +24,17 @@ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh : \ $(SRCDIR)/pyuno/zipcore/python.sh \ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT) cat $^ > $@ && chmod +x $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT) $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \ $(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh \ $(BUILDDIR)/config_$(gb_Side)/config_python.h $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED) sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \ $< > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED) # vim: set noet sw=4 ts=4: diff --git a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk index 3dfd4549c1ac..cc5a67f3cadb 100644 --- a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk +++ b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk @@ -17,6 +17,7 @@ $(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)/$(call gb_Helper_get_ $(BUILDDIR)/config_$(gb_Side)/config_python.h \ $(SRCDIR)/pyuno/CustomTarget_pyuno_pythonloader_ini.mk $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) ( printf '[Bootstrap]\n' && \ $(if $(SYSTEM_PYTHON),, \ printf 'PYUNO_LOADER_PYTHONHOME=%s\n' \ @@ -32,5 +33,6 @@ $(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)/$(call gb_Helper_get_ '$(foreach dir,/ /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ', \ '$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) '))) \ ) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/CustomTarget_license.mk b/readlicense_oo/CustomTarget_license.mk index 15d4a31ea694..b4baf7a8f026 100644 --- a/readlicense_oo/CustomTarget_license.mk +++ b/readlicense_oo/CustomTarget_license.mk @@ -26,6 +26,7 @@ $(readlicense_oo_DIR)/LICENSE.html : \ | $(readlicense_oo_DIR)/.dir \ $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),XSL) $(call gb_Helper_abbreviate_dirs, \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet --novalid -o $@ \ --stringparam build_type "$(BUILD_TYPE)" \ @@ -39,6 +40,7 @@ $(readlicense_oo_DIR)/LICENSE.html : \ && mv $@.tmp $@ \ ) \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),XSL) $(readlicense_oo_DIR)/LICENSE : \ $(SRCDIR)/readlicense_oo/license/license_plain_text.xsl \ @@ -46,6 +48,7 @@ $(readlicense_oo_DIR)/LICENSE : \ | $(readlicense_oo_DIR)/.dir \ $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),XSL) $(call gb_Helper_abbreviate_dirs, \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet --novalid -o $@ \ --stringparam build_type "$(BUILD_TYPE)" \ @@ -55,15 +58,18 @@ $(readlicense_oo_DIR)/LICENSE : \ $< \ $(readlicense_oo_LICENSE_xml) \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),XSL) ifeq ($(OS),WNT) $(readlicense_oo_DIR)/license.txt : \ $(readlicense_oo_DIR)/LICENSE \ | $(readlicense_oo_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),AWK) $(call gb_Helper_abbreviate_dirs, \ $(gb_AWK) 'sub("$$","\r")' $< > $@.tmp && mv $@.tmp $@ \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),AWK) endif # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk index 0d9c5eeab88f..bb3b41e768a8 100644 --- a/readlicense_oo/CustomTarget_readme.mk +++ b/readlicense_oo/CustomTarget_readme.mk @@ -29,6 +29,7 @@ $(readlicense_oo_DIR)/readme.xrm : \ $(foreach lang,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) \ | $(readlicense_oo_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XRM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),XRM) $(call gb_Helper_abbreviate_dirs, \ MERGEINPUT=`$(gb_MKTEMP)` && \ echo $(foreach lang,$(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/readlicense_oo/docs.po) > $${MERGEINPUT} && \ @@ -38,6 +39,7 @@ $(readlicense_oo_DIR)/readme.xrm : \ -m $${MERGEINPUT} \ -l all && \ rm -rf $${MERGEINPUT}) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),XRM) endif @@ -51,6 +53,7 @@ $(readlicense_oo_DIR)/$(call gb_README,%) : \ | $(readlicense_oo_DIR)/.dir \ $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),XSL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),XSL) $(call gb_Helper_abbreviate_dirs, \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet --novalid -o $@.out \ --stringparam com1 $(COM) \ @@ -67,5 +70,6 @@ $(readlicense_oo_DIR)/$(call gb_README,%) : \ && sed $(readlicense_oo_README_SED) $@.out > $@ \ && rm $@.out \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),XSL) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk index 2f53fbf4ca28..cc5ab33f807e 100644 --- a/ridljar/CustomTarget_javamaker.mk +++ b/ridljar/CustomTarget_javamaker.mk @@ -17,8 +17,10 @@ $(ridljar_DIR)/done : $(call gb_UnoApi_get_target,udkapi) \ $(call gb_Executable_get_runtime_dependencies,javamaker) \ | $(ridljar_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JVM) $(call gb_Helper_abbreviate_dirs, \ rm -r $(ridljar_DIR) && \ $(call gb_Helper_execute,javamaker -O$(ridljar_DIR) $<) && touch $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JVM) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/ridljar/CustomTarget_test_urp.mk b/ridljar/CustomTarget_test_urp.mk index 9ef7ac489e57..88e87bf6d2bc 100644 --- a/ridljar/CustomTarget_test_urp.mk +++ b/ridljar/CustomTarget_test_urp.mk @@ -18,9 +18,11 @@ $(ridljar_TESTURP)/done : \ $(call gb_UnoApi_get_target,udkapi) \ $(call gb_Executable_get_runtime_dependencies,javamaker) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JVM) rm -rf $(ridljar_TESTURP) && \ $(call gb_Helper_execute,javamaker -O$(ridljar_TESTURP) -nD $< \ -X$(call gb_UnoApi_get_target,udkapi)) && \ touch $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JVM) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/sdext/CustomTarget_pdfimport.mk b/sdext/CustomTarget_pdfimport.mk index ab313dc1db9e..086daca5bc37 100644 --- a/sdext/CustomTarget_pdfimport.mk +++ b/sdext/CustomTarget_pdfimport.mk @@ -16,6 +16,8 @@ $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/hash.cxx : \ $(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list \ | $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),GPF) $(GPERF) -C -t -l -L C++ -m 20 --switch=2 --readonly-tables -Z PdfKeywordHash -k'4-5,$$' $< > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),GPF) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk index abcdfa0a8f82..2780958cf0e2 100644 --- a/shell/CustomTarget_shlxthdl_res.mk +++ b/shell/CustomTarget_shlxthdl_res.mk @@ -21,6 +21,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl $(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \ $(call gb_Executable_get_runtime_dependencies,lngconvex) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),LCX) $(call gb_Helper_abbreviate_dirs,\ cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \ BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT)) \ @@ -30,6 +31,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl -rct rctmpl.txt \ -rch rcheader.txt \ -rcf rcfooter.txt) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),LCX) $(eval $(call gb_CustomTarget_ulfex_rule,\ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf,\ diff --git a/shell/CustomTarget_spsupp_idl.mk b/shell/CustomTarget_spsupp_idl.mk index 89f83cbd213d..2c860f6d81d1 100644 --- a/shell/CustomTarget_spsupp_idl.mk +++ b/shell/CustomTarget_spsupp_idl.mk @@ -18,6 +18,7 @@ $(spsupp_IDLDIR)/spsupp.tlb : \ $(SRCDIR)/shell/source/win32/spsupp/spsupp.idl \ | $(spsupp_IDLDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),IDL) $(call gb_Helper_abbreviate_dirs, \ midl.exe \ -tlb $@ \ @@ -27,5 +28,6 @@ $(spsupp_IDLDIR)/spsupp.tlb : \ $(SOLARINC) \ -Oicf \ $<) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),IDL) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/bin/finish-gbuild-trace.py b/solenv/bin/finish-gbuild-trace.py new file mode 100755 index 000000000000..fcd31fc23fa9 --- /dev/null +++ b/solenv/bin/finish-gbuild-trace.py @@ -0,0 +1,137 @@ +#!/usr/bin/env python3 + +# Process file generated by using GBUILD_TRACE=file with make. +# The file needs adjusting for viewing in Chromium's "chrome://tracing' URL. +# See solenv/gbuild/Trace.mk for details. + +import os +import re +import sys + +if len(sys.argv) != 2: + print ("Usage: " + sys.argv[0] + " [trace.json]", file=sys.stderr) + sys.exit(1) + +filename=sys.argv[1] + +with open(filename) as infile: + lines = [ line.rstrip('\n') for line in infile ] + +if len(lines) == 0 : + print( "Empty file?", file=sys.stderr) + sys.exit(1) + +if lines[0] == '{"traceEvents": [': + print( "File already processed", file=sys.stderr) + sys.exit(3) + +# sort items by time (parallel writes may not write them in time order) +def linekey(line): + match = re.match( r'^.*, "ts": ([0-9]*)[0-9][0-9][0-9],.*$', line ) + assert match, "Unknown line: " + line + return int(match.group(1)) +lines.sort( key=linekey ) + +# 'chrome://tracing' shows several rows, we use those to show build parallelism, +# but we need to assign the proper ids by allocating them as slots. +slots = [] +# start time of each slot +slot_start_time = [] + +def make_slot_string(type, detail): + return type + '#' + detail + +def allocate_slot(type, detail): + for index in range(len(slots)): + if slots[index] == "": + slots[index] = make_slot_string(type, detail) + return index + 1 + index = len(slots) + slots.append(make_slot_string(type, detail)) + slot_start_time.append(0) + return index + 1 + +def free_slot(type, detail): + for index in range(len(slots)): + if slots[index] == make_slot_string(type, detail): + slots[index] = "" + return index + 1 + assert False, "free_slot(" + type + "," + detail + ") not found" + +# key: Type (e.g. CXX), value: time total +totals_time = {} +totals_count = {} + +# time of the first item, to rebase all times to 0 +start_time = 0 + +with open(filename + ".tmp", "w") as outfile: + print( '{"traceEvents": [', file=outfile) + for iline in range(len(lines)): + line = lines[iline] + # "ts" needs converting nanoseconds -> milliseconds + match = re.match( r'^{"name": "([^"]*)", "ph": "(.)",.*"ts": ([0-9]*)[0-9][0-9][0-9],"args":{"message":"([^"]*)"}.*$', line ) + if not match: + print( "Unknown line: " + line, file=sys.stderr) + sys.exit(2) + if start_time == 0: + start_time = int(match.group(3)) + # "tid" needs replacing with proper slot + tid = "0" + # "ph" + if match.group(2) == 'B': + tid = allocate_slot(match.group(1), match.group(4)) # "name", "args" + slot_start_time[tid-1] = int(match.group(3)) + elif match.group(2) == 'E': + tid = free_slot(match.group(1), match.group(4)) # "name", "args" + if not match.group(1) in totals_time: + totals_time[match.group(1)] = 0 + totals_count[match.group(1)] = 0 + totals_time[match.group(1)] += int(match.group(3)) - slot_start_time[tid-1] + totals_count[match.group(1)] += 1 + line = re.sub( r'"ts": [0-9]+,', '"ts": ' + str(int(match.group(3)) - start_time) + ",", line) + line = re.sub( r'"tid": 1,', '"tid": ' + str(tid) + ",", line) + if match.group(2) == 'i': + rline = line + # mark as affecting all slots + line = re.sub( r'}},$', '}, "s": "p"},', line) + print(line, file=outfile) + # Chromium search doesn't find 'i' items, add extra 'R' for that + rline = re.sub( r', "ph": "i",', ', "ph": "R",', rline) + rline = re.sub( r', "tid": [0-9]+,', ',', rline) + print(rline, file=outfile) + else: + print(line, file=outfile) + # TODO: By the first time "[DEP]: LNK:Executable/makedepend.exe" is invoked the build tools + # are not built yet, so the invocation fails, doesn't abort the build for some reason, + # but the matching line about it ending is missing. So add the missing end line if it is + # by another start line for it instead of an end line. + if match.group(1) == "DEP" and match.group(4) == "[DEP]: LNK:Executable/makedepend.exe" and match.group(2) == "B": + for iline2 in range(iline+1,len(lines)): # search following lines + line2 = lines[iline2] + match2 = re.match( r'^{"name": "([^"]*)", "ph": "(.)",.*"ts": ([0-9]*)[0-9][0-9][0-9],"args":{"message":"([^"]*)"}.*$', line2 ) + if match2.group(1) == "DEP" and match2.group(4) == "[DEP]: LNK:Executable/makedepend.exe": + if match2.group(2) == "E": + break # it has a matching close + if match2.group(2) == "B": + print(re.sub( r', "ph": "B",', ', "ph": "E",', line), file=outfile) # close the starting line + free_slot(match.group(1), match.group(4)) + break + + total_num = 0 + for total in sorted(totals_time, key=totals_time.get, reverse=True): + note = "" + if total == "EXTERNAL": + note = ',"note": "minimum (cannot detect parallelism)"' + print( '{"pid":2,"tid":' + str(total_num) + ',"ts":0,"dur":' + str(totals_time[total]) + ',"ph":"X","name":"' + total + + '","args":{"count":"' + str(totals_count[total]) + '"' + note + '}},', file=outfile) + total_num += 1 + + print( '{"pid":1,"tid":0,"ts":0,"ph":"M","name":"process_name","args":{"name":"gbuild"}},', file=outfile) + print( '{"pid":2,"tid":0,"ts":0,"ph":"M","name":"process_name","args":{"name":"totals"}}]}', file=outfile) + +for index in range(len(slots)): + if slots[index] != "": + print( "Unclosed range: " + slots[index], file=sys.stderr) + +os.rename(filename + ".tmp", filename) diff --git a/solenv/gbuild/AllLangHelp.mk b/solenv/gbuild/AllLangHelp.mk index 22d5ad8b533b..32d38166d53f 100644 --- a/solenv/gbuild/AllLangHelp.mk +++ b/solenv/gbuild/AllLangHelp.mk @@ -33,6 +33,7 @@ $(dir $(call gb_AllLangHelp_get_target,%))%/.dir : $(call gb_AllLangHelp_get_target,%) : ifeq ($(ENABLE_HTMLHELP),) $(call gb_Output_announce,$*,$(true),ALH,5) + $(call gb_Trace_MakeMark,$*,ALH) endif touch $@ diff --git a/solenv/gbuild/AllLangMoTarget.mk b/solenv/gbuild/AllLangMoTarget.mk index 63789f768ec0..e1fbdc732f7c 100644 --- a/solenv/gbuild/AllLangMoTarget.mk +++ b/solenv/gbuild/AllLangMoTarget.mk @@ -37,6 +37,7 @@ $(call gb_MoTarget_get_target,%) : \ $(gb_Helper_MISCDUMMY) \ $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$*,$(true),MO ,2) + $(call gb_Trace_StartRange,$*,MO ) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ if test -e $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po; then \ @@ -45,6 +46,7 @@ $(call gb_MoTarget_get_target,%) : \ echo missing $(gb_POLOCATION)/$(LANGUAGE)/$(POLOCATION)/messages.po && \ $(MSGUNIQ) --force-po $(SRCDIR)/solenv/bin/dummy.po | $(MSGFMT) - -o $@; \ fi) + $(call gb_Trace_EndRange,$*,MO ) #$(info $(call gb_MoTarget_get_target,$(1))) define gb_MoTarget_MoTarget diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk index f0cf1c92e70c..092716b378ed 100644 --- a/solenv/gbuild/AllLangPackage.mk +++ b/solenv/gbuild/AllLangPackage.mk @@ -19,11 +19,12 @@ $(dir $(call gb_AllLangPackage_get_target,%)).dir : $(call gb_AllLangPackage_get_target,%) : $(call gb_Output_announce,$*,$(true),ALP,3) + $(call gb_Trace_MakeMark,$*,ALP) touch $@ .PHONY : $(call gb_AllLangPackage_get_clean_target,%) $(call gb_AllLangPackage_get_clean_target,%) : - $(call gb_Output_announce,$*,$(true),ALP,3) + $(call gb_Output_announce,$*,$(false),ALP,3) rm -f $(call gb_AllLangPackage_get_target,$*) # Define a new package group. diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index 8665644bea78..841baa738e41 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -18,6 +18,7 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \ $(GBUILDDIR)/gen-autoinstall.py \ $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_Output_announce,$*,$(true),AIN,3) + $(call gb_Trace_StartRange,$*,AIN) SDKLIBFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\ $(lib) \ @@ -41,6 +42,7 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \ $${SDKLIBFILE} $${LIBFILE} $${EXEFILE} $${JARFILE} $${PKGFILE} \ > $@ \ && rm -f $${SDKLIBFILE} $${LIBFILE} $${EXEFILE} $${JARFILE} $${PKGFILE} + $(call gb_Trace_EndRange,$*,AIN) $(call gb_AutoInstall_get_clean_target,%) : diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk index a0257708aead..9c97e036fe2b 100644 --- a/solenv/gbuild/CliAssembly.mk +++ b/solenv/gbuild/CliAssembly.mk @@ -13,7 +13,6 @@ gb_CliConfigTarget_TARGET := $(SRCDIR)/solenv/bin/clipatchconfig.pl gb_CliConfigTarget_COMMAND := $(PERL) -w $(gb_CliConfigTarget_TARGET) define gb_CliConfigTarget__command -$(call gb_Output_announce,$(2),$(true),CPA,1) $(call gb_Helper_abbreviate_dirs,\ $(gb_CliConfigTarget_COMMAND) $(3) $(CLI_CONFIG_VERSIONFILE) $(1) \ ) @@ -23,7 +22,10 @@ $(dir $(call gb_CliConfigTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_CliConfigTarget_get_target,%) : + $(call gb_Output_announce,$*,$(true),CPA,1) + $(call gb_Trace_StartRange,$*,CPA) $(call gb_CliConfigTarget__command,$@,$*,$<) + $(call gb_Trace_EndRange,$*,CPA) $(call gb_CliConfigTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),CPA,1) @@ -51,7 +53,6 @@ endef gb_CliAssemblyTarget_KEYFILE_DEFAULT := $(SRCDIR)/cli_ure/source/cliuno.snk define gb_CliAssemblyTarget__command -$(call gb_Output_announce,$(2),$(true),AL ,2) $(call gb_Helper_abbreviate_dirs,\ $(GNUCOPY) $(CLI_ASSEMBLY_KEYFILE) $(1).tmp.snk && \ al \ @@ -76,7 +77,10 @@ $(call gb_CliAssemblyTarget_get_target,%) : $(if $(strip $(CLI_ASSEMBLY_VERSION)),,$(call gb_Output_error,assembly version not set)) $(if $(strip $(CLI_ASSEMBLY_CONFIGFILE)),,$(call gb_Output_error,assembly configuration file not set)) $(if $(strip $(CLI_ASSEMBLY_OUTFILE)),,$(call gb_Output_error,assembly name not set)) + $(call gb_Output_announce,$*,$(true),AL ,2) + $(call gb_Trace_StartRange,$*,AL ) $(call gb_CliAssemblyTarget__command,$@,$*,$<) + $(call gb_Trace_EndRange,$*,AL ) $(call gb_CliAssemblyTarget_get_assembly_target,%) : touch $@ @@ -142,6 +146,7 @@ gb_CliAssembly_get_dll = $(call gb_CliAssemblyTarget_get_dll,$(1)) $(call gb_CliAssembly_get_target,%) : $(call gb_Output_announce,$*,$(true),CLA,3) + $(call gb_Trace_MakeMark,$*,CLA) mkdir -p $(dir $@) && touch $@ .PHONY : $(call gb_CliAssembly_get_clean_target,%) diff --git a/solenv/gbuild/CliLibrary.mk b/solenv/gbuild/CliLibrary.mk index 275f0d68f439..e6af83891925 100644 --- a/solenv/gbuild/CliLibrary.mk +++ b/solenv/gbuild/CliLibrary.mk @@ -35,7 +35,6 @@ gb_CliLibrary__get_generated_source = $(WORKDIR)/$(1).cs # csc has silly problems handling files passed on command line define gb_CliLibrary__command -$(call gb_Output_announce,$(2),$(true),CSC,3) csc \ $(call gb_CliLibrary__get_csflags) \ $(CLI_CSCFLAGS) \ @@ -80,7 +79,10 @@ $$(eval $$(call gb_Module_register_target,$(call gb_CliLibrary_get_target,$(1)), $(call gb_Helper_make_userfriendly_targets,$(1),CliLibrary) $(call gb_CliLibrary_get_target,$(1)) : + $$(call gb_Output_announce,$(1),$(true),CSC,3) + $$(call gb_Trace_StartRange,$(1),CSC) $$(call gb_CliLibrary__command,$$@,$(1)) + $$(call gb_Trace_EndRange,$(1),CSC) endef diff --git a/solenv/gbuild/CliNativeLibrary.mk b/solenv/gbuild/CliNativeLibrary.mk index 6ff28ce6f842..9e19ccd709b5 100644 --- a/solenv/gbuild/CliNativeLibrary.mk +++ b/solenv/gbuild/CliNativeLibrary.mk @@ -15,7 +15,6 @@ gb_CliNativeLibrary_EXT := $(gb_CliAssembly_POLICYEXT) gb_CliNativeLibrary__get_library = $(call gb_CliAssembly_get_dll,$(1)) define gb_CliNativeLibrary__command -$(call gb_Output_announce,$(2),$(true),SN ,4) $(call gb_Helper_abbreviate_dirs,\ $(GNUCOPY) $(CLI_NATIVE_LIBRARY) $(1).tmp && \ sn -R $(1).tmp $(CLI_NATIVE_KEYFILE) && \ @@ -57,8 +56,10 @@ $$(eval $$(call gb_Module_register_target,$(call gb_CliNativeLibrary_get_target, $(call gb_Helper_make_userfriendly_targets,$(1),CliNativeLibrary) $(call gb_CliNativeLibrary_get_target,$(1)) : + $$(call gb_Output_announce,$(1),$(true),SN ,4) + $$(call gb_Trace_StartRange,$(1),SN ) $$(call gb_CliNativeLibrary__command,$$@,$(1)) - + $$(call gb_Trace_EndRange,$(1),SN ) endef diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk index d12dc62f7998..20b840bf2f25 100644 --- a/solenv/gbuild/CliUnoApi.mk +++ b/solenv/gbuild/CliUnoApi.mk @@ -17,7 +17,6 @@ gb_CliUnoApi_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker) gb_CliUnoApi_COMMAND := $(call gb_Executable_get_command,climaker) define gb_CliUnoApi__command -$(call gb_Output_announce,$(2),$(true),CLI,4) $(call gb_Helper_abbreviate_dirs,\ $(gb_CliUnoApi_COMMAND) \ --out $(1) \ @@ -62,7 +61,10 @@ $(call gb_Helper_make_userfriendly_targets,$(1),CliUnoApi) $(call gb_CliUnoApi_get_target,$(1)) : $(gb_CliUnoApi_DEPS) + $$(call gb_Output_announce,$(1),$(true),CLI,4) + $$(call gb_Trace_StartRange,$(1),CLI) $$(call gb_CliUnoApi__command,$$@,$(1)) + $$(call gb_Trace_EndRange,$(1),CLI) endef diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index f56a980c3fcc..8b1ad971bb02 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -26,7 +26,6 @@ gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component # is a mapping from library filenames to direct pointers to the # corresponding PREFIX_component_getFactory functions. define gb_ComponentTarget__command -$(call gb_Output_announce,$(2),$(true),CMP,1) $(if $(LIBFILENAME),,$(call gb_Output_error,No LIBFILENAME set at component target: $(1))) mkdir -p $(dir $(1)) && \ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet \ @@ -47,7 +46,10 @@ $(call gb_ComponentTarget_get_target,%) : \ $(SRCDIR)/Repository.mk \ $(SRCDIR)/RepositoryFixes.mk \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) + $(call gb_Output_announce,$*,$(true),CMP,1) + $(call gb_Trace_StartRange,$*,CMP) $(call gb_ComponentTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,CMP) define gb_ComponentTarget_ComponentTarget $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 378a3d5625b4..028ed63ac7a4 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -69,7 +69,6 @@ gb_XcsTarget_XSLT_SchemaTrim := $(SRCDIR)/officecfg/util/schema_trim.xsl gb_XcsTarget_DTD_Schema := $(SRCDIR)/officecfg/registry/component-schema.dtd define gb_XcsTarget__command -$(call gb_Output_announce,$(2),$(true),XCS,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_Configuration_XSLTCOMMAND) --nonet \ @@ -95,7 +94,10 @@ $(call gb_XcsTarget_get_target,%) : \ $(gb_XcsTarget_XSLT_SchemaVal) $(gb_XcsTarget_XSLT_Sanity) \ $(gb_XcsTarget_XSLT_SchemaTrim) $(gb_XcsTarget_DTD_Schema) \ | $(gb_Configuration_XSLTCOMMAND_DEPS) + $(call gb_Output_announce,$*,$(true),XCS,1) + $(call gb_Trace_StartRange,$*,XCS) $(call gb_XcsTarget__command,$@,$*,$(filter %.xcs,$^)) + $(call gb_Trace_EndRange,$*,XCS) $(call gb_XcsTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCS,1) @@ -109,7 +111,6 @@ gb_XcuDataTarget_XSLT_DataVal := $(SRCDIR)/officecfg/util/data_val.xsl gb_XcuDataTarget_DTD_ComponentUpdate := $(SRCDIR)/officecfg/registry/component-update.dtd define gb_XcuDataTarget__command -$(call gb_Output_announce,$(2),$(true),XCU,2) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_Configuration_XSLTCOMMAND) --nonet \ @@ -133,7 +134,10 @@ endef $(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \ $(gb_XcuTarget_XSLT_AllLang) $(gb_XcuDataTarget_DTD_ComponentUpdate) \ | $(gb_Configuration_XSLTCOMMAND_DEPS) + $(call gb_Output_announce,$*,$(true),XCU,2) + $(call gb_Trace_StartRange,$*,XCU) $(call gb_XcuDataTarget__command,$@,$*,$(filter %.xcu,$^)) + $(call gb_Trace_EndRange,$*,XCU) $(call gb_XcuDataTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCU,2) @@ -152,7 +156,6 @@ $(call gb_XcsTarget_get_target,$(basename $(subst -,.,$(basename $(1)))).xcs) endef define gb_XcuModuleTarget__command -$(call gb_Output_announce,$(2),$(true),XCM,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_Configuration_XSLTCOMMAND) --nonet \ @@ -169,7 +172,10 @@ endef $(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \ | $(gb_Configuration_XSLTCOMMAND_DEPS) $(if $(filter %.xcu,$^),,$(error There is no target $(call gb_XcuModuleTarget_get_target,$*))) + $(call gb_Output_announce,$*,$(true),XCM,3) + $(call gb_Trace_StartRange,$*,XCM) $(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter %.xcs,$^)) + $(call gb_Trace_EndRange,$*,XCM) $(call gb_XcuModuleTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCM,3) @@ -187,7 +193,6 @@ gb_XcuLangpackTarget__get_target_with_lang = \ gb_XcuLangpackTarget_SED_delcomment := $(SRCDIR)/officecfg/util/delcomment.sed define gb_XcuLangpackTarget__command -$(call gb_Output_announce,$(2),$(true),XCL,1) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ sed -e "s/__LANGUAGE__/$(LANGUAGE)/" -f $(gb_XcuLangpackTarget_SED_delcomment)\ @@ -196,7 +201,10 @@ endef $(call gb_XcuLangpackTarget_get_target,%) : \ $(gb_XcuLangpackTarget_SED_delcomment) + $(call gb_Output_announce,$*,$(true),XCL,1) + $(call gb_Trace_StartRange,$*,XCL) $(call gb_XcuLangpackTarget__command,$@,$*,$(filter %.tmpl,$^)) + $(call gb_Trace_EndRange,$*,XCL) $(call gb_XcuLangpackTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCL,1) @@ -211,7 +219,6 @@ gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfg gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex) define gb_XcuMergeTarget__command -$(call gb_Output_announce,$(2),$(true),XCX,1) MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ @@ -226,7 +233,10 @@ endef $(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXDEPS) $(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\ + $(call gb_Output_announce,$*,$(true),XCX,1) \ + $(call gb_Trace_StartRange,$*,XCX) \ $(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),\ + $(call gb_Trace_EndRange,$*,XCX) \ mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@) $(call gb_XcuMergeTarget_get_clean_target,%) : @@ -249,7 +259,6 @@ endef # locale is extracted from the stem (parameter $(2)) define gb_XcuResTarget__command -$(call gb_Output_announce,$(2),$(true),XCR,2) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(gb_Configuration_XSLTCOMMAND) --nonet \ @@ -266,7 +275,10 @@ endef $(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang) \ | $(gb_Configuration_XSLTCOMMAND_DEPS) + $(call gb_Output_announce,$*,$(true),XCR,2) + $(call gb_Trace_StartRange,$*,XCR) $(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^)) + $(call gb_Trace_EndRange,$*,XCR) $(call gb_XcuResTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),XCR,2) @@ -298,6 +310,7 @@ $(call gb_Configuration_get_clean_target,%) : $(call gb_Configuration_get_target,%) : $(call gb_Output_announce,$*,$(true),CFG,4) + $(call gb_Trace_MakeMark,$*,CFG) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && touch $@) diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 1eb954c4242d..602dba107947 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -109,6 +109,7 @@ ifneq ($(gb_SUPPRESS_TESTS),) @true else $(call gb_Output_announce,$*,$(true),CUT,2) + $(call gb_Trace_StartRange,$*,CUT) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ rm -fr $@.user && cp -r $(WORKDIR)/unittest $@.user && \ @@ -143,6 +144,7 @@ else RET=$$?; \ $(call gb_CppunitTest_postprocess,$(gb_CppunitTest_CPPTESTCOMMAND),$@.core,$$RET) >> $@.log 2>&1;) \ cat $@.log; $(gb_CppunitTest_UNITTESTFAILED) Cppunit $*))) + $(call gb_Trace_EndRange,$*,CUT) endif define gb_CppunitTest_CppunitTest diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 28ffc16af22f..27ce89fba06f 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -23,6 +23,7 @@ $(call gb_CustomTarget_get_workdir,%)/.dir : $(call gb_CustomTarget_get_target,%) : $(call gb_Output_announce,$*,$(true),CUS,3) + $(call gb_Trace_MakeMark,$*,CUS) touch $@ .PHONY: $(call gb_CustomTarget_get_clean_target,%) @@ -55,10 +56,12 @@ ifneq ($(WITH_LANG),) # $(call gb_CustomTarget_ulfex__command,ulftarget,ulfsource,pofiles) define gb_CustomTarget_ulfex__command $(call gb_Output_announce,$(1),$(true),ULF,1) + $(call gb_Trace_StartRange,$(1),ULF) MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(3)) && \ $(call gb_Helper_abbreviate_dirs,\ $(call gb_Executable_get_command,ulfex) -i $(2) -o $(1) -m $${MERGEINPUT} -l all) && \ rm -rf $${MERGEINPUT} + $(call gb_Trace_EndRange,$(1),ULF) endef else @@ -103,6 +106,7 @@ $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx : \ $(SRCDIR)/$(3)/$(4).hxx.head \ $(SRCDIR)/$(3)/$(4).hxx.tail $$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),build,PRL,1) + $$(call gb_Trace_StartRange,$$(subst $(WORKDIR)/,,$$@),PRL) mkdir -p $(call gb_CustomTarget_get_workdir,$(1))/misc \ $(call gb_CustomTarget_get_workdir,$(1)) \ $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token @@ -118,6 +122,7 @@ $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx : \ $(SRCDIR)/$(3)/$(4).hxx.tail \ > $(call gb_CustomTarget_get_workdir,$(1))/$(2)/token/$(4).hxx \ && touch $$@ + $$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),PRL) $(call gb_CustomTarget_get_target,$(1)) : \ $(call gb_CustomTarget_get_workdir,$(1))/$(5)names.inc \ diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index 6c4e6a7490e7..12a42d16f46d 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -15,7 +15,6 @@ gb_ThesaurusIndexTarget_INDEX_DEPS := $(call gb_Executable_get_runtime_dependenc gb_ThesaurusIndexTarget_INDEX_COMMAND := $(call gb_Executable_get_command,idxdict) define gb_ThesaurusIndexTarget__command -$(call gb_Output_announce,$(2),$(true),THI,1) $(call gb_Helper_abbreviate_dirs,\ $(gb_ThesaurusIndexTarget_INDEX_COMMAND) -o $(1) < $(THESAURUS_FILE) \ ) @@ -29,7 +28,10 @@ $(dir $(call gb_ThesaurusIndexTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_ThesaurusIndexTarget_get_target,%) : $(gb_ThesaurusIndexTarget_INDEX_DEPS) | $(gb_ThesaurusIndexTarget_CHECK_TARGET) + $(call gb_Output_announce,$*,$(true),THI,1) + $(call gb_Trace_StartRange,$*,THI) $(call gb_ThesaurusIndexTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,THI) .PHONY : $(call gb_ThesaurusIndexTarget_get_clean_target,%) $(call gb_ThesaurusIndexTarget_get_clean_target,%) : @@ -58,7 +60,6 @@ gb_PropertiesTranslateTarget_COMMAND := $(call gb_Executable_get_command,propex) gb_PropertiesTranslateTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,propex) define gb_PropertiesTranslateTarget__command -$(call gb_Output_announce,$(2),$(true),PRP,1) $(call gb_Helper_abbreviate_dirs, \ $(if $(filter-out qtz,$(LANGUAGE)), \ MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \ @@ -85,7 +86,10 @@ $(dir $(call gb_PropertiesTranslateTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_PropertiesTranslateTarget_get_target,%) : $(gb_PropertiesTranslateTarget_DEPS) + $(call gb_Output_announce,$*,$(true),PRP,1) + $(call gb_Trace_StartRange,$*,PRP) $(call gb_PropertiesTranslateTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,PRP) .PHONY : $(call gb_PropertiesTranslateTarget_get_clean_target,%) $(call gb_PropertiesTranslateTarget_get_clean_target,%) : @@ -122,7 +126,6 @@ gb_DescriptionTranslateTarget_COMMAND := $(call gb_Executable_get_command,xrmex) gb_DescriptionTranslateTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,xrmex) define gb_DescriptionTranslateTarget__command -$(call gb_Output_announce,$(2),$(true),XRM,1) $(call gb_Helper_abbreviate_dirs,\ MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \ $(gb_DescriptionTranslateTarget_COMMAND) \ @@ -141,7 +144,10 @@ $(dir $(call gb_DescriptionTranslateTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_DescriptionTranslateTarget_get_target,%) : $(gb_DescriptionTranslateTarget_DEPS) + $(call gb_Output_announce,$*,$(true),XRM,1) + $(call gb_Trace_StartRange,$*,XRM) $(call gb_DescriptionTranslateTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,XRM) .PHONY : $(call gb_DescriptionTranslateTarget_get_clean_target,%) $(call gb_DescriptionTranslateTarget_get_clean_target,%) : @@ -195,6 +201,7 @@ $(dir $(call gb_Dictionary_get_target,%))%/.dir : $(call gb_Dictionary_get_target,%) : $(call gb_Output_announce,$*,$(true),DIC,3) + $(call gb_Trace_MakeMark,$*,DIC) touch $@ .PHONY : $(call gb_Dictionary_get_clean_target,%) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index f23165e1d7bb..e069acf325f7 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -72,12 +72,15 @@ $(call gb_Extension__get_preparation_target,%) : ifeq ($(strip $(gb_WITH_LANG)),) $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Helper_LANGSTARGET) $(call gb_Output_announce,$*/description.xml,$(true),CPY,3) + $(call gb_Trace_StartRange,$*/description.xml,CPY) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_Extension_get_workdir,$*) && \ cp -f $(LOCATION)/description.xml $@) + $(call gb_Trace_EndRange,$*/description.xml,CPY) else $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS) $(gb_Helper_LANGSTARGET) $(call gb_Output_announce,$*/description.xml,$(true),XRM,3) + $(call gb_Trace_StartRange,$*/description.xml,XRM) MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_Extension_get_workdir,$*) && \ @@ -87,6 +90,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXDEPS) $ -m $${MERGEINPUT} \ -l all) && \ rm -rf $${MERGEINPUT} + $(call gb_Trace_EndRange,$*/description.xml,XRM) endif @@ -95,6 +99,7 @@ endif $(call gb_Extension_get_target,%) : \ $(call gb_Extension_get_workdir,%)/description.xml $(call gb_Output_announce,$*,$(true),OXT,3) + $(call gb_Trace_StartRange,$*,OXT) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_Extension_get_rootdir,$*)/META-INF \ $(if $(LICENSE),$(call gb_Extension_get_rootdir,$*)/registration) && \ @@ -107,6 +112,7 @@ $(call gb_Extension_get_target,%) : \ $(gb_Extension_ZIPCOMMAND) -rX --filesync --must-match \ $(call gb_Extension_get_target,$*) \ `cat $${ZIPFILES} | tr -d '\r'` && rm $${ZIPFILES}) + $(call gb_Trace_EndRange,$*,OXT) # set file list and location of manifest and description files # register target and clean target @@ -304,6 +310,7 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) \ $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) \ $(gb_Extension_PROPMERGEDEPS) $$(call gb_Output_announce,$(2),$(true),PRP,3) + $$(call gb_Trace_StartRange,$(2),PRP) $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) && \ $(if $(filter qtz,$(4)), \ @@ -319,6 +326,7 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) \ ) \ ) \ ) + $$(call gb_Trace_EndRange,$(2),PRP) endef @@ -354,6 +362,7 @@ $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \ $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \ $(2)/$(or $(4),$(3)) $$(call gb_Output_announce,$(1) $(3) $(5),$(true),XHP,3) + $$(call gb_Trace_StartRange,$(1) $(3) $(5),XHP) $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) && \ $(if $(filter qtz,$(5)), \ @@ -371,6 +380,7 @@ $(call gb_Extension_get_workdir,$(1))/help/$(5)/$(3) : \ ) && \ touch $(call gb_Extension_get_rootdir,$(1))/help/$(5)-xhp.done \ ) + $$(call gb_Trace_EndRange,$(1) $(3) $(5),XHP) endef @@ -405,6 +415,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \ $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \ $(2)/$(or $(4),$(3)) $$(call gb_Output_announce,$(1) $(3) $(5),$(true),TRE,3) + $$(call gb_Trace_StartRange,$(1) $(3) $(5),TRE) $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(dir $$@) && \ $(if $(filter qtz,$(5)), \ @@ -424,6 +435,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \ ) \ ) \ ) + $$(call gb_Trace_EndRange,$(1) $(3) $(5),XHP) endef @@ -442,6 +454,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \ $(SRCDIR)/xmlhelp/util/idxcontent.xsl | \ $(call gb_Extension_get_rootdir,$(1))/help/.dir $$(call gb_Output_announce,$(1) $(2),$(true),XHC,3) + $$(call gb_Trace_StartRange,$(1) $(2),XHC) $$(call gb_Helper_abbreviate_dirs, \ mkdir -p $$(basename $$@) && \ $$(gb_Extension_HELPLINKERCOMMAND) -mod help \ @@ -458,6 +471,7 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(2).done : \ -dir $$(basename $$@) && \ rm -fr $$(basename $$@)/caption $$(basename $$@)/content && \ touch $$@) + $$(call gb_Trace_EndRange,$(1) $(2),XHC) endef diff --git a/solenv/gbuild/ExtensionPackage.mk b/solenv/gbuild/ExtensionPackage.mk index e2c99a4764b6..6a86aa0270b6 100644 --- a/solenv/gbuild/ExtensionPackage.mk +++ b/solenv/gbuild/ExtensionPackage.mk @@ -23,12 +23,14 @@ $(call gb_ExtensionPackage_get_preparation_target,%) : $(call gb_ExtensionPackage_get_target,%) : $(call gb_Output_announce,$*,$(true),OXP,3) + $(call gb_Trace_StartRange,$*,OXP) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) \ && rm -rf $(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$* \ && unzip -q $(ZIPFILE) -d $(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$* \ && zipinfo -1 $(ZIPFILE) | grep -v '/$$' \ | sed s+^+$(INSTROOT)/$(LIBO_SHARE_FOLDER)/extensions/$*/+ > $@) + $(call gb_Trace_EndRange,$*,OXP) # call gb_ExtensionPackage_ExtensionPackage_internal,package,oxt define gb_ExtensionPackage_ExtensionPackage_internal @@ -69,6 +71,7 @@ $(call gb_ExtensionPackageSet_get_clean_target,%) : $(call gb_ExtensionPackageSet_get_target,%) : $(call gb_Output_announce,$*,$(true),OXS,3) + $(call gb_Trace_MakeMark,$*,OXS) mkdir -p $(dir $@) && touch $@ # call gb_ExtensionPackageSet_ExtensionPackageSet,set diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index 670106bd95bd..05bfa6d0cd18 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -30,6 +30,7 @@ $(dir $(call gb_ExternalPackage_get_target,%))%/.dir : $(call gb_ExternalPackage_get_target,%) : $(call gb_Output_announce,$*,$(true),EPK,2) + $(call gb_Trace_MakeMark,$*,EPK) touch $@ $(call gb_ExternalPackage_get_clean_target,%) : diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk index 402437d6f567..afb76c3a19d8 100644 --- a/solenv/gbuild/ExternalProject.mk +++ b/solenv/gbuild/ExternalProject.mk @@ -57,6 +57,7 @@ $(call gb_ExternalProject_get_preparation_target,%) : $(call gb_ExternalProject_get_target,%) : $(call gb_Output_announce,$*,$(true),PRJ,3) + $(call gb_Trace_MakeMark,$*,PRJ) touch $@ .PHONY : $(call gb_ExternalProject_get_clean_target,%) diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index 17569a626e6f..0869750683b9 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -15,7 +15,6 @@ gb_Gallery_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.pl gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery define gb_Gallery__command -$(call gb_Output_announce,$(2),$(true),GAL,1) $(call gb_Helper_abbreviate_dirs,\ rm -f $(call gb_Gallery_get_workdir,$(2))/* && \ RESPONSEFILE=$(call var2file,$(shell $(call gb_MKTEMP)),100,$(GALLERY_FILES)) && \ @@ -34,7 +33,6 @@ $(call gb_Helper_abbreviate_dirs,\ endef define gb_Gallery__command_str -$(call gb_Output_announce,$(2),$(true),STR,1) cp -f $(GALLERY_STRFILE) $@ && \ $(PERL) $(gb_Gallery_TRANSLATE) \ --ext "str" --key "name" \ @@ -52,7 +50,10 @@ $(dir $(call gb_Gallery_get_target,$(1)))%/.dir : $(call gb_Gallery_get_target,%) : \ $(call gb_Executable_get_runtime_dependencies,gengal) + $(call gb_Output_announce,$*,$(true),GAL,1) + $(call gb_Trace_StartRange,$*,GAL) $(call gb_Gallery__command,$@,$*) + $(call gb_Trace_EndRange,$*,GAL) $(call gb_Gallery__get_final_target,%) : touch $@ @@ -65,7 +66,10 @@ $(call gb_Gallery_get_workdir,%).ulf : \ $(gb_POLOCATION)/$(lang)/extras/source/gallery/share.po)) $(call gb_Gallery_get_workdir,%).str : $(gb_Gallery_TRANSLATE) + $(call gb_Output_announce,$*,$(true),STR,1) + $(call gb_Trace_StartRange,$*,STR) $(call gb_Gallery__command_str,$@,$*) + $(call gb_Trace_EndRange,$*,STR) # there must be a rule for these since they are targets due to Package $(call gb_Gallery_get_workdir,%).sdg : diff --git a/solenv/gbuild/GeneratedPackage.mk b/solenv/gbuild/GeneratedPackage.mk index 05bbcf43a93e..92f176436989 100644 --- a/solenv/gbuild/GeneratedPackage.mk +++ b/solenv/gbuild/GeneratedPackage.mk @@ -35,6 +35,7 @@ $(call gb_GeneratedPackage_get_target,%) :| $(foreach pair,$(PACKAGE_DIRS),$(PAC # on windows with all languages the processing of help can truncate the find command otherwise $(call gb_GeneratedPackage_get_target,%) : $(call gb_Output_announce,$*,$(true),GPK,2) + $(call gb_Trace_StartRange,$*,GPK) $(if $(PACKAGE_DIRS),,$(call gb_Output_error,no dirs were added)) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \ @@ -44,6 +45,7 @@ $(call gb_GeneratedPackage_get_target,%) : $(call gb_Helper_abbreviate_dirs,\ $(FIND) $(foreach pair,$(PACKAGE_DIRS),$(call gb_GeneratedPackage__get_destdir,$(pair))) \( -type f -o -type l \) -print | LC_ALL=C $(SORT) > $@ \ ) + $(call gb_Trace_EndRange,$*,GPK) .PHONY : $(call gb_GeneratedPackage_get_clean_target,%) $(call gb_GeneratedPackage_get_clean_target,%) : diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk index 821ed59ff68c..780fb55aebc6 100644 --- a/solenv/gbuild/HelpTarget.mk +++ b/solenv/gbuild/HelpTarget.mk @@ -37,7 +37,6 @@ gb_HelpTranslatePartTarget_DEPS := $(call gb_Executable_get_runtime_dependencies gb_HelpTranslatePartTarget_COMMAND := $(call gb_Executable_get_command,helpex) define gb_HelpTranslatePartTarget__command -$(call gb_Output_announce,$(2),$(true),HPX,1) HELPFILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(sort $(filter %.xhp,$(3)))) && \ $(call gb_Helper_abbreviate_dirs, \ $(if $(filter-out qtz,$(HELP_LANG)), \ @@ -65,7 +64,10 @@ $(dir $(call gb_HelpTranslatePartTarget_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_HelpTranslatePartTarget_get_target,%) : $(gb_HelpTranslatePartTarget_DEPS) + $(call gb_Output_announce,$*,$(true),HPX,1) + $(call gb_Trace_StartRange,$*,HPX) $(call gb_HelpTranslatePartTarget__command,$@,$*,$^) + $(call gb_Trace_EndRange,$*,HPX) .PHONY : $(call gb_HelpTranslatePartTarget_get_clean_target,%) $(call gb_HelpTranslatePartTarget_get_clean_target,%) : @@ -116,6 +118,7 @@ $(dir $(call gb_HelpTranslateTarget_get_target,%))%/.dir : $(call gb_HelpTranslateTarget_get_target,%) : $(call gb_Output_announce,$*,$(true),XHP,2) + $(call gb_Trace_MakeMark,$*,XHP) touch $@ $(call gb_HelpTranslateTarget__get_any_translated_target,%) : @@ -186,7 +189,6 @@ gb_HelpTreeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,treex) gb_HelpTreeTarget_COMMAND := $(call gb_Executable_get_command,treex) define gb_HelpTreeTarget__command -$(call gb_Output_announce,$(2),$(true),TRE,1) $(call gb_Helper_abbreviate_dirs,\ $(if $(filter-out qtz,$(HELP_LANG)), \ POFILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \ @@ -218,7 +220,10 @@ $(dir $(call gb_HelpTreeTarget_get_target,%))%/.dir : $(call gb_HelpTreeTarget_get_target,%) : $(gb_HelpTreeTarget_DEPS) $(if $(HELP_TEXTDIR),,$(call gb_Output_error,HelpTreeTarget: no help text dir for .tree was set)) $(if $(HELP_TREE),,$(call gb_Output_error,HelpTreeTarget: no .tree file to translate was set)) + $(call gb_Output_announce,$*,$(true),TRE,1) + $(call gb_Trace_StartRange,$*,TRE) $(call gb_HelpTreeTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,TRE) .PHONY : $(call gb_HelpTreeTarget_get_clean_target,%) $(call gb_HelpTreeTarget_get_clean_target,%) : @@ -284,7 +289,6 @@ gb_HelpLinkTarget_DEPS := \ # the index files in the .idxl dir are created by HelpIndexer, # the ones outside the dir by HelpLinker define gb_HelpLinkTarget__command -$(call gb_Output_announce,$(2),$(true),HLK,3) $(if $(HELP_INDEXED),rm -rf $(addprefix $(HELP_WORKDIR)/,$(HELP_INDEXED)) && \) RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ -lang $(HELP_LANG) \ @@ -320,7 +324,10 @@ $(dir $(call gb_HelpLinkTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_HelpLinkTarget_get_target,%) : $(gb_HelpLinkTarget_DEPS) + $(call gb_Output_announce,$*,$(true),HLK,3) + $(call gb_Trace_StartRange,$*,HLK) $(call gb_HelpLinkTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,HLK) .PHONY : $(call gb_HelpLinkTarget_get_clean_target,%) $(call gb_HelpLinkTarget_get_clean_target,%) : @@ -428,7 +435,6 @@ gb_HelpIndexTarget_COMMAND := $(call gb_Executable_get_command,HelpIndexer) # first delete the index stuff since when it is generated an existing _0.cfs # will not be overwritten; instead a new _1.cfs etc. created until disk is full define gb_HelpIndexTarget__command -$(call gb_Output_announce,$*,$(true),HIX,3) $(call gb_Helper_abbreviate_dirs,\ (\ rm -rf $(HELP_WORKDIR)/$(HELP_MODULE).idxl \ @@ -449,7 +455,10 @@ $(dir $(call gb_HelpIndexTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_HelpIndexTarget_get_target,%) : $(gb_HelpIndexTarget_DEPS) + $(call gb_Output_announce,$*,$(true),HIX,3) + $(call gb_Trace_StartRange,$*,HIX) $(call gb_HelpIndexTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,HIX) .PHONY : $(call gb_HelpIndexTarget_get_clean_target,%) $(call gb_HelpIndexTarget_get_clean_target,%) : @@ -475,7 +484,6 @@ endef gb_HelpJarTarget_COMMAND := zip define gb_HelpJarTarget__get_command -$(call gb_Output_announce,$*,$(true),HEJ,3) cd $(HELP_WORKDIR) && \ $(gb_HelpJarTarget_COMMAND) -q -0 -rX --filesync --must-match $(HELP_MODULE).jar text/$(HELP_MODULE) && \ touch $@ @@ -488,7 +496,10 @@ $(dir $(call gb_HelpJarTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_HelpJarTarget_get_target,%) : + $(call gb_Output_announce,$*,$(true),HEJ,3) + $(call gb_Trace_StartRange,$*,HEJ) $(call gb_HelpJarTarget__get_command,$@,$*) + $(call gb_Trace_EndRange,$*,HEJ) $(call gb_HelpJarTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),HEJ,3) @@ -543,6 +554,7 @@ endef define gb_HelpTarget__command $(if $(ENABLE_HTMLHELP),,$(call gb_Output_announce,$(2),$(true),HLP,4)) +$(if $(ENABLE_HTMLHELP),,$(call gb_Trace_MakeMark,$(2),HLP)) touch $@ endef diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk index 162af86fc2a8..ba009e0306aa 100644 --- a/solenv/gbuild/InstallModule.mk +++ b/solenv/gbuild/InstallModule.mk @@ -14,6 +14,7 @@ $(dir $(call gb_InstallModule_get_target,%))%/.dir : $(call gb_InstallModule_get_target,%) : $(call gb_Output_announce,$*,$(true),IMO,3) + $(call gb_Trace_MakeMark,$*,IMO) $(if $(INSTALL_MODULE_DEFINED),,$(call gb_Output_error,Something depends on install module $* which does not exist.)) touch $@ diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index d24b201550cf..3ae5f67e0839 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -25,7 +25,6 @@ endef gb_ScpTemplateTarget_get_source = $(SRCDIR)/$(1).sct define gb_ScpTemplateTarget__command -$(call gb_Output_announce,$(2),$(true),SCT,1) $(call gb_Helper_abbreviate_dirs,\ export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \ $(gb_ScpTemplateTarget_COMMAND) \ @@ -41,7 +40,10 @@ $(dir $(call gb_ScpTemplateTarget_get_target,%))%/.dir : # depend on configure output to rebuild everything $(call gb_ScpTemplateTarget_get_target,%) : \ $(gb_ScpTemplateTarget_TARGET) $(BUILDDIR)/config_$(gb_Side).mk + $(call gb_Output_announce,$*,$(true),SCT,1) + $(call gb_Trace_StartRange,$*,SCT) $(call gb_ScpTemplateTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,SCT) .PHONY : $(call gb_ScpTemplateTarget_get_clean_target,%) $(call gb_ScpTemplateTarget_get_clean_target,%) : @@ -64,7 +66,6 @@ gb_ScpPreprocessTarget_COMMAND := $(call gb_Executable_get_command,cpp) gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp define gb_ScpPreprocessTarget__command -$(call gb_Output_announce,$(2),$(true),SPP,2) $(call gb_Helper_abbreviate_dirs,\ $(gb_ScpPreprocessTarget_COMMAND) \ -+ -P \ @@ -81,7 +82,10 @@ $(dir $(call gb_ScpPreprocessTarget_get_target,%))%/.dir : # depend on configure output to rebuild everything $(call gb_ScpPreprocessTarget_get_target,%) : \ $(gb_ScpPreprocessTarget_DEPS) $(BUILDDIR)/config_$(gb_Side).mk + $(call gb_Output_announce,$*,$(true),SPP,2) + $(call gb_Trace_StartRange,$*,SPP) $(call gb_ScpPreprocessTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,SPP) .PHONY : $(call gb_ScpPreprocessTarget_get_clean_target,%) $(call gb_ScpPreprocessTarget_get_clean_target,%) : @@ -133,7 +137,6 @@ gb_ScpTarget_TARGET := $(SRCDIR)/solenv/bin/pre2par.pl gb_ScpTarget_COMMAND := $(PERL) $(gb_ScpTarget_TARGET) define gb_ScpTarget__command -$(call gb_Output_announce,$(2),$(true),SCP,2) $(call gb_Helper_abbreviate_dirs,\ $(gb_ScpTarget_COMMAND) -l $(SCP_ULF) -s $(SCP_SOURCE) -o $(1) \ ) @@ -143,7 +146,10 @@ $(dir $(call gb_ScpTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_ScpTarget_get_target,%) : $(gb_ScpTarget_TARGET) + $(call gb_Output_announce,$*,$(true),SCP,2) + $(call gb_Trace_StartRange,$*,SCP) $(call gb_ScpTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,SCP) $(call gb_ScpTarget_get_external_target,%) : touch $@ @@ -188,7 +194,6 @@ endef # gb_InstallModuleTarget_InstallModuleTarget_platform define gb_InstallModuleTarget__command -$(call gb_Output_announce,$(2),$(true),INM,3) $(call gb_Helper_abbreviate_dirs,\ rm -f $(1) \ $(foreach scpfile,$(SCP_FILES),&& echo $(scpfile) >> $(1)) \ @@ -199,7 +204,10 @@ $(dir $(call gb_InstallModuleTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_InstallModuleTarget_get_target,%) : + $(call gb_Output_announce,$*,$(true),INM,3) + $(call gb_Trace_StartRange,$*,INM) $(call gb_InstallModuleTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,INM) $(call gb_InstallModuleTarget_get_external_target,%) : touch $@ diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk index 593bd3e0861b..afc89e95ea6f 100644 --- a/solenv/gbuild/InstallScript.mk +++ b/solenv/gbuild/InstallScript.mk @@ -28,7 +28,6 @@ $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2)) endef define gb_InstallScript__command -$(call gb_Output_announce,$(2),$(true),INS,4) $(call gb_Helper_abbreviate_dirs,\ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ $(call gb_InstallScript__make_arglist,\ @@ -50,7 +49,10 @@ $(dir $(call gb_InstallScript_get_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_InstallScript_get_target,%) : $(gb_InstallScript_TARGET) + $(call gb_Output_announce,$*,$(true),INS,4) + $(call gb_Trace_StartRange,$*,INS) $(call gb_InstallScript__command,$@,$*) + $(call gb_Trace_EndRange,$*,INS) .PHONY : $(call gb_InstallScript_get_clean_target,%) $(call gb_InstallScript_get_clean_target,%) : diff --git a/solenv/gbuild/InternalUnoApi.mk b/solenv/gbuild/InternalUnoApi.mk index 296c783f35fc..dae0cb503c48 100644 --- a/solenv/gbuild/InternalUnoApi.mk +++ b/solenv/gbuild/InternalUnoApi.mk @@ -15,6 +15,7 @@ $(dir $(call gb_InternalUnoApi_get_target,%))%/.dir : $(call gb_InternalUnoApi_get_target,%) : $(call gb_Output_announce,$*,$(true),UNI,5) \ + $(call gb_Trace_MakeMark,$*,UNI) touch $@ .PHONY : $(call gb_InternalUnoApi_get_clean_target,%) diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 84d41921f972..76385702f1ab 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -54,7 +54,6 @@ gb_Jar_get_install_target = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_ # the archive with the main class hierarchy and then updating it from # the other one(s), which seems to work .-) define gb_Jar__command - $(call gb_Output_announce,$(1),$(true),JAR,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_Jar_get_workdir,$(1))/META-INF && \ echo Manifest-Version: 1.0 > $(call gb_Jar_get_manifest_target,$(1)) && \ @@ -79,7 +78,10 @@ $(call gb_Jar_get_clean_target,%) : $(call gb_JavaClassSet_get_clean_target,$(ca # rule for creating the jar file using the command defined above $(WORKDIR)/Jar/%.jar : + $(call gb_Output_announce,$*,$(true),JAR,3) + $(call gb_Trace_StartRange,$*,JAR) $(call gb_Jar__command,$*,$@) + $(call gb_Trace_EndRange,$*,JAR) # call gb_Jar__make_installed_rule,jar define gb_Jar__make_installed_rule diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index ee94a6525c26..dc7d02e8904a 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -50,7 +50,9 @@ endef $(call gb_JavaClassSet_get_target,%) : $(call gb_Output_announce,$*,$(true),JCS,3) + $(call gb_Trace_StartRange,$*,JCS) $(call gb_JavaClassSet__command,$@,$*,$?,$^) + $(call gb_Trace_EndRange,$*,JCS) $(call gb_JavaClassSet_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),JCS,3) diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index e5fab5eae68e..290fab3af4c8 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -36,6 +36,7 @@ ifneq ($(gb_SUPPRESS_TESTS),) @true else $(call gb_Output_announce,$*,$(true),JUT,2) + $(call gb_Trace_StartRange,$*,JUT) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(call gb_JunitTest_get_userdir,$*) && \ mkdir -p $(call gb_JunitTest_get_userdir,$*)/user && \ @@ -56,6 +57,7 @@ else && echo \ && false))) $(CLEAN_CMD) + $(call gb_Trace_EndRange,$*,JUT) endif define gb_JunitTest_JunitTest diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index e71c6127d845..914c36d35cd2 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -83,7 +83,6 @@ gb_LinkTarget_LAYER_LINKPATHS := \ # # $(call gb_CObject__tool_command,relative-source,source) define gb_CObject__tool_command -$(call gb_Output_announce,$(1).c,$(true),C ,3) $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CC) \ @@ -100,7 +99,6 @@ $(call gb_Helper_abbreviate_dirs,\ ) endef define gb_ObjCObject__tool_command -$(call gb_Output_announce,$(1).m,$(true),OCC,3) $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CC) \ @@ -117,7 +115,6 @@ $(call gb_Helper_abbreviate_dirs,\ ) endef define gb_CxxObject__tool_command -$(call gb_Output_announce,$(1).cxx,$(true),CXX,3) $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CXX) \ @@ -134,7 +131,6 @@ $(call gb_Helper_abbreviate_dirs,\ ) endef define gb_ObjCxxObject__tool_command -$(call gb_Output_announce,$(1).mm,$(true),OCX,3) $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CXX) \ @@ -151,7 +147,6 @@ $(call gb_Helper_abbreviate_dirs,\ ) endef define gb_CxxClrObject__tool_command -$(call gb_Output_announce,$(1).cxx,$(true),CLR,3) $(call gb_Helper_abbreviate_dirs,\ ICECC=no CCACHE_DISABLE=1 \ $(gb_CXX) \ @@ -233,11 +228,16 @@ gb_CObject_get_source = $(1)/$(2).c ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),) $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET) + $(call gb_Output_announce,$*.c,$(true),C ,3) + $(call gb_Trace_StartRange,$*.c,C ) $(call gb_CObject__tool_command,$*,$<) + $(call gb_Trace_EndRange,$*.c,C ) else $(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%) $(call gb_Output_announce,$*.c,$(true),$(if $(COMPILER_TEST),C? ,C ),3) + $(call gb_Trace_StartRange,$*.c,$(if $(COMPILER_TEST),C? ,C )) $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$<,$(call gb_CObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS)) + $(call gb_Trace_EndRange,$*.c,$(if $(COMPILER_TEST),C? ,C )) endif # Note: if the *Object_dep_target does not exist it will be created by @@ -290,12 +290,17 @@ endef ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),) $(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET) + $(call gb_Output_announce,$*.cxx,$(true),CXX,3) + $(call gb_Trace_StartRange,$*.cxx,CXX) $(call gb_CxxObject__tool_command,$*,$<) + $(call gb_Trace_EndRange,$*.cxx,CXX) else $(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SRCDIR),%) $(call gb_Output_announce,$*.cxx,$(true),$(if $(COMPILER_TEST),CPT,CXX),3) + $(call gb_Trace_StartRange,$*.cxx,$(if $(COMPILER_TEST),CPT,CXX)) $(eval $(gb_CxxObject__set_pchflags)) $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND) $(if $(COMPILER_TEST),$(gb_COMPILER_TEST_FLAGS)),$<,$(call gb_CxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS)) + $(call gb_Trace_EndRange,$*.cxx,$(if $(COMPILER_TEST),CPT,CXX)) endif ifeq ($(gb_FULLDEPS),$(true)) @@ -317,8 +322,10 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c $(call gb_GenCObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET) $(call gb_Output_announce,$*.c,$(true),C ,3) + $(call gb_Trace_StartRange,$*.c,C ) test -f $(call gb_GenCObject_get_source,$*) || (echo "Missing generated source file $(call gb_GenCObject_get_source,$*)" && false) $(call gb_CObject__command_pattern,$@,$(T_CFLAGS) $(T_CFLAGS_APPEND),$(call gb_GenCObject_get_source,$*),$(call gb_GenCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS)) + $(call gb_Trace_EndRange,$*.c,C ) ifeq ($(gb_FULLDEPS),$(true)) $(dir $(call gb_GenCObject_get_dep_target,%)).dir : @@ -339,9 +346,11 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).$(gb_LinkTarget_CXX_SUFFIX_$(call g $(call gb_GenCxxObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET) $(call gb_Output_announce,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),$(true),CXX,3) + $(call gb_Trace_StartRange,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),CXX) test -f $(GEN_CXX_SOURCE) || (echo "Missing generated source file $(GEN_CXX_SOURCE)" && false) $(eval $(gb_CxxObject__set_pchflags)) $(call gb_CObject__command_pattern,$@,$(T_CXXFLAGS) $(T_CXXFLAGS_APPEND),$(GEN_CXX_SOURCE),$(call gb_GenCxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS)) + $(call gb_Trace_EndRange,$(subst $(BUILDDIR)/,,$(GEN_CXX_SOURCE)),CXX) ifeq ($(gb_FULLDEPS),$(true)) $(dir $(call gb_GenCxxObject_get_dep_target,%)).dir : @@ -362,8 +371,10 @@ gb_GenCxxClrObject_get_source = $(WORKDIR)/$(1).$(gb_LinkTarget_CXX_SUFFIX_$(cal $(call gb_GenCxxClrObject_get_target,%) : $(gb_FORCE_COMPILE_ALL_TARGET) $(call gb_Output_announce,$(subst $(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),$(true),CLR,3) + $(call gb_Trace_StartRange,$(subst $(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),CLR) test -f $(GEN_CXXCLR_SOURCE) || (echo "Missing generated source file $(GEN_CXXCLR_SOURCE)" && false) $(call gb_CObject__command_pattern,$@,$(T_CXXCLRFLAGS) $(T_CXXCLRFLAGS_APPEND),$(GEN_CXXCLR_SOURCE),$(call gb_GenCxxClrObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS)) + $(call gb_Trace_EndRange,$(subst $(BUILDDIR)/,,$(GEN_CXXCLR_SOURCE)),CLR) ifeq ($(gb_FULLDEPS),$(true)) $(dir $(call gb_GenCxxClrObject_get_dep_target,%)).dir : @@ -416,7 +427,10 @@ $(call gb_LexTarget_get_clean_target,%) : rm -f $(call gb_LexTarget_get_scanner_target,$*) $(call gb_LexTarget_get_target,$*)) $(call gb_LexTarget_get_target,%) : $(call gb_LexTarget_get_source,$(SRCDIR),%) + $(call gb_Output_announce,$*,$(true),LEX,3) + $(call gb_Trace_StartRange,$*,LEX) $(call gb_LexTarget__command,$<,$*,$@,$(call gb_LexTarget_get_scanner_target,$*)) + $(call gb_Trace_EndRange,$*,LEX) # gb_LexTarget_LexTarget(scanner-file) define gb_LexTarget_LexTarget @@ -427,7 +441,6 @@ endef # gb_LexTarget__command(scanner-file, stem-for-message, done-pseudo-target, source-target) define gb_LexTarget__command -$(call gb_Output_announce,$(2),$(true),LEX,3) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(3)) && \ $(FLEX) $(T_LEXFLAGS) -o$(4) $(1) && touch $(3) ) @@ -441,11 +454,16 @@ gb_ObjCxxObject_get_source = $(1)/$(2).mm ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),) $(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET) + $(call gb_Output_announce,$*.mm,$(true),OCX,3) + $(call gb_Trace_StartRange,$*.mm,OCX) $(call gb_ObjCxxObject__tool_command,$*,$<) + $(call gb_Trace_EndRange,$*.mm,OCX) else $(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDIR),%) $(call gb_Output_announce,$*.mm,$(true),$(if $(COMPILER_TEST),O?X,OCX),3) + $(call gb_Trace_StartRange,$*.mm,$(if $(COMPILER_TEST),O?X,OCX)) $(call gb_CObject__command_pattern,$@,$(T_OBJCXXFLAGS) $(T_OBJCXXFLAGS_APPEND),$<,$(call gb_ObjCxxObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS)) + $(call gb_Trace_EndRange,$*.mm,$(if $(COMPILER_TEST),O?X,OCX)) endif ifeq ($(gb_FULLDEPS),$(true)) @@ -468,11 +486,16 @@ gb_ObjCObject_get_source = $(1)/$(2).m ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),) $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET) + $(call gb_Output_announce,$*.m,$(true),OCC,3) + $(call gb_Trace_StartRange,$*.m,OCC) $(call gb_ObjCObject__tool_command,$*,$<) + $(call gb_Trace_EndRange,$*.m,OCC) else $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) $(call gb_Output_announce,$*.m,$(true),$(if $(COMPILER_TEST),O?C,OCC),3) + $(call gb_Trace_StartRange,$*.m,$(if $(COMPILER_TEST),O?C,OCC)) $(call gb_CObject__command_pattern,$@,$(T_OBJCFLAGS) $(T_OBJCFLAGS_APPEND),$<,$(call gb_ObjCObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS)) + $(call gb_Trace_EndRange,$*.m,$(if $(COMPILER_TEST),O?C,OCC)) endif ifeq ($(gb_FULLDEPS),$(true)) @@ -495,11 +518,16 @@ gb_CxxClrObject_get_source = $(1)/$(2).cxx ifneq ($(COMPILER_EXTERNAL_TOOL)$(COMPILER_PLUGIN_TOOL),) $(call gb_CxxClrObject_get_target,%) : $(call gb_CxxClrObject_get_source,$(SRCDIR),%) $(gb_FORCE_COMPILE_ALL_TARGET) + $(call gb_Output_announce,$*.cxx,$(true),CLR,3) + $(call gb_Trace_StartRange,$*.cxx,CLR) $(call gb_CxxClrObject__tool_command,$*,$<) + $(call gb_Trace_EndRange,$*.cxx,CLR) else $(call gb_CxxClrObject_get_target,%) : $(call gb_CxxClrObject_get_source,$(SRCDIR),%) $(call gb_Output_announce,$*.cxx,$(true),$(if $(COMPILER_TEST),C?R,CLR),3) + $(call gb_Trace_StartRange,$*.cxx,$(if $(COMPILER_TEST),C?R,CLR)) $(call gb_CObject__command_pattern,$@,$(T_CXXCLRFLAGS) $(T_CXXCLRFLAGS_APPEND),$<,$(call gb_CxxClrObject_get_dep_target,$*),$(COMPILER_PLUGINS),$(T_SYMBOLS)) + $(call gb_Trace_EndRange,$*.cxx,$(if $(COMPILER_TEST),C?R,CLR)) endif ifeq ($(gb_FULLDEPS),$(true)) @@ -584,6 +612,7 @@ $(WORKDIR)/Clean/LinkTarget/% : # call gb_LinkTarget__command_dep,dep_target,linktargetname define gb_LinkTarget__command_dep $(call gb_Output_announce,LNK:$(2),$(true),DEP,1) + $(call gb_Trace_StartRange,LNK:$(2),DEP) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ @@ -599,6 +628,7 @@ $(call gb_Helper_abbreviate_dirs,\ ) && \ $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \ rm -f $${RESPONSEFILE} + $(call gb_Trace_EndRange,LNK:$(2),DEP) endef @@ -649,16 +679,16 @@ endef # (especially since external libraries are delivered via Package) # call gb_LinkTarget__command_impl,linktargettarget,linktargetname define gb_LinkTarget__command_impl - $(if $(gb_FULLDEPS),\ - $(if $(findstring concat-deps,$(2)),,\ - $(call gb_LinkTarget__command_dep,$(call gb_LinkTarget_get_dep_target,$(2)).tmp,$(2)) \ + $(if $(gb_FULLDEPS), + $(if $(findstring concat-deps,$(2)),, + $(call gb_LinkTarget__command_dep,$(call gb_LinkTarget_get_dep_target,$(2)).tmp,$(2)) mv $(call gb_LinkTarget_get_dep_target,$(2)).tmp $(call gb_LinkTarget_get_dep_target,$(2)))) - $(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library__get_workdir_linktargetname,$(lib)))),\ - $(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$(2))),\ - $(call gb_LinkTarget__command,$(1),$(2)),\ - mkdir -p $(dir $(1)) && echo invalid - merged lib > $(1) \ - $(if $(SOVERSIONSCRIPT),&& echo invalid - merged lib > $(WORKDIR)/LinkTarget/$(2))),\ - $(if $(filter-out CompilerTest,$(TARGETTYPE)), \ + $(if $(filter $(2),$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library__get_workdir_linktargetname,$(lib)))), + $(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$(2))), + $(call gb_LinkTarget__command,$(1),$(2)), + mkdir -p $(dir $(1)) && echo invalid - merged lib > $(1) + $(if $(SOVERSIONSCRIPT),&& echo invalid - merged lib > $(WORKDIR)/LinkTarget/$(2))), + $(if $(filter-out CompilerTest,$(TARGETTYPE)), $(call gb_LinkTarget__command,$(1),$(2)))) $(call gb_LinkTarget__command_objectlist,$(WORKDIR)/LinkTarget/$(2).objectlist) endef diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index aa3b1cb19485..d419ecbc069c 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -65,6 +65,7 @@ gb_Module_CURRENTMAKEFILE := $(call gb_Module_get_nonl10n_target,%) : $(call gb_Output_announce,$*,$(true),BIN,5) + $(call gb_Trace_MakeMark,$*,BIN) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ touch $@) @@ -78,6 +79,7 @@ $(call gb_Module_get_clean_target,%) : $(call gb_Module_get_l10n_target,%) : $(call gb_Output_announce,$*,$(true),LOC,5) + $(call gb_Trace_MakeMark,$*,LOC) $(call gb_Output_announce_title,module $* done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -85,6 +87,7 @@ $(call gb_Module_get_l10n_target,%) : $(call gb_Module_get_check_target,%) : $(call gb_Output_announce,$*,$(true),CHK,5) + $(call gb_Trace_MakeMark,$*,CHK) $(call gb_Output_announce_title,module $* checks done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -92,6 +95,7 @@ $(call gb_Module_get_check_target,%) : $(call gb_Module_get_slowcheck_target,%) : $(call gb_Output_announce,$*,$(true),SLC,5) + $(call gb_Trace_MakeMark,$*,SLC) $(call gb_Output_announce_title,module $* slowchecks done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -99,6 +103,7 @@ $(call gb_Module_get_slowcheck_target,%) : $(call gb_Module_get_screenshot_target,%) : $(call gb_Output_announce,$*,$(true),SCR,5) + $(call gb_Trace_MakeMark,$*,SCR) $(call gb_Output_announce_title,module $* screenshots done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -106,6 +111,7 @@ $(call gb_Module_get_screenshot_target,%) : $(call gb_Module_get_subsequentcheck_target,%) : $(call gb_Output_announce,$*,$(true),SCK,5) + $(call gb_Trace_MakeMark,$*,SCK) $(call gb_Output_announce_title,module $* subsequentchecks done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -113,6 +119,7 @@ $(call gb_Module_get_subsequentcheck_target,%) : $(call gb_Module_get_stagingcheck_target,%) : $(call gb_Output_announce,$*,$(true),STC,5) + $(call gb_Trace_MakeMark,$*,STC) $(call gb_Output_announce_title,module $* stagingchecks done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -120,6 +127,7 @@ $(call gb_Module_get_stagingcheck_target,%) : $(call gb_Module_get_perfcheck_target,%) : $(call gb_Output_announce,$*,$(true),PFC,5) + $(call gb_Trace_MakeMark,$*,PFC) $(call gb_Output_announce_title,module $* perfchecks done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -127,6 +135,7 @@ $(call gb_Module_get_perfcheck_target,%) : $(call gb_Module_get_uicheck_target,%) : $(call gb_Output_announce,$*,$(true),UIT,5) + $(call gb_Trace_MakeMark,$*,UIT) $(call gb_Output_announce_title,module $* uicheck done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -134,6 +143,7 @@ $(call gb_Module_get_uicheck_target,%) : $(call gb_Module_get_target,%) : $(call gb_Output_announce,$*,$(true),MOD,5) + $(call gb_Trace_MakeMark,$*,MOD) $(call gb_Output_announce_title,module $* done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -147,24 +157,28 @@ all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowche ifeq ($(gb_Side),build) build-tools : $(gb_BUILD_TOOLS) $(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6) + $(call gb_Trace_MakeMark,$(gb_BUILD_TOOLS),ALL) $(call gb_Output_announce_title,build-tools done.) $(call gb_Output_announce_bell) endif build : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6) + $(call gb_Trace_MakeMark,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),ALL) $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),ALL,6)) $(call gb_Output_announce_title,build done.) $(call gb_Output_announce_bell) build-l10n-only : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),LOC,6) + $(call gb_Trace_MakeMark,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),LOC) $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),LOC,6)) $(call gb_Output_announce_title,l10n done.) $(call gb_Output_announce_bell) build-non-l10n-only : $(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),BIN,6) + $(call gb_Trace_MakeMark,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),BIN) $(if $(gb_VERBOSE),$(call gb_Output_announce,loaded modules: $(sort $(gb_Module_ALLMODULES)),$(true),BIN,6)) $(call gb_Output_announce_title,non-l10n done.) $(call gb_Output_announce_bell) @@ -233,6 +247,7 @@ translations : $(WORKDIR)/pot.done $(WORKDIR)/pot.done : $(foreach exec,cfgex helpex localize propex ulfex xrmex treex, \ $(call gb_Executable_get_target_for_build,$(exec))) $(call gb_Output_announce,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),$(true),POT,1) + $(call gb_Trace_MakeMark,$(subst .pot,,$(subst $(WORKDIR)/,,$@)),POT) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && $(call gb_Helper_execute,localize) $(SRCDIR) $(dir $@)/pot \ && $(FIND) $(dir $@)/pot -type f -printf "%P\n" | sed -e "s/\.pot/.po/" | LC_ALL=C $(SORT) > $(dir $@)/LIST \ diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 035a4af064f2..87de87cae617 100644 --- a/solenv/gbuild/Package.mk +++ b/solenv/gbuild/Package.mk @@ -79,9 +79,11 @@ $(call gb_Package_get_preparation_target,%) : # Package_foo makefiles. $(call gb_Package_get_target,%) : $(call gb_Output_announce,$*,$(true),PKG,2) + $(call gb_Trace_StartRange,$*,PKG) $(if $(PACKAGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.)) rm -f $@ && \ mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@ + $(call gb_Trace_EndRange,$*,PKG) # for other targets that want to create Packages, does not register at Module define gb_Package_Package_internal diff --git a/solenv/gbuild/PackageSet.mk b/solenv/gbuild/PackageSet.mk index 8ba3273f459b..e85c3eceaf5d 100644 --- a/solenv/gbuild/PackageSet.mk +++ b/solenv/gbuild/PackageSet.mk @@ -23,7 +23,9 @@ $(dir $(call gb_PackageSet_get_target,%))%/.dir : $(call gb_PackageSet_get_target,%) : $(call gb_Output_announce,$*,$(true),PKS,2) + $(call gb_Trace_StartRange,$*,PKS) cat $(sort $(FILELISTS)) > $@ + $(call gb_Trace_EndRange,$*,PKS) .PHONY : $(call gb_PackageSet_get_clean_target,%) $(call gb_PackageSet_get_clean_target,%) : diff --git a/solenv/gbuild/Pagein.mk b/solenv/gbuild/Pagein.mk index 1dd5cd692efd..606596ce29bf 100644 --- a/solenv/gbuild/Pagein.mk +++ b/solenv/gbuild/Pagein.mk @@ -17,7 +17,6 @@ $(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1) gb_Pagein__get_install_target = $(INSTROOT)/$(LIBO_BIN_FOLDER)/pagein-$(1) define gb_Pagein__command -$(call gb_Output_announce,$(2),$(true),PAG,5) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && rm -f $(1) \ && touch $(1) \ @@ -32,7 +31,10 @@ $(call gb_Pagein_get_clean_target,%) : rm -f $(call gb_Pagein__get_install_target,$*) $(call gb_Pagein_get_target,$*)) $(call gb_Pagein_get_target,%) : + $(call gb_Output_announce,$*,$(true),PAG,5) + $(call gb_Trace_StartRange,$*,PAG) $(call gb_Pagein__command,$@,$*,$^) + $(call gb_Trace_EndRange,$*,PAG) define gb_Pagein_Pagein $(call gb_Pagein_get_target,$(1)) : OBJECTS := diff --git a/solenv/gbuild/Postprocess.mk b/solenv/gbuild/Postprocess.mk index 5b20a6686cfe..2c1dfd2f454b 100644 --- a/solenv/gbuild/Postprocess.mk +++ b/solenv/gbuild/Postprocess.mk @@ -12,6 +12,7 @@ $(dir $(call gb_Postprocess_get_target,%)).dir : $(call gb_Postprocess_get_target,%) : $(call gb_Output_announce,$(POSTPROCESS_INFO): $(if $(POSTPROCESS_PREFIX),$(subst $(POSTPROCESS_PREFIX),,$^),$^),$(true),ALL,6) + $(call gb_Trace_MakeMark,$(POSTPROCESS_INFO): $(if $(POSTPROCESS_PREFIX),$(subst $(POSTPROCESS_PREFIX),,$^),$^),ALL) touch $@ .PHONY : $(call gb_Postprocess_get_clean_target,%) diff --git a/solenv/gbuild/PythonTest.mk b/solenv/gbuild/PythonTest.mk index 966cad821b98..52ecbffe7f1c 100644 --- a/solenv/gbuild/PythonTest.mk +++ b/solenv/gbuild/PythonTest.mk @@ -39,6 +39,7 @@ ifneq ($(gb_SUPPRESS_TESTS),) @true else $(call gb_Output_announce,$*,$(true),PYT,2) + $(call gb_Trace_StartRange,$*,PYT) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_PythonTest_get_target,$*)) && \ mkdir -p $(dir $(call gb_PythonTest_get_target,$*))user/user/autotext && \ @@ -65,6 +66,7 @@ else RET=$$?; \ $(call gb_CppunitTest_postprocess,$(gb_PythonTest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log 2>&1;) \ cat $@.log; $(gb_PythonTest_UNITTESTFAILED) Python $*)))) + $(call gb_Trace_EndRange,$*,PYT) endif # always use udkapi and URE services diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk index b9ccb49a3e2e..334a21cbc70a 100644 --- a/solenv/gbuild/Pyuno.mk +++ b/solenv/gbuild/Pyuno.mk @@ -21,6 +21,7 @@ $(dir $(call gb_Pyuno_get_target,%))%/.dir : $(call gb_Pyuno_get_target,%) : $(call gb_Output_announce,$*,$(true),PYU,3) + $(call gb_Trace_MakeMark,$*,PYU) touch $@ $(call gb_Pyuno_get_final_target,%) : diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk index 4e5f57810e82..337fcc858a3d 100644 --- a/solenv/gbuild/Rdb.mk +++ b/solenv/gbuild/Rdb.mk @@ -24,7 +24,9 @@ endef $(call gb_Rdb_get_target,%) :| $(call gb_ExternalExecutable_get_dependencies,xsltproc) $(call gb_Output_announce,$*,$(true),RDB,1) + $(call gb_Trace_StartRange,$*,RDB) $(call gb_Rdb__command,$@,$*,$?,$^) + $(call gb_Trace_EndRange,$*,RDB) .PHONY : $(call gb_Rdb_get_clean_target,%) $(call gb_Rdb_get_clean_target,%) : diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 5821ed8950bf..1b02e7f1699e 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -23,6 +23,7 @@ gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl) $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS) $(call gb_Output_announce,$*,$(true),SDI,1) + $(call gb_Trace_StartRange,$*,SDI) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@)) $(call gb_Helper_abbreviate_dirs,\ @@ -35,6 +36,7 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS) $(if $(gb_FULLDEPS),-fM$(call gb_SdiTarget_get_dep_target,$*)) \ $< \ && touch $@.hxx) + $(call gb_Trace_EndRange,$*,SDI) # touch the hxx file so it's newer than the target - the .hxx only occurs in # generated .d files, so it's not a target yet when building from scratch! diff --git a/solenv/gbuild/Trace.mk b/solenv/gbuild/Trace.mk new file mode 100644 index 000000000000..8d416157d28d --- /dev/null +++ b/solenv/gbuild/Trace.mk @@ -0,0 +1,61 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# Support for tracing what gbuild does. +# Run 'make GBUILD_TRACE=/somewhere/log.json', process the file +# using solenv/bin/finish-gbuild-trace.py, and then view it in Chromium +# using the chrome://tracing URL: +# - the '?' icon in the top-right is the help +# - 'gbuild' rows represent per-parallelism (per-CPU) usage in time +# - 'totals' rows represent sums for reach build type +# - note that 'EXTERNAL' targets do not detect whether the external package +# is built with parallelism or not, so the actual CPU time may be higher +# - vertical lines represent targets that themselves do not take any time +# to build +# - any target can be found using the search field in the top right corner +# (just type e.g. '[MOD]: sal' and hit the '->' button, if you cannot see +# it pressing 'm' or 'f' can help) + +gb_TRACE := +ifneq ($(GBUILD_TRACE),) +gb_TRACE := $(abspath $(GBUILD_TRACE)) +endif + +ifneq ($(gb_TRACE),) + +# call gb_Trace_AddMark,marktype,detail,type,extra +# The (flock;cat) part is to minimize lock time. +define gb_Trace__AddMark +echo "{\"name\": \"$(3)\", \"ph\": \"$(1)\", \"pid\": 1, \"tid\": 1, \"ts\": $$(date +%s%N),\"args\":{\"message\":\"[$(3)]: $(2)\"}}," | ( flock 1; cat ) >>$(gb_TRACE) +endef + +# call gb_Trace_StartRange,detail,type +define gb_Trace_StartRange +$(call gb_Trace__AddMark,B,$(1),$(2)) +endef + +# call gb_Trace_EndRange,detail,type +define gb_Trace_EndRange +$(call gb_Trace__AddMark,E,$(1),$(2)) +endef + +# call gb_Trace_MakeMark,detail,type +define gb_Trace_MakeMark +$(call gb_Trace__AddMark,i,$(1),$(2)) +endef + +ifeq ($(MAKE_RESTARTS),) +$(shell rm -f $(gb_TRACE) 2>/dev/null) +else +$(shell $(call gb_Trace__AddMark,i,make restart,MAKE)) +endif + +endif + +# vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index e7fa50a745b0..5b322fb6b0f5 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -51,7 +51,6 @@ gb_UIImageListTarget_XSLTFILE := $(SRCDIR)/solenv/bin/uiimagelist.xsl # NOTE: for some reason xsltproc does not produce any file if there is # no output, so we touch the target to make sure it exists. define gb_UIImageListTarget__command -$(call gb_Output_announce,$(2),$(true),UIL,1) $(call gb_Helper_abbreviate_dirs,\ $(gb_UIImageListTarget_COMMAND) --nonet -o $@ $(gb_UIImageListTarget_XSLTFILE) $(UIFILE) && \ touch $@ \ @@ -65,7 +64,10 @@ $(dir $(call gb_UIImageListTarget_get_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_UIImageListTarget_get_target,%) : $(gb_UIImageListTarget_DEPS) $(gb_UIImageListTarget_XSLTFILE) + $(call gb_Output_announce,$*,$(true),UIL,1) + $(call gb_Trace_StartRange,$*,UIL) $(call gb_UIImageListTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,UIL) .PHONY : $(call gb_UIImageListTarget_get_clean_target,%) $(call gb_UIImageListTarget_get_clean_target,%) : @@ -109,9 +111,11 @@ $(dir $(call gb_UIConfig_get_target,%))%/.dir : $(call gb_UIConfig_get_target,%) : $(call gb_UIConfig_get_imagelist_target,%) $(call gb_UIConfig_get_a11yerrors_target,%) $(call gb_Output_announce,$*,$(true),UIC,2) + $(call gb_Trace_StartRange,$*,UIC) $(call gb_Helper_abbreviate_dirs,\ touch $@ \ ) + $(call gb_Trace_EndRange,$*,UIC) $(call gb_UIConfig_get_imagelist_target,%) : $(call gb_UIConfig__command) @@ -146,12 +150,14 @@ gb_UIConfig_gla11y_PARAMETERS += --widgets-button +svtlo-ManagedMenuButton gb_UIConfig_gla11y_PARAMETERS += --fatal-all --not-fatal-type duplicate-mnemonic --not-fatal-type labelled-by-and-mnemonic --not-fatal-type orphan-label define gb_UIConfig_a11yerrors__command -$(call gb_Output_announce,$(2),$(true),UIA,1) $(call gb_UIConfig__gla11y_command) endef $(call gb_UIConfig_get_a11yerrors_target,%) : $(gb_UIConfig_LXML_TARGET) $(call gb_ExternalExecutable_get_dependencies,python) $(gb_UIConfig_gla11y_SCRIPT) + $(call gb_Output_announce,$*,$(true),UIA,1) + $(call gb_Trace_StartRange,$*,UIA) $(call gb_UIConfig_a11yerrors__command,$@,$*) + $(call gb_Trace_EndRange,$*,UIA) gb_UIConfig_get_packagename = UIConfig/$(1) gb_UIConfig_get_packagesetname = UIConfig/$(1) diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk index d558edbc034f..f90a1abe1b21 100644 --- a/solenv/gbuild/UITest.mk +++ b/solenv/gbuild/UITest.mk @@ -54,6 +54,7 @@ ifneq ($(gb_SUPPRESS_TESTS),) @true else $(call gb_Output_announce,$*,$(true),UIT,2) + $(call gb_Trace_StartRange,$*,UIT) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_UITest_get_target,$*)) && \ mkdir -p $(dir $(call gb_UITest_get_target,$*))/user/user && \ @@ -88,6 +89,7 @@ else cat $(dir $(call gb_UITest_get_target,$*))/soffice.out.log; \ printf ' >>>\n\n';) \ cat $@.log; $(gb_UITest_UNITTESTFAILED) UI $*)))) + $(call gb_Trace_EndRange,$*,UIT) endif # always use udkapi and URE services diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index ca1fbf76bbb0..bc364ad9ae34 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -26,7 +26,6 @@ gb_UnoApiTarget_UNOIDLCHECKDEPS := $(call gb_Executable_get_runtime_dependencies gb_UnoApiTarget_UNOIDLCHECKCOMMAND := $(call gb_Executable_get_command,unoidl-check) define gb_UnoApiTarget__command -$(call gb_Output_announce,$(2),$(true),UNO,4) mkdir -p $(dir $(1)) \ $(if $(UNOAPI_ENTITIES), \ && RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(UNOAPI_ENTITIES))) \ @@ -42,7 +41,10 @@ $(if $(UNOAPI_REFERENCE), \ endef $(call gb_UnoApiTarget_get_target,%) : + $(call gb_Output_announce,$*,$(true),UNO,4) + $(call gb_Trace_StartRange,$*,UNO) $(call gb_UnoApiTarget__command,$@,$*) + $(call gb_Trace_EndRange,$*,UNO) .PHONY : $(call gb_UnoApiTarget_get_clean_target,%) $(call gb_UnoApiTarget_get_clean_target,%) : @@ -139,17 +141,23 @@ endef $(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERDEPS) $(call gb_Output_announce,$*,$(true),HPB,3) \ + $(call gb_Trace_StartRange,$*,HPB) $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*)) + $(call gb_Trace_EndRange,$*,HPB) $(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERDEPS) $(call gb_Output_announce,$*,$(true),HPC,3) + $(call gb_Trace_StartRange,$*,HPC) $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C) + $(call gb_Trace_EndRange,$*,HPC) $(call gb_UnoApiHeadersTarget_get_real_target,%) : \ $(gb_UnoApiHeadersTarget_CPPUMAKERDEPS) $(call gb_Output_announce,$*,$(true),HPP,3) \ + $(call gb_Trace_StartRange,$*,HPP) $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L) + $(call gb_Trace_EndRange,$*,HPP) .PHONY : $(call gb_UnoApiHeadersTarget_get_clean_target,%) $(call gb_UnoApiHeadersTarget_get_clean_target,%) : diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 59403de4d9ac..d177ed43503e 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -40,12 +40,14 @@ endef define gb_UnpackedTarget__command $(call gb_Output_announce,$(notdir $(2)),$(true),UPK,1) + $(call gb_Trace_StartRange,$(notdir $(2)),UPK) $(call gb_Helper_abbreviate_dirs,\ $(if $(wildcard $(UNPACKED_DIR)),rm -rf $(UNPACKED_DIR) &&) \ mkdir -p $(UNPACKED_DIR) && \ $(call gb_UnpackedTarget__command_$(1),$(2),$(3),$(4)) && \ touch $(2) \ ) + $(call gb_Trace_EndRange,$(notdir $(2)),UPK) endef $(dir $(call gb_UnpackedTarget_get_target,%)).dir : @@ -120,7 +122,6 @@ $(call gb_UnpackedTarball__copy_files_fix,$(call gb_UnpackedTarball__copy_files_ endef define gb_UnpackedTarball__command -$(call gb_Output_announce,$(2),$(true),PAT,2) $(call gb_Helper_abbreviate_dirs,\ ( \ cd $(3) \ @@ -169,7 +170,10 @@ $(call gb_UnpackedTarball_get_preparation_target,%) : touch $@ $(call gb_UnpackedTarball_get_target,%) : + $(call gb_Output_announce,$*,$(true),PAT,2) + $(call gb_Trace_StartRange,$*,PAT) $(call gb_UnpackedTarball__command,$@,$*,$(call gb_UnpackedTarball_get_dir,$*)) + $(call gb_Trace_EndRange,$*,PAT) $(call gb_UnpackedTarball_get_final_target,%) : touch $@ @@ -242,7 +246,10 @@ $(call gb_ExternalProject_get_state_target,$(1),%) : UNPACKED_IS_BIN_TARBALL := $(if $(findstring out,$(5)),$(call gb_Module_get_target,$(4)) : $(TARFILE_LOCATION)/$(6) $(TARFILE_LOCATION)/$(6) : $(call gb_Module_get_nonl10n_target,$(4)) $$(call gb_Output_announce,$(6),$(true),PKB,3) - if test ! -f "$$@" ; then cd $(call gb_UnpackedTarball_get_dir,) && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi) + $$(call gb_Trace_StartRange,$(6),PKB) + if test ! -f "$$@" ; then cd $(call gb_UnpackedTarball_get_dir,) && $(GNUTAR) -czf "$$@" $(1)/ || $(GNUTAR) -czf "$$@" $(1)/ ; else touch "$$@" ; fi + $$(call gb_Trace_EndRange,$(6),PKB) +) endef diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk index b8f76d98f321..673a02df1370 100644 --- a/solenv/gbuild/Zip.mk +++ b/solenv/gbuild/Zip.mk @@ -43,6 +43,7 @@ $(dir $(call gb_Zip_get_target,%))%/.dir : # if there are no files, zip fails; copy empty zip file to target in that case $(call gb_Zip_get_target,%) : $(call gb_Output_announce,$*,$(true),ZIP,3) + $(call gb_Trace_StartRange,$*,ZIP) $(call gb_Helper_abbreviate_dirs,\ $(if $(FILES),\ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\ @@ -56,6 +57,7 @@ $(call gb_Zip_get_target,%) : , cp $(SRCDIR)/solenv/gbuild/empty.zip $@)\ $(if $(INSTALL_NAME),&& cp $(call gb_Zip_get_target,$*) $(INSTALL_NAME)) \ ) + $(call gb_Trace_EndRange,$*,ZIP) # the preparation target is here to ensure proper ordering of actions in cases # when we want to, e.g., create a zip from files created by a custom target diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 94bb0f93e866..99547941ef8c 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -281,6 +281,8 @@ include $(GBUILDDIR)/Deliver.mk $(eval $(call gb_Deliver_init)) +include $(GBUILDDIR)/Trace.mk + # We are using a set of scopes that we might as well call classes. # TODO: to what extent is the following still true? diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index 3c25314639e1..9205e32885e1 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -102,9 +102,11 @@ gb_CppunitTest_get_filename = libtest_$(1).a # static archives), they are just a waste of disk space. define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) + $(call gb_Trace_StartRange,$(2),LNK) $(if $(filter CppunitTest,$(TARGETTYPE)), \ touch $(1), \ $(call gb_LinkTarget__command_staticlink,$(1))) + $(call gb_Trace_EndRange,$(2),LNK) endef endif diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 12ae0a21537e..d113b8651156 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -111,6 +111,7 @@ gb_PrecompiledHeader_get_objectfile = define gb_PrecompiledHeader__command $(call gb_Output_announce,$(2),$(true),PCH,1) + $(call gb_Trace_StartRange,$(2),PCH) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \ cd $(BUILDDIR)/ && \ @@ -130,6 +131,7 @@ $(call gb_Helper_abbreviate_dirs,\ -o$(1) \ $(call gb_cxx_dep_copy,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2),$(7))) \ ) + $(call gb_Trace_EndRange,$(2),PCH) endef ifeq ($(COM_IS_CLANG),TRUE) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 77fd83a733a6..83f6553a518c 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -91,6 +91,7 @@ gb_PrecompiledHeader_get_objectfile = $(1).obj define gb_PrecompiledHeader__command $(call gb_Output_announce,$(2),$(true),PCH,1) + $(call gb_Trace_StartRange,$(2),PCH) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \ unset INCLUDE && \ @@ -104,6 +105,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(6) \ -c $(3) \ -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2),$(7)),$(1),$(3)) + $(call gb_Trace_EndRange,$(2),PCH) endef # No ccache with MSVC, no need to create a checksum for it. @@ -190,6 +192,7 @@ MSC_SUBSYSTEM_VERSION=$(COMMA)6.01 # length in check - otherwise the dupes easily hit the limit when linking mergedlib define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) + $(call gb_Trace_StartRange,$(2),LNK) $(call gb_Helper_abbreviate_dirs,\ rm -f $(1) && \ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \ @@ -243,7 +246,9 @@ $(call gb_Helper_abbreviate_dirs,\ -dump -exports $(ILIBTARGET) \ >> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \ $(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,$(WORKDIR)/LinkTarget/$(2).exports,$(1))) \ - ; exit $$RC) + ; \ + $(call gb_Trace_EndRange,$(2),LNK) $(if $(gb_TRACE),;) \ + exit $$RC) endef define gb_MSVCRT_subst @@ -538,6 +543,7 @@ ifeq ($(gb_FULLDEPS),$(true)) gb_WinResTarget__command_target = $(WORKDIR)/LinkTarget/Executable/makedepend.exe define gb_WinResTarget__command_dep $(call gb_Output_announce,RC:$(2),$(true),DEP,1) + $(call gb_Trace_StartRange,RC:$(2),DEP) $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ $(call gb_Executable_get_target,makedepend) \ @@ -547,6 +553,7 @@ $(call gb_Helper_abbreviate_dirs,\ -o .res \ -p $(dir $(3)) \ -f $(1)) + $(call gb_Trace_EndRange,RC:$(2),DEP) endef else gb_WinResTarget__command_target = @@ -658,7 +665,9 @@ endef define gb_UIMenubarTarget__command $(call gb_Output_announce,$(2),$(true),UIM,1) +$(call gb_Trace_StartRange,$(2),UIM) cp $(3) $(1) +$(call gb_Trace_EndRange,$(2),UIM) endef diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk index abdeb8cc59e7..dc7d2a8c25d8 100644 --- a/solenv/gbuild/platform/iOS.mk +++ b/solenv/gbuild/platform/iOS.mk @@ -123,8 +123,10 @@ endef define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) + $(call gb_Trace_StartRange,$(2),LNK) $(if $(filter Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2))) $(if $(filter CppunitTest Library StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1))) + $(call gb_Trace_EndRange,$(2),LNK) endef define gb_LinkTarget_use_system_darwin_frameworks @@ -248,7 +250,9 @@ endif define gb_UIMenubarTarget__command $(call gb_Output_announce,$(2),$(true),UIM,1) +$(call gb_Trace_StartRange,$(2),UIM) cp $(3) $(1) +$(call gb_Trace_EndRange,$(2),UIM) endef diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 1156255e3769..c850d3f068a3 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -161,8 +161,10 @@ endef define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) + $(call gb_Trace_StartRange,$(2),LNK) $(if $(filter Library Bundle CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2))) $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1))) + $(call gb_Trace_EndRange,$(2),LNK) endef define gb_LinkTarget_use_system_darwin_frameworks @@ -351,7 +353,9 @@ endif define gb_UIMenubarTarget__command $(call gb_Output_announce,$(2),$(true),UIM,1) +$(call gb_Trace_StartRange,$(2),UIM) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $(1) $(UI_MENUBAR_XSLT) $(3) +$(call gb_Trace_EndRange,$(2),UIM) endef diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index e386601996f2..d1d068c8fd22 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -157,8 +157,10 @@ endef define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) + $(call gb_Trace_StartRange,$(2),LNK) $(if $(filter Library CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2))) $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1))) + $(call gb_Trace_EndRange,$(2),LNK) endef @@ -343,7 +345,9 @@ endif define gb_UIMenubarTarget__command $(call gb_Output_announce,$(2),$(true),UIM,1) +$(call gb_Trace_StartRange,$(2),UIM) cp $(3) $(1) +$(call gb_Trace_EndRange,$(2),UIM) endef diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 8854aab6c425..6abfb75da4b7 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -171,9 +171,11 @@ endef define gb_LinkTarget__command $(call gb_Output_announce,$(2),$(true),LNK,4) + $(call gb_Trace_StartRange,$(2),LNK) $(if $(filter CppunitTest Executable,$(TARGETTYPE)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2))) $(if $(filter Library,$(TARGETTYPE)),$(if $(filter TRUE,$(DISABLE_DYNLOADING)),$(call gb_LinkTarget__command_staticlink,$(1)),$(call gb_LinkTarget__command_dynamiclink,$(1),$(2)))) $(if $(filter StaticLibrary,$(TARGETTYPE)),$(call gb_LinkTarget__command_staticlink,$(1))) + $(call gb_Trace_EndRange,$(2),LNK) endef @@ -376,7 +378,9 @@ endif define gb_UIMenubarTarget__command $(call gb_Output_announce,$(2),$(true),UIM,1) +$(call gb_Trace_StartRange,$(2),UIM) cp $(3) $(1) +$(call gb_Trace_EndRange,$(2),UIM) endef diff --git a/sysui/CustomTarget_infoplist.mk b/sysui/CustomTarget_infoplist.mk index c98b8679b261..98f5f1c427b9 100644 --- a/sysui/CustomTarget_infoplist.mk +++ b/sysui/CustomTarget_infoplist.mk @@ -23,7 +23,9 @@ $(eval $(call gb_CustomTarget_register_targets,sysui/infoplist,\ $(info_WORKDIR)/PkgInfo: $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) echo "APPLLIBO" > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(info_WORKDIR)/Info.plist: $(info_BUILDDIR)/Info.plist cp $< $@ @@ -32,8 +34,10 @@ $(info_WORKDIR)/InfoPlist_%/InfoPlist.strings: \ $(info_WORKDIR)/Info.plist $(info_WORKDIR)/documents.ulf mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(PERL) -w $(info_SRCDIR)/gen_strings.pl -l $* -p $^ | \ iconv -f UTF-8 -t UTF-16 >$@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) $(eval $(call gb_CustomTarget_ulfex_rule,\ $(info_WORKDIR)/documents.ulf,\ diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index b2d27724f906..cd06c141e096 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -135,7 +135,9 @@ $(eval $(call gb_CustomTarget_register_targets,sysui/share,\ $(share_WORKDIR)/%/openoffice.org.xml: $(share_WORKDIR)/documents.ulf $(MIMEDESKTOPS) $(share_SRCDIR)/share/create_mime_xml.pl $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(PERL) $(share_SRCDIR)/share/create_mime_xml.pl $< > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) $(share_WORKDIR)/%/openoffice.keys: \ @@ -143,27 +145,34 @@ $(share_WORKDIR)/%/openoffice.keys: \ $(share_TRANSLATE) $(share_WORKDIR)/documents.ulf mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(PERL) $(share_SRCDIR)/share/brand.pl -p $* -u $(UNIXFILENAME.$*) \ --iconprefix $(UNIXFILENAME.$*)- $^ $(share_WORKDIR)/$* $(PERL) $(share_TRANSLATE) -p $* -d $(share_WORKDIR)/$* \ --ext "keys" --key "description" $(share_WORKDIR)/documents.ulf cat $(MIMEKEYS) > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) $(share_WORKDIR)/%/openoffice.mime: $(share_SRCDIR)/mimetypes/openoffice.mime mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT) cat $< | tr -d "\015" > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT) $(share_WORKDIR)/%/openoffice.sh: $(share_SRCDIR)/share/openoffice.sh mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT) cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT) $(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh \ $(share_WORKDIR)/%/openoffice.org.xml $(share_WORKDIR)/%/openoffice.applications $(share_WORKDIR)/%/openoffice.mime \ $(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT) echo "#!/bin/sh" > $@ echo "PREFIX=$(UNIXFILENAME.$*)" >> $@ echo "ICON_PREFIX=$(UNIXFILENAME.$*)" >> $@ @@ -172,6 +181,7 @@ $(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh \ echo "PRODUCTVERSION=$(PRODUCTVERSION)" >> $@ cat $< >> $@ chmod 774 $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT) # Generate gobject-introspection files # These are *not* packaged in rpms because there's no good place to put them @@ -202,13 +212,17 @@ endif $(share_WORKDIR)/%/launcherlist: $(LAUNCHERS) mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) echo "$(addsuffix .desktop,$(LAUNCHERLIST))" > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(share_WORKDIR)/%/openoffice.applications: $(share_SRCDIR)/mimetypes/openoffice.applications mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CAT) cat $< | tr -d "\015" | sed -e "s/OFFICENAME/$(UNIXFILENAME.$*)/" -e "s/%PRODUCTNAME/$(PRODUCTNAME.$*) $(PRODUCTVERSION.$*)/" > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CAT) # these .desktop files are written by brand.pl below # need to have a rule for these because they are targets in Package_share @@ -224,6 +238,7 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \ $(share_TRANSLATE) $(addprefix $(share_WORKDIR)/,$(ULFS)) mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) $(PERL) $(share_SRCDIR)/share/brand.pl -p '$${PRODUCTNAME} $${PRODUCTVERSION}' -u $(UNIXFILENAME.$*) \ $(brand_URIPARAM) \ --iconprefix '$${UNIXBASISROOTNAME}-' $^ $(share_WORKDIR)/$* @@ -234,6 +249,7 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \ $(PERL) $(share_TRANSLATE) -p $(PRODUCTNAME.$*)$(PRODUCTVERSION) -d $(share_WORKDIR)/$* \ --ext "desktop" --key "UnityQuickList" $(share_WORKDIR)/launcher_unityquicklist.ulf touch $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) $(eval $(call gb_CustomTarget_ulfex_rule,\ $(share_WORKDIR)/%.ulf,\ diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk index bbba541612e2..9329281d7a79 100644 --- a/testtools/CustomTarget_bridgetest.mk +++ b/testtools/CustomTarget_bridgetest.mk @@ -26,6 +26,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_Helper_abbreviate_dirs,\ echo \ "$(call gb_Executable_get_target_for_build,uno)" \ @@ -37,12 +38,14 @@ $(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) testtools_MY_CLASSPATH := $(call gb_Jar_get_target,ridl)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,java_uno)$(gb_CLASSPATHSEP)$(call gb_Jar_get_target,juh) $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_Helper_abbreviate_dirs,\ echo \ "URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target,uno_services))" \ @@ -54,9 +57,11 @@ $(testtools_BRIDGEDIR)/bridgetest_javaserver$(testtools_BATCHSUFFIX) :| $(testto "singleaccept" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_Helper_abbreviate_dirs,\ echo "JAVA_HOME=$(JAVA_HOME)" \ "$(call gb_Executable_get_target_for_build,uno)" \ @@ -67,9 +72,11 @@ $(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te "-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_BRIDGEDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),ECH) $(call gb_Helper_abbreviate_dirs,\ echo \ "$(call gb_Executable_get_target_for_build,uno)" \ @@ -80,5 +87,6 @@ $(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_ "-env:URE_MORE_TYPES=$(call gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \ > $@) $(if $(filter-out WNT,$(OS)),chmod +x $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),ECH) # vim: set noet sw=4 ts=4: diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk index 55c78a97989e..aa1336e24d92 100644 --- a/testtools/CustomTarget_bridgetest_climaker.mk +++ b/testtools/CustomTarget_bridgetest_climaker.mk @@ -21,11 +21,13 @@ $(testtools_CLIDIR)/cli_types_bridgetest.dll : \ $(call gb_Executable_get_runtime_dependencies,climaker) \ | $(testtools_CLIDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CLM) $(call gb_Helper_abbreviate_dirs, \ $(call gb_Helper_execute,climaker) \ $(if $(filter -s,$(MAKEFLAGS)),,--verbose) \ --out $@ -r $(call gb_CliUnoApi_get_target,cli_uretypes) \ -X $(call gb_UnoApiTarget_get_target,udkapi) \ $(call gb_UnoApiTarget_get_target,bridgetest) > /dev/null) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CLM) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk index 830290038c61..0ab401551510 100644 --- a/testtools/CustomTarget_bridgetest_javamaker.mk +++ b/testtools/CustomTarget_bridgetest_javamaker.mk @@ -20,8 +20,10 @@ $(testtools_JAVADIR)/done : \ $(call gb_Executable_get_runtime_dependencies,javamaker) \ | $(testtools_JAVADIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JVM) $(call gb_Helper_abbreviate_dirs, \ rm -r $(testtools_JAVADIR) && \ $(call gb_Helper_execute,javamaker -nD -O$(testtools_JAVADIR) -X$(call gb_UnoApiTarget_get_target,udkapi) $(call gb_UnoApiTarget_get_target,bridgetest) $(call gb_UnoApiTarget_get_target,performance)) && touch $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JVM) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/tools/CustomTarget_reversemap.mk b/tools/CustomTarget_reversemap.mk index ef55d0df0f4d..94a697f1a6af 100644 --- a/tools/CustomTarget_reversemap.mk +++ b/tools/CustomTarget_reversemap.mk @@ -15,6 +15,8 @@ $(call gb_CustomTarget_get_workdir,tools/string)/reversemap.cxx : \ $(call gb_Executable_get_runtime_dependencies,bestreversemap) \ | $(call gb_CustomTarget_get_workdir,tools/string)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),BRM) $(call gb_Helper_execute,bestreversemap > $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),BRM) # vim: set noet sw=4 ts=4: diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk index 9c4d07405b8d..97793d519655 100644 --- a/unoil/CustomTarget_javamaker.mk +++ b/unoil/CustomTarget_javamaker.mk @@ -19,11 +19,13 @@ $(unoil_JAVADIR)/done : \ $(call gb_Executable_get_runtime_dependencies,javamaker) \ | $(unoil_JAVADIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),JVM) $(call gb_Helper_abbreviate_dirs, \ rm -r $(unoil_JAVADIR) && \ $(call gb_Helper_execute,javamaker -O$(unoil_JAVADIR) \ $(call gb_UnoApi_get_target,offapi) \ -X$(call gb_UnoApi_get_target,udkapi)) && \ touch $@) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),JVM) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/vcl/CustomTarget_gtk3_kde5_moc.mk b/vcl/CustomTarget_gtk3_kde5_moc.mk index 42f7edbe5105..06f28de31cfe 100644 --- a/vcl/CustomTarget_gtk3_kde5_moc.mk +++ b/vcl/CustomTarget_gtk3_kde5_moc.mk @@ -17,6 +17,8 @@ $(call gb_CustomTarget_get_workdir,vcl/unx/gtk3_kde5)/%.moc : \ $(SRCDIR)/vcl/unx/gtk3_kde5/%.hxx \ | $(call gb_CustomTarget_get_workdir,vcl/unx/gtk3_kde5)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC) $(MOC5) $< -o $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MOC) # vim: set noet sw=4: diff --git a/vcl/CustomTarget_kf5_moc.mk b/vcl/CustomTarget_kf5_moc.mk index 6247c58161fd..96f84a937560 100644 --- a/vcl/CustomTarget_kf5_moc.mk +++ b/vcl/CustomTarget_kf5_moc.mk @@ -16,6 +16,8 @@ $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/%.moc : \ $(SRCDIR)/vcl/unx/kf5/%.hxx \ | $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC) $(MOC5) $< -o $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MOC) # vim: set noet sw=4: diff --git a/vcl/CustomTarget_qt5_moc.mk b/vcl/CustomTarget_qt5_moc.mk index 6d85eeff637b..87caee8d918e 100644 --- a/vcl/CustomTarget_qt5_moc.mk +++ b/vcl/CustomTarget_qt5_moc.mk @@ -26,6 +26,8 @@ $(call gb_CustomTarget_get_workdir,vcl/qt5)/%.moc : \ $(SRCDIR)/vcl/inc/qt5/%.hxx \ | $(call gb_CustomTarget_get_workdir,vcl/qt5)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC) $(MOC5) $< -o $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MOC) # vim: set noet sw=4: diff --git a/winaccessibility/CustomTarget_ia2_idl.mk b/winaccessibility/CustomTarget_ia2_idl.mk index 92b5cc93eb0e..40a9851537ae 100644 --- a/winaccessibility/CustomTarget_ia2_idl.mk +++ b/winaccessibility/CustomTarget_ia2_idl.mk @@ -25,6 +25,7 @@ $(call gb_CustomTarget_get_target,winaccessibility/ia2/idl) : \ $(wina11y_COMIDLDIR)/%.h : $(wina11y_SOURCE)/%.idl \ | $(wina11y_COMIDLDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),IDL) $(call gb_Helper_abbreviate_dirs, \ midl.exe \ -tlb $(wina11y_COMIDLDIR)/$*.tlb \ @@ -36,5 +37,6 @@ $(wina11y_COMIDLDIR)/%.h : $(wina11y_SOURCE)/%.idl \ $(SOLARINC) \ -I $(wina11y_SOURCE) \ $<) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),IDL) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/wizards/CustomTarget_share.mk b/wizards/CustomTarget_share.mk index 43d1811d7a13..1c4ce3391167 100644 --- a/wizards/CustomTarget_share.mk +++ b/wizards/CustomTarget_share.mk @@ -17,7 +17,9 @@ $(call gb_CustomTarget_get_workdir,wizards/share)/%.xlc: \ $(SRCDIR)/wizards/source/configshare/%.xlc \ | $(call gb_CustomTarget_get_workdir,wizards/share)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),SED) sed -e 's/@LIBO_SHARE_FOLDER@/$(LIBO_SHARE_FOLDER)/' $< > $@ + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SED) # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/wizards/CustomTarget_wizards.mk b/wizards/CustomTarget_wizards.mk index d7a4c73dfb5c..6dac016e6bdf 100644 --- a/wizards/CustomTarget_wizards.mk +++ b/wizards/CustomTarget_wizards.mk @@ -36,6 +36,7 @@ $(wizards_DIR)/resources_%.properties : \ $(call gb_Executable_get_runtime_dependencies,propex) \ | $(wizards_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1) + $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRP) $(call gb_Helper_abbreviate_dirs, \ $(if $(filter-out qtz,$(LANGUAGE)), \ MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \ @@ -53,6 +54,7 @@ $(wizards_DIR)/resources_%.properties : \ -l $(LANGUAGE) \ ) \ ) + $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRP) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |