From 7d6112773e806630eeaffbfedb6ee89e81d2f8fc Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 31 Dec 2012 12:59:47 +0100 Subject: I did not want to push that... It does not work, anyway. This reverts commit ee18b30b0391a443a51d7b97060f118478c202af. Change-Id: Ibe21a2a62ecbfaf8dcd87113bde386050ffde25a --- solenv/gbuild/AllLangResTarget.mk | 8 ++++---- solenv/gbuild/CliUnoApi.mk | 4 ++-- solenv/gbuild/Configuration.mk | 4 ++-- solenv/gbuild/CppunitTest.mk | 4 ++-- solenv/gbuild/Dictionary.mk | 4 ++-- solenv/gbuild/Executable.mk | 24 ------------------------ solenv/gbuild/ExtensionTarget.mk | 24 ++++++++++++------------ solenv/gbuild/InstallModuleTarget.mk | 12 ++++++------ solenv/gbuild/SdiTarget.mk | 4 ++-- solenv/gbuild/TargetLocations.mk | 30 ++++++++++++++++++++++++++++++ solenv/gbuild/UI.mk | 4 ++-- solenv/gbuild/UnoApiTarget.mk | 16 ++++++++-------- 12 files changed, 72 insertions(+), 66 deletions(-) diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 2af2a2e84b02..c85b612a40d0 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -47,8 +47,8 @@ # SrsPartMergeTarget class -gb_SrsPartMergeTarget_TRANSEXDEPS = $(call gb_Executable_get_runtime_dependencies,transex3) -gb_SrsPartMergeTarget_TRANSEXCOMMAND = $(call gb_Executable_get_command,transex3) +gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3) +gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,transex3) define gb_SrsPartMergeTarget__command $(call gb_Output_announce,$(3),$(true),srs,1) @@ -86,8 +86,8 @@ endef # defined by platform # gb_SrsPartTarget__command_dep -gb_ResTarget_RSCDEPS = $(call gb_Executable_get_runtime_dependencies,rsc) -gb_ResTarget_RSCCOMMAND = SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,rsc) +gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc) +gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,rsc) define gb_SrsPartTarget__command $(call gb_Helper_abbreviate_dirs,\ diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk index 56904131c021..92e599cb4efc 100644 --- a/solenv/gbuild/CliUnoApi.mk +++ b/solenv/gbuild/CliUnoApi.mk @@ -11,8 +11,8 @@ gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT) -gb_CliUnoApiTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,climaker) -gb_CliUnoApiTarget_COMMAND = $(call gb_Executable_get_command,climaker) +gb_CliUnoApiTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker) +gb_CliUnoApiTarget_COMMAND := $(call gb_Executable_get_command,climaker) define gb_CliUnoApiTarget__command $(call gb_Output_announce,$(2),$(true),CLI,4) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 98f60dd1c5f6..328c5a88a8c0 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -251,8 +251,8 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) : # XcuMergeTarget class -gb_XcuMergeTarget_CFGEXDEPS = $(call gb_Executable_get_runtime_dependencies,cfgex) -gb_XcuMergeTarget_CFGEXCOMMAND = $(call gb_Executable_get_command,cfgex) +gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfgex) +gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex) # PRJNAME is computed from the stem (parameter $(2)) define gb_XcuMergeTarget__command diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 0fec6bfd9545..9c145b637a74 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -52,8 +52,8 @@ endif # gb_CppunitTest_get_filename # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell ifneq ($(CROSS_COMPILING),YES) -gb_CppunitTest_CPPTESTDEPS = $(call gb_Executable_get_runtime_dependencies,cppunit/cppunittester) -gb_CppunitTest_CPPTESTCOMMAND = $(call gb_Executable_get_command,cppunit/cppunittester) +gb_CppunitTest_CPPTESTDEPS := $(call gb_Executable_get_runtime_dependencies,cppunit/cppunittester) +gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_command,cppunit/cppunittester) endif gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index 3397626160e0..b916da298f3b 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -11,8 +11,8 @@ gb_ThesaurusIndexTarget_CHECK_TARGET := $(SRCDIR)/dictionaries/util/th_check.pl gb_ThesaurusIndexTarget_CHECK_COMMAND := PERL_UNICODE=0 $(PERL) -w $(gb_ThesaurusIndexTarget_CHECK_TARGET) -gb_ThesaurusIndexTarget_INDEX_DEPS = $(call gb_Executable_get_runtime_dependencies,idxdict) -gb_ThesaurusIndexTarget_INDEX_COMMAND = $(call gb_Executable_get_command,idxdict) +gb_ThesaurusIndexTarget_INDEX_DEPS := $(call gb_Executable_get_runtime_dependencies,idxdict) +gb_ThesaurusIndexTarget_INDEX_COMMAND := $(call gb_Executable_get_command,idxdict) define gb_ThesaurusIndexTarget__command $(call gb_Output_announce,$(2),$(true),THI,1) diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 47da186d9c65..403497e8ab5e 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -169,28 +169,4 @@ $(call gb_Executable_get_runtime_target,$(1)) : $(2) endef -# Get dependencies needed for running the executable -# -# This is not strictly necessary, but it makes the use more similar to -# ExternalExecutable. -# -# gb_Executable_get_runtime_dependencies executable -ifeq ($(CROSS_COMPILING),YES) -define gb_Executable_get_runtime_dependencies -endef -else -define gb_Executable_get_runtime_dependencies -$(call gb_Executable_get_runtime_target,$(1)) -endef -endif - -# Get complete command-line for running the executable -# -# This includes setting library path, if necessary. -# -# gb_Executable_get_command executable -define gb_Executable_get_command -$(gb_Helper_set_ld_path) $(call gb_Executable_get_target_for_build,$(1)) -endef - # vim: set noet sw=4: diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk index 43afa88e8b1e..c003217e678f 100644 --- a/solenv/gbuild/ExtensionTarget.mk +++ b/solenv/gbuild/ExtensionTarget.mk @@ -33,21 +33,21 @@ gb_ExtensionTarget__get_preparation_target = $(WORKDIR)/ExtensionTarget/$(1).prepare gb_ExtensionTarget_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q) -gb_ExtensionTarget_XRMEXDEPS = $(call gb_Executable_get_runtime_dependencies,xrmex) -gb_ExtensionTarget_XRMEXCOMMAND = $(call gb_Executable_get_command,xrmex) +gb_ExtensionTarget_XRMEXDEPS := $(call gb_Executable_get_runtime_dependencies,xrmex) +gb_ExtensionTarget_XRMEXCOMMAND := $(call gb_Executable_get_command,xrmex) -gb_ExtensionTarget_PROPMERGEDEPS = $(call gb_Executable_get_runtime_dependencies,propex) -gb_ExtensionTarget_PROPMERGECOMMAND = $(call gb_Executable_get_command,propex) +gb_ExtensionTarget_PROPMERGEDEPS := $(call gb_Executable_get_runtime_dependencies,propex) +gb_ExtensionTarget_PROPMERGECOMMAND := $(call gb_Executable_get_command,propex) -gb_ExtensionTarget_TREEXDEPS = $(call gb_Executable_get_runtime_dependencies,treex) -gb_ExtensionTarget_TREEXCOMMAND = $(call gb_Executable_get_command,treex) +gb_ExtensionTarget_TREEXDEPS := $(call gb_Executable_get_runtime_dependencies,treex) +gb_ExtensionTarget_TREEXCOMMAND := $(call gb_Executable_get_command,treex) -gb_ExtensionTarget_HELPEXDEPS = $(call gb_Executable_get_runtime_dependencies,helpex) -gb_ExtensionTarget_HELPEXCOMMAND = $(call gb_Executable_get_command,helpex) -gb_ExtensionTarget_HELPINDEXERDEPS = $(call gb_Executable_get_runtime_dependencies,HelpIndexer) -gb_ExtensionTarget_HELPINDEXERCOMMAND = $(call gb_Executable_get_command,HelpIndexer) -gb_ExtensionTarget_HELPLINKERDEPS = $(call gb_Executable_get_runtime_dependencies,HelpLinker) -gb_ExtensionTarget_HELPLINKERCOMMAND = $(call gb_Executable_get_command,HelpLinker) +gb_ExtensionTarget_HELPEXDEPS := $(call gb_Executable_get_runtime_dependencies,helpex) +gb_ExtensionTarget_HELPEXCOMMAND := $(call gb_Executable_get_command,helpex) +gb_ExtensionTarget_HELPINDEXERDEPS := $(call gb_Executable_get_runtime_dependencies,HelpIndexer) +gb_ExtensionTarget_HELPINDEXERCOMMAND := $(call gb_Executable_get_command,HelpIndexer) +gb_ExtensionTarget_HELPLINKERDEPS := $(call gb_Executable_get_runtime_dependencies,HelpLinker) +gb_ExtensionTarget_HELPLINKERCOMMAND := $(call gb_Executable_get_command,HelpLinker) # does not contain en-US because it is special cased in gb_ExtensionTarget_ExtensionTarget gb_ExtensionTarget_TRANS_LANGS := $(filter-out en-US,$(gb_WITH_LANG)) gb_ExtensionTarget_ALL_LANGS := en-US $(gb_ExtensionTarget_TRANS_LANGS) diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index c84a0794b7d4..4584e195b058 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -74,8 +74,8 @@ endef # ScpPreprocessTarget class -gb_ScpPreprocessTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,cpp) -gb_ScpPreprocessTarget_COMMAND = $(call gb_Executable_get_command,cpp) +gb_ScpPreprocessTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,cpp) +gb_ScpPreprocessTarget_COMMAND := $(call gb_Executable_get_command,cpp) gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp @@ -111,8 +111,8 @@ endef # ScpMergeTarget class -gb_ScpMergeTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,ulfex) -gb_ScpMergeTarget_COMMAND = $(call gb_Executable_get_command,ulfex) +gb_ScpMergeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfex) +gb_ScpMergeTarget_COMMAND := $(call gb_Executable_get_command,ulfex) gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf @@ -155,8 +155,8 @@ endef # platform: # gb_ScpConvertTarget_ScpConvertTarget_platform -gb_ScpConvertTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,ulfconv) -gb_ScpConvertTarget_COMMAND = $(call gb_Executable_get_command,ulfconv) +gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv) +gb_ScpConvertTarget_COMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,ulfconv) define gb_ScpConvertTarget__command $(call gb_Output_announce,$(2),$(true),SCC,1) diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 225ba8861858..0ccfc56e08eb 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -31,8 +31,8 @@ # (This can be workarounded by using gb_Package, but really should not.) # SdiTarget class -gb_SdiTarget_SVIDLDEPS = $(call gb_Executable_get_runtime_dependencies,svidl) -gb_SdiTarget_SVIDLCOMMAND = $(call gb_Executable_get_command,svidl) +gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl) +gb_SdiTarget_SVIDLCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,svidl) $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS) $(call gb_Output_announce,$*,$(true),SDI,1) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index b201fbbb4359..428af8640364 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -343,6 +343,36 @@ define gb_StaticLibrary_get_filename $(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) endef +# Get dependencies needed for running the executable +# +# This is not strictly necessary, but it makes the use more similar to +# ExternalExecutable. +# +# gb_Executable_get_runtime_dependencies executable +ifeq ($(CROSS_COMPILING),YES) +define gb_Executable_get_runtime_dependencies +endef +else +define gb_Executable_get_runtime_dependencies +$(call gb_Executable_get_runtime_target,$(1)) +endef +endif + +define gb_Executable__get_command +$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call gb_Output_error,executable group NONE does not exist!)) +$(if $(filter $(1),$(gb_Executable_NONE)),,$(gb_Helper_set_ld_path)) \ +$(call gb_Executable_get_target_for_build,$(1)) +endef + +# Get complete command-line for running the executable +# +# This includes setting library path, if necessary. +# +# gb_Executable_get_command executable +define gb_Executable_get_command +$(strip $(call gb_Executable__get_command,$(1))) +endef + gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT) gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1)) gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1)) diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk index 744524e13497..1662481391a8 100644 --- a/solenv/gbuild/UI.mk +++ b/solenv/gbuild/UI.mk @@ -13,8 +13,8 @@ gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget -gb_UILocalizeTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,uiex) -gb_UILocalizeTarget_COMMAND = $(call gb_Executable_get_command,uiex) +gb_UILocalizeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,uiex) +gb_UILocalizeTarget_COMMAND := $(call gb_Executable_get_command,uiex) # If translatable strings from a .ui file are not merged into the # respective .po file yet, the produced translated files are empty (that diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 5e6255908464..13f4aaf28e67 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -28,8 +28,8 @@ # UnoApiPartTarget -gb_UnoApiPartTarget_IDLCDEPS = $(call gb_Executable_get_runtime_dependencies,idlc) -gb_UnoApiPartTarget_IDLCCOMMAND = SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,idlc) +gb_UnoApiPartTarget_IDLCDEPS := $(call gb_Executable_get_runtime_dependencies,idlc) +gb_UnoApiPartTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,idlc) # The .urd files are actually created by the gb_UnoApiPartTarget__command, # invoked for the per-directory .done files. @@ -83,10 +83,10 @@ endif # UnoApiTarget -gb_UnoApiTarget_REGCOMPAREDEPS = $(call gb_Executable_get_runtime_dependencies,regcompare) -gb_UnoApiTarget_REGCOMPARECOMMAND = SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regcompare) -gb_UnoApiTarget_REGMERGEDEPS = $(call gb_Executable_get_runtime_dependencies,regmerge) -gb_UnoApiTarget_REGMERGECOMMAND = SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regmerge) +gb_UnoApiTarget_REGCOMPAREDEPS := $(call gb_Executable_get_runtime_dependencies,regcompare) +gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regcompare) +gb_UnoApiTarget_REGMERGEDEPS := $(call gb_Executable_get_runtime_dependencies,regmerge) +gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regmerge) gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types) @@ -296,8 +296,8 @@ ifeq ($(origin gb_UnoApiHeadersTarget_select_variant),undefined) $(eval $(call gb_Output_error,gb_UnoApiHeadersTarget_select_variant must be defined by platform)) endif -gb_UnoApiHeadersTarget_CPPUMAKERDEPS = $(call gb_Executable_get_runtime_dependencies,cppumaker) -gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND = SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,cppumaker) +gb_UnoApiHeadersTarget_CPPUMAKERDEPS := $(call gb_Executable_get_runtime_dependencies,cppumaker) +gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,cppumaker) define gb_UnoApiHeadersTarget__command RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ -- cgit v1.2.3