[Libreoffice-commits] .: 4 commits - i18npool/CustomTarget_breakiterator.mk i18npool/CustomTarget_collator.mk i18npool/CustomTarget_indexentry.mk i18npool/CustomTarget_localedata.mk i18npool/CustomTarget_textconversion.mk jurt/CustomTarget_test_urp.mk librelogo/CustomTarget_librelogo.mk readlicense_oo/CustomTarget_readme.mk RepositoryExternal.mk ridljar/CustomTarget_javamaker.mk shell/CustomTarget_shlxthdl_res.mk solenv/bin solenv/gbuild testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk testtools/CustomTarget_uno_test.mk tools/CustomTarget_reversemap.mk touch/CustomTarget_touch_javamaker.mk translations unoil/CustomTarget_climaker.mk unoil/CustomTarget_javamaker.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 30 08:17:57 PST 2012
RepositoryExternal.mk | 71 +++++++++++++++++++++++++
i18npool/CustomTarget_breakiterator.mk | 8 --
i18npool/CustomTarget_collator.mk | 2
i18npool/CustomTarget_indexentry.mk | 2
i18npool/CustomTarget_localedata.mk | 8 --
i18npool/CustomTarget_textconversion.mk | 2
jurt/CustomTarget_test_urp.mk | 2
librelogo/CustomTarget_librelogo.mk | 7 --
readlicense_oo/CustomTarget_readme.mk | 7 --
ridljar/CustomTarget_javamaker.mk | 2
shell/CustomTarget_shlxthdl_res.mk | 6 +-
solenv/bin/concat-deps |binary
solenv/gbuild/AllLangResTarget.mk | 17 ++---
solenv/gbuild/CliUnoApi.mk | 12 +---
solenv/gbuild/Configuration.mk | 6 +-
solenv/gbuild/CppunitTest.mk | 7 +-
solenv/gbuild/Dictionary.mk | 6 +-
solenv/gbuild/Executable.mk | 46 ++++++++++++++++
solenv/gbuild/ExtensionTarget.mk | 50 +++++++----------
solenv/gbuild/Helper.mk | 10 +++
solenv/gbuild/InstallModuleTarget.mk | 18 +++---
solenv/gbuild/LinkTarget.mk | 2
solenv/gbuild/SdiTarget.mk | 7 +-
solenv/gbuild/TargetLocations.mk | 1
solenv/gbuild/UI.mk | 6 +-
solenv/gbuild/UnoApiTarget.mk | 38 ++++++-------
solenv/gbuild/gbuild.mk | 2
testtools/CustomTarget_bridgetest_climaker.mk | 2
testtools/CustomTarget_bridgetest_javamaker.mk | 2
testtools/CustomTarget_uno_test.mk | 15 +----
tools/CustomTarget_reversemap.mk | 3 -
touch/CustomTarget_touch_javamaker.mk | 2
translations | 2
unoil/CustomTarget_climaker.mk | 2
unoil/CustomTarget_javamaker.mk | 2
35 files changed, 229 insertions(+), 146 deletions(-)
New commits:
commit ceb0d0635c7dcdca577d20887c6cdd37517697d1
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 30 13:11:43 2012 +0100
use runtime deps in gbuild classes
Change-Id: I007e0293c354d6f930dffb4a9a2c2df5640a673b
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 641fbe4..969555c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2489,6 +2489,18 @@ $(call gb_Executable_add_runtime_dependencies,bestreversemap,\
)
endef
+# TODO depending on the whole URE might be overkill, but I do not have a
+# Windows machine to debug it...
+# FIXME: the library target should be for build too
+define gb_Executable__register_climaker
+$(call gb_Executable_add_runtime_dependencies,climaker,\
+ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \
+ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \
+ $(call gb_UnoApiMerge_get_target_for_build,ure/types) \
+)
+endef
+
ifneq ($(SYSTEM_ICU),YES)
define gb_Executable__register_gendict
@@ -2499,6 +2511,12 @@ endef
endif
+define gb_Executable__register_idlc
+$(call gb_Executable_add_runtime_dependencies,idlc,\
+ $(call gb_ExternalExecutable_get_dependencies,ucpp) \
+)
+endef
+
define gb_Executable__register_localize
$(call gb_Executable_add_runtime_dependencies,localize,\
$(foreach exec,cfgex helpex propex transex3 treex uiex ulfex xrmex,\
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 65105b6..9e348e7 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -47,9 +47,8 @@
# SrsPartMergeTarget class
-gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build,transex3)
-gb_SrsPartMergeTarget_TRANSEXCOMMAND := \
- $(gb_Helper_set_ld_path) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3)
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(call gb_Executable_get_command,transex3)
define gb_SrsPartMergeTarget__command
$(call gb_Output_announce,$(3),$(true),srs,1)
@@ -67,7 +66,7 @@ rm -rf $${MERGEINPUT}
endef
-$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) $(gb_SrsPartMergeTarget_TRANSEXDEPS)
$(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\
$(call gb_SrsPartMergeTarget__command,$@,$*,$<),\
mkdir -p $(dir $@) && cp $< $@)
@@ -87,8 +86,8 @@ endef
# defined by platform
# gb_SrsPartTarget__command_dep
-gb_ResTarget_RSCTARGET := $(call gb_Executable_get_target_for_build,rsc)
-gb_ResTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_ResTarget_RSCTARGET)
+gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc)
+gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,rsc)
define gb_SrsPartTarget__command
$(call gb_Helper_abbreviate_dirs,\
@@ -106,7 +105,7 @@ $(call gb_Helper_abbreviate_dirs,\
endef
$(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) \
- $(gb_ResTarget_RSCTARGET)
+ $(gb_ResTarget_RSCDEPS)
$(call gb_SrsPartTarget__command_dep,$*,$<)
$(call gb_SrsPartTarget__command,$@,$*,$<)
@@ -363,7 +362,7 @@ $(call gb_ResTarget_get_clean_target,%) :
rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*))
$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
- $(gb_ResTarget_RSCTARGET)
+ $(gb_ResTarget_RSCDEPS)
$(call gb_Output_announce,$*,$(true),RES,2)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) $(OUTDIR)/bin \
@@ -383,7 +382,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
-subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \
-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
- $(filter-out $(gb_Helper_MISCDUMMY) $(gb_ResTarget_RSCTARGET),$^)" \
+ $(filter-out $(gb_Helper_MISCDUMMY) $(gb_ResTarget_RSCDEPS),$^)" \
> $${RESPONSEFILE} && \
$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE})
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index f72a4e0..92e599c 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -11,8 +11,8 @@
gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT)
-gb_CliUnoApiTarget_TARGET := $(call gb_Executable_get_target_for_build,climaker)
-gb_CliUnoApiTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_CliUnoApiTarget_TARGET)
+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)
@@ -35,13 +35,7 @@ $(dir $(call gb_CliUnoApiTarget_get_target,%)).dir :
$(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-# TODO depending on the whole URE might be overkill, but I do not have a
-# Windows machine to debug it...
-$(call gb_CliUnoApiTarget_get_target,%) : \
- $(gb_CliUnoApiTarget_TARGET) \
- $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
- $(call gb_Package_get_target,cppuhelper_unorc) \
- $(call gb_Rdb_get_outdir_target,ure/services)
+$(call gb_CliUnoApiTarget_get_target,%) : $(gb_CliUnoApiTarget_DEPS)
$(call gb_CliUnoApiTarget__command,$@,$*,$<)
.PHONY : $(call gb_CliUnoApiTarget_get_clean_target,%)
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index db65dc5..328c5a8 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_CFGEXTARGET := $(call gb_Executable_get_target_for_build,cfgex)
-gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_CFGEXTARGET)
+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
@@ -271,7 +271,7 @@ rm -rf $${MERGEINPUT}
endef
-$(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET)
+$(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXDEPS)
$(if $(filter $(words $(POFILES)),$(words $(wildcard $(POFILES)))),\
$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),\
mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 55d1181..9c145b6 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -52,7 +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_CPPTESTTARGET := $(call gb_Executable_get_target,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))
@@ -80,7 +81,7 @@ $(call gb_CppunitTest_get_clean_target,%) :
rm -f $(call gb_CppunitTest_get_target,$*) $(call gb_CppunitTest_get_target,$*).log)
.PHONY : $(call gb_CppunitTest_get_target,%)
-$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
+$(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTDEPS)
$(call gb_Output_announce,$*,$(true),CUT,2)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
@@ -91,7 +92,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
DISABLE_SAL_DBGBOX=t \
$(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \
STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) \
- $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET) \
+ $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \
$(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) \
$(call gb_CppunitTest__make_args) \
$(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && $(UNIT_FAILED_MSG) && false))))
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 8e4e45c..b916da2 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_TARGET := $(call gb_Executable_get_target_for_build,idxdict)
-gb_ThesaurusIndexTarget_INDEX_COMMAND := $(gb_Helper_set_ld_path) $(gb_ThesaurusIndexTarget_INDEX_TARGET)
+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)
@@ -28,7 +28,7 @@ $(dir $(call gb_ThesaurusIndexTarget_get_target,%)).dir :
$(dir $(call gb_ThesaurusIndexTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_ThesaurusIndexTarget_get_target,%) : $(gb_ThesaurusIndexTarget_INDEX_TARGET) | $(gb_ThesaurusIndexTarget_CHECK_TARGET)
+$(call gb_ThesaurusIndexTarget_get_target,%) : $(gb_ThesaurusIndexTarget_INDEX_DEPS) | $(gb_ThesaurusIndexTarget_CHECK_TARGET)
$(call gb_ThesaurusIndexTarget__command,$@,$*)
.PHONY : $(call gb_ThesaurusIndexTarget_get_clean_target,%)
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index 4899e13..f21c2e1 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -33,29 +33,21 @@
gb_ExtensionTarget__get_preparation_target = $(WORKDIR)/ExtensionTarget/$(1).prepare
gb_ExtensionTarget_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
-gb_ExtensionTarget_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex)
-gb_ExtensionTarget_XRMEXCOMMAND := \
- $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_XRMEXTARGET)
-
-gb_ExtensionTarget_PROPMERGETARGET := $(call gb_Executable_get_target_for_build,propex)
-gb_ExtensionTarget_PROPMERGECOMMAND := \
- $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_PROPMERGETARGET)
-
-gb_ExtensionTarget_TREEXTARGET := $(call gb_Executable_get_target_for_build,treex)
-gb_ExtensionTarget_TREEXCOMMAND := \
- $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_TREEXTARGET)
-
-gb_ExtensionTarget_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex)
-gb_ExtensionTarget_HELPEXCOMMAND := \
- $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_HELPEXTARGET)
-gb_ExtensionTarget_HELPINDEXERTARGET := \
- $(call gb_Executable_get_target_for_build,HelpIndexer)
-gb_ExtensionTarget_HELPINDEXERCOMMAND := \
- $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_HELPINDEXERTARGET)
-gb_ExtensionTarget_HELPLINKERTARGET := \
- $(call gb_Executable_get_target_for_build,HelpLinker)
-gb_ExtensionTarget_HELPLINKERCOMMAND := \
- $(gb_Helper_set_ld_path) $(gb_ExtensionTarget_HELPLINKERTARGET)
+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,propmerge)
+
+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)
# 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)
@@ -95,7 +87,7 @@ $(call gb_ExtensionTarget_get_workdir,%)/description.xml :
mkdir -p $(call gb_ExtensionTarget_get_workdir,$*) && \
cp -f $(LOCATION)/description.xml $@)
else
-$(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_XRMEXTARGET)
+$(call gb_ExtensionTarget_get_workdir,%)/description.xml : $(gb_ExtensionTarget_XRMEXDEPS)
$(call gb_Output_announce,$*/description.xml,$(true),XRM,3)
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(POFILES) > $${MERGEINPUT} && \
@@ -257,7 +249,7 @@ $(call gb_ExtensionTarget_get_target,$(1)) : $(call gb_ExtensionTarget_get_rootd
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) \
:| $(call gb_ExtensionTarget__get_preparation_target,$(1))
$(call gb_ExtensionTarget_get_rootdir,$(1))/$(2) : $(3) \
- $(gb_ExtensionTarget_PROPMERGETARGET)
+ $(gb_ExtensionTarget_PROPMERGEDEPS)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
$$(call gb_Helper_abbreviate_dirs, \
mkdir -p $$(dir $$@) && \
@@ -334,7 +326,7 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3))))) :
endif
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
- $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXTARGET)) | \
+ $(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXDEPS)) | \
$(call gb_ExtensionTarget_get_workdir,$(1))/help/.dir
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
$(2)/$(or $(4),$(3))
@@ -376,7 +368,7 @@ endif
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
- $(gb_ExtensionTarget_TREEXTARGET) | \
+ $(gb_ExtensionTarget_TREEXDEPS) | \
$(2)/$(4)
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
$(2)/$(or $(4),$(3))
@@ -403,8 +395,8 @@ endef
# gb_ExtensionTarget_add_helpfile)
define gb_ExtensionTarget__compile_help_onelang
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(2).done : \
- $(gb_ExtensionTarget_HELPINDEXERTARGET) \
- $(gb_ExtensionTarget_HELPLINKERTARGET) \
+ $(gb_ExtensionTarget_HELPINDEXERDEPS) \
+ $(gb_ExtensionTarget_HELPLINKERDEPS) \
$(OUTDIR_FOR_BUILD)/bin/embed.xsl \
$(OUTDIR_FOR_BUILD)/bin/idxcaption.xsl \
$(OUTDIR_FOR_BUILD)/bin/idxcontent.xsl | \
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index e7c6b06..fca80c1 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -74,8 +74,8 @@ endef
# ScpPreprocessTarget class
-gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp)
-gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET)
+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
@@ -93,7 +93,7 @@ endef
$(dir $(call gb_ScpPreprocessTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_ScpPreprocessTarget_get_target,%) : $(gb_ScpPreprocessTarget_TARGET)
+$(call gb_ScpPreprocessTarget_get_target,%) : $(gb_ScpPreprocessTarget_DEPS)
$(call gb_ScpPreprocessTarget__command,$@,$*)
.PHONY : $(call gb_ScpPreprocessTarget_get_clean_target,%)
@@ -111,8 +111,8 @@ endef
# ScpMergeTarget class
-gb_ScpMergeTarget_TARGET := $(call gb_Executable_get_target_for_build,ulfex)
-gb_ScpMergeTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpMergeTarget_TARGET)
+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
@@ -129,7 +129,7 @@ endef
$(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET)
+$(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_DEPS)
$(call gb_ScpMergeTarget__command,$@,$*)
.PHONY : $(call gb_ScpMergeTarget_get_clean_target,%)
@@ -155,8 +155,8 @@ endef
# platform:
# gb_ScpConvertTarget_ScpConvertTarget_platform
-gb_ScpConvertTarget_TARGET := $(call gb_Executable_get_target_for_build,ulfconv)
-gb_ScpConvertTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpConvertTarget_TARGET)
+gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv)
+gb_ScpConvertTarget_COMMAND := $(call gb_Executable_get_command,ulfconv)
define gb_ScpConvertTarget__command
$(call gb_Output_announce,$(2),$(true),SCC,1)
@@ -168,7 +168,7 @@ endef
$(dir $(call gb_ScpConvertTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_TARGET)
+$(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_DEPS)
$(call gb_ScpConvertTarget__command,$@,$*)
.PHONY : $(call gb_ScpConvertTarget_get_clean_target,%)
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index d03226c..2fb94f0 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -419,7 +419,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(8),$(call gb_GenCObject_get_dep_target,$(object))) \
$(foreach object,$(9),$(call gb_GenCxxObject_get_dep_target,$(object))) \
) && \
- $(call gb_Executable_get_target_for_build,concat-deps) $${RESPONSEFILE} > $(1)) && \
+ $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \
rm -f $${RESPONSEFILE}
endef
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 43e38ab..6ecc79d 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -31,11 +31,10 @@
# (This can be workarounded by using gb_Package, but really should not.)
# SdiTarget class
-gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
-gb_SdiTarget_SVIDLCOMMAND := \
- $(gb_Helper_set_ld_path) $(gb_SdiTarget_SVIDLTARGET)
+gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl)
+gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl)
-$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLTARGET)
+$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS)
$(call gb_Output_announce,$*,$(true),SDI,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) $(dir $(call gb_SdiTarget_get_dep_target,$*)))
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 4fdde7c..16624813 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -13,8 +13,8 @@
gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget
-gb_UILocalizeTarget_TARGET := $(call gb_Executable_get_target_for_build,uiex)
-gb_UILocalizeTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_UILocalizeTarget_TARGET)
+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
@@ -51,7 +51,7 @@ $(dir $(call gb_UILocalizeTarget_get_target,%)).dir :
$(dir $(call gb_UILocalizeTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-$(call gb_UILocalizeTarget_get_target,%) : $(gb_UILocalizeTarget_TARGET)
+$(call gb_UILocalizeTarget_get_target,%) : $(gb_UILocalizeTarget_DEPS)
$(call gb_UILocalizeTarget__command,$@,$*)
.PHONY : $(call gb_UILocalizeTarget_get_clean_target,%)
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 4f2f88d..13f4aaf 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -28,8 +28,8 @@
# UnoApiPartTarget
-gb_UnoApiPartTarget_IDLCTARGET := $(call gb_Executable_get_target_for_build,idlc)
-gb_UnoApiPartTarget_IDLCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiPartTarget_IDLCTARGET)
+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.
@@ -70,10 +70,8 @@ endef
# If idlc changed, rebuild everything; otherwise just the changed files.
# In order for this to work the .urd files need to have a dependency on
# idlc as well so their dummy rule fires if that changes.
-$(call gb_UnoApiPartTarget_get_target,%.done) : \
- $(gb_UnoApiPartTarget_IDLCTARGET) \
- | $(call gb_ExternalExecutable_get_dependencies,ucpp)
- $(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCTARGET),$(if $(filter $(gb_UnoApiPartTarget_IDLCTARGET),$?),$^,$?)))
+$(call gb_UnoApiPartTarget_get_target,%.done) : $(gb_UnoApiPartTarget_IDLCDEPS)
+ $(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCDEPS),$(if $(filter $(gb_UnoApiPartTarget_IDLCDEPS),$?),$^,$?)))
ifeq ($(gb_FULLDEPS),$(true))
@@ -85,10 +83,10 @@ endif
# UnoApiTarget
-gb_UnoApiTarget_REGCOMPARETARGET := $(call gb_Executable_get_target_for_build,regcompare)
-gb_UnoApiTarget_REGCOMPARECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
-gb_UnoApiTarget_REGMERGETARGET := $(call gb_Executable_get_target_for_build,regmerge)
-gb_UnoApiTarget_REGMERGECOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+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)
@@ -148,7 +146,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\
$(foreach idl,$(patsubst %.idl,%,$(3)),$(call gb_UnoApiPartTarget_get_dep_target,$(idl)))) && \
- $(call gb_Executable_get_target_for_build,concat-deps) $${RESPONSEFILE} > $(1)) && \
+ $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1)) && \
rm -f $${RESPONSEFILE}
endef
@@ -185,7 +183,7 @@ $(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd)
$(call gb_UnoApiTarget__add_urdfile,$(1),$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd))
$(call gb_UnoApiPartTarget_get_target,$(2)/$(3).urd) \
- : $(gb_UnoApiPartTarget_IDLCTARGET) \
+ : $(gb_UnoApiPartTarget_IDLCDEPS) \
| $(call gb_UnoApiPartTarget_get_target,$(2)/.dir)
ifeq ($(gb_FULLDEPS),$(true))
@@ -208,7 +206,7 @@ endef
define gb_UnoApiTarget_add_idlfiles
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl)))
$(call gb_UnoApiTarget__add_idlfiles,$(1),$(2),$(3))
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGETARGET)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGEDEPS)
endef
@@ -223,7 +221,7 @@ endef
define gb_UnoApiTarget_merge_api
$(foreach rdb,$(2),$(call gb_UnoApiTarget__merge_api,$(1),$(rdb)))
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGETARGET)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGMERGEDEPS)
endef
@@ -243,7 +241,7 @@ endef
define gb_UnoApiTarget_set_reference_rdbfile
$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb
-$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGCOMPARETARGET)
+$(call gb_UnoApiTarget_get_target,$(1)) : $(gb_UnoApiTarget_REGCOMPAREDEPS)
endef
@@ -298,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_CPPUMAKERTARGET := $(call gb_Executable_get_target_for_build,cppumaker)
-gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
+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,\
@@ -314,17 +312,17 @@ define gb_UnoApiHeadersTarget__command
endef
$(call gb_UnoApiHeadersTarget_get_real_bootstrap_target,%) : \
- $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
+ $(gb_UnoApiHeadersTarget_CPPUMAKERDEPS)
$(call gb_Output_announce,$*,$(true),HPB,3) \
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*))
$(call gb_UnoApiHeadersTarget_get_real_comprehensive_target,%) : \
- $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
+ $(gb_UnoApiHeadersTarget_CPPUMAKERDEPS)
$(call gb_Output_announce,$*,$(true),HPC,3)
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C)
$(call gb_UnoApiHeadersTarget_get_real_target,%) : \
- $(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
+ $(gb_UnoApiHeadersTarget_CPPUMAKERDEPS)
$(call gb_Output_announce,$*,$(true),HPP,3) \
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L)
commit 7cdd83467a51c4a83b43ddc01e645dcc0fd549cb
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 30 12:27:14 2012 +0100
change translations
Change-Id: I8cbe4f73343fddccc878a8b1929eff7e9a6c4db7
diff --git a/translations b/translations
index 85f724f..f3cea5b 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 85f724f5aa1d6a59662a7d1c7ea406a641814bd2
+Subproject commit f3cea5b3aea0f884d517e6d1b1413bf26e0e7bb4
commit edf6730fd572788bac28f9fdeb84d25edfe04c0f
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 30 12:27:04 2012 +0100
add runtime deps for custom targets
Change-Id: I49272003ea72c84c9e81bc826820b0ac5f9d5008
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index abfc4a3..641fbe4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2482,6 +2482,59 @@ endif # SYSTEM_JFREEREPORT
# Executables
+# FIXME: the library target should be for build too
+define gb_Executable__register_bestreversemap
+$(call gb_Executable_add_runtime_dependencies,bestreversemap,\
+ $(if $(filter-out ANDROID,$(OS)),$(call gb_Library_get_target,sal_textenc)) \
+)
+endef
+
+ifneq ($(SYSTEM_ICU),YES)
+
+define gb_Executable__register_gendict
+$(call gb_Executable_add_runtime_dependencies,gendict,\
+ $(call gb_Package_get_target_for_build,icu) \
+)
+endef
+
+endif
+
+define gb_Executable__register_localize
+$(call gb_Executable_add_runtime_dependencies,localize,\
+ $(foreach exec,cfgex helpex propex transex3 treex uiex ulfex xrmex,\
+ $(call gb_Executable_get_runtime_dependencies,$(exec)) \
+ ) \
+)
+endef
+
+# The dependencies on ure/services.rdb and ure/types.rdb are implicitly required
+# due to the settings for URE_SERVICES and URE_TYPES in cppuhelper/source/unorc:
+# FIXME: the library target should be for build too
+define gb_Executable__register_saxparser
+$(call gb_Executable_add_runtime_dependencies,saxparser,\
+ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \
+ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \
+ $(call gb_UnoApiMerge_get_target_for_build,ure/types) \
+)
+endef
+
+# NOTE: the dependencies on ure/services.rdb and ure/types.rdb are implicitly
+# required due to the settings for URE_SERVICES and URE_TYPES in
+# cppuhelper/source/unorc
+# FIXME: the library target should be for build too
+define gb_Executable__register_uno
+$(call gb_Executable_add_runtime_dependencies,uno,\
+ $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+ $(call gb_Package_get_target_for_build,cppuhelper_unorc) \
+ $(call gb_Rdb_get_outdir_target_for_build,ure/services) \
+ $(call gb_UnoApiMerge_get_target_for_build,ure/types) \
+)
+endef
+
+
+# External executables
+
ifneq ($(SYSTEM_LIBXML_FOR_BUILD),YES)
gb_ExternalExecutable__register_xmllint :=
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index 067c882..a8fe3bd 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -30,18 +30,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator))
i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
-ifeq ($(SYSTEM_ICU),NO)
-i18npool_ICUTARGET := $(call gb_ExternalPackage_get_target,icu)
-else
-i18npool_ICUTARGET :=
-endif
-
$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
$(i18npool_BIDIR)/dict_ja.cxx $(i18npool_BIDIR)/dict_zh.cxx $(i18npool_BIDIR)/OpenOffice_dat.c
$(i18npool_BIDIR)/dict_%.cxx : \
$(SRCDIR)/i18npool/source/breakiterator/data/%.dic \
- $(call gb_Executable_get_target_for_build,gendict) $(i18npool_ICUTARGET) \
+ $(call gb_Executable_get_runtime_dependencies,gendict) \
| $(i18npool_BIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
$(call gb_Helper_abbreviate_dirs,\
diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk
index 2613f67..c570d5a 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -56,7 +56,7 @@ $(call gb_CustomTarget_get_target,i18npool/collator) : $(SRCDIR)/i18npool/Custom
$(i18npool_CODIR)/collator_%.cxx : \
$(SRCDIR)/i18npool/source/collator/data/%.txt \
- $(call gb_Executable_get_target_for_build,gencoll_rule) \
+ $(call gb_Executable_get_runtime_dependencies,gencoll_rule) \
| $(i18npool_CODIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1)
$(call gb_Helper_abbreviate_dirs, \
diff --git a/i18npool/CustomTarget_indexentry.mk b/i18npool/CustomTarget_indexentry.mk
index 03a8ff5..bd78b67 100644
--- a/i18npool/CustomTarget_indexentry.mk
+++ b/i18npool/CustomTarget_indexentry.mk
@@ -45,7 +45,7 @@ $(call gb_CustomTarget_get_target,i18npool/indexentry) : $(SRCDIR)/i18npool/Cust
$(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx : \
$(SRCDIR)/i18npool/source/indexentry/data/%.txt \
- $(call gb_Executable_get_target_for_build,genindex_data) \
+ $(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_Helper_abbreviate_dirs, \
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index c56603a..824cfde 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -34,16 +34,10 @@ $(call gb_CustomTarget_get_target,i18npool/localedata) : \
$(patsubst %.xml,$(i18npool_LDDIR)/localedata_%.cxx, \
$(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
-# The dependencies on ure/services.rdb and ure/types.rdb are implicitly required
-# due to the settings for URE_SERVICES and URE_TYPES in cppuhelper/source/unorc:
$(i18npool_LDDIR)/localedata_%.cxx : \
$(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(i18npool_LDDIR)/saxparser.rdb \
- $(call gb_UnoApiMerge_get_target_for_build,ure/types) \
- $(call gb_Executable_get_target_for_build,saxparser) \
- $(call gb_Rdb_get_outdir_target_for_build,ure/services) \
- $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
- $(call gb_Package_get_target_for_build,cppuhelper_unorc)
+ $(call gb_Executable_get_runtime_dependencies,saxparser)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
$(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,saxparser) $* $< $@.tmp \
diff --git a/i18npool/CustomTarget_textconversion.mk b/i18npool/CustomTarget_textconversion.mk
index 30dc2d7..7846680 100644
--- a/i18npool/CustomTarget_textconversion.mk
+++ b/i18npool/CustomTarget_textconversion.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,i18npool/textconversion) : \
$(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx : \
$(SRCDIR)/i18npool/source/textconversion/data/%.dic \
- $(call gb_Executable_get_target_for_build,genconv_dict) \
+ $(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_Helper_abbreviate_dirs, \
diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk
index 9707d54..cc785be 100644
--- a/jurt/CustomTarget_test_urp.mk
+++ b/jurt/CustomTarget_test_urp.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp)
$(jurt_TESTURP)/done : \
$(call gb_UnoApiTarget_get_target,test_urp) \
$(OUTDIR)/bin/udkapi.rdb \
- $(call gb_Executable_get_target_for_build,javamaker)
+ $(call gb_Executable_get_runtime_dependencies,javamaker)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
rm -rf $(jurt_TESTURP) && \
$(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/udkapi.rdb) && \
diff --git a/librelogo/CustomTarget_librelogo.mk b/librelogo/CustomTarget_librelogo.mk
index 03d6e6c..2251346 100644
--- a/librelogo/CustomTarget_librelogo.mk
+++ b/librelogo/CustomTarget_librelogo.mk
@@ -32,17 +32,14 @@ librelogo_LANGS := $(filter-out qtz,$(filter-out en-US,$(gb_WITH_LANG)))
$(eval $(foreach lang,$(librelogo_LANGS),$(call librelogo_Properties_Properties,$(subst -,_,$(lang)),$(lang))))
endif
-librelogo_PROPMERGETARGET := $(call gb_Executable_get_target_for_build,propex)
-librelogo_PROPMERGECOMMAND := $(gb_Helper_set_ld_path) $(librelogo_PROPMERGETARGET)
-
$(librelogo_DIR)/LibreLogo_%.properties : \
- $(librelogo_PROPMERGETARGET) \
+ $(call gb_Executable_get_runtime_dependencies,propex) \
| $(librelogo_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRP,1)
$(call gb_Helper_abbreviate_dirs, \
MERGEINPUT=`$(gb_MKTEMP)` && \
echo $(POFILE) > $${MERGEINPUT} && \
- $(librelogo_PROPMERGECOMMAND) \
+ $(call gb_Executable_get_command,propex) \
-p librelogo \
-i $(SOURCE) \
-o $@ \
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index f5af682..0989598 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -23,9 +23,6 @@ readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_o
readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/readme_%.txt
endif
-readlicense_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex)
-readlicense_XRMEXCOMMAND := $(gb_Helper_set_ld_path) $(readlicense_XRMEXTARGET)
-
$(call gb_CustomTarget_get_target,readlicense_oo/readme) : $(readlicense_oo_READMEs)
ifeq ($(strip $(gb_WITH_LANG)),)
@@ -35,14 +32,14 @@ readlicense_oo_README_XRM := $(readlicense_oo_DIR)/readme.xrm
$(readlicense_oo_DIR)/readme.xrm : \
$(SRCDIR)/readlicense_oo/docs/readme.xrm \
- $(readlicense_XRMEXTARGET) \
+ $(call gb_Executable_get_runtime_dependencies,xrmex) \
$(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_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} && \
- $(readlicense_XRMEXCOMMAND) \
+ $(call gb_Executable_get_command,xrmex) \
-p readlicense_oo \
-i $< \
-o $@ \
diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk
index 974de51..cdfece4 100644
--- a/ridljar/CustomTarget_javamaker.mk
+++ b/ridljar/CustomTarget_javamaker.mk
@@ -32,7 +32,7 @@ ridljar_DIR := $(call gb_CustomTarget_get_workdir,ridljar/javamaker)
$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(ridljar_DIR)/done
$(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \
- $(call gb_Executable_get_target_for_build,javamaker) \
+ $(call gb_Executable_get_runtime_dependencies,javamaker) \
| $(ridljar_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 77a3358..6a07701 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -35,15 +35,15 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
$(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
- | $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
- $(call gb_Executable_get_target_for_build,lngconvex)
+ $(call gb_Executable_get_runtime_dependencies,lngconvex) \
+ | $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
$(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) \
- $(call gb_Executable_get_target_for_build,lngconvex) \
+ $(call gb_Executable_get_command,lngconvex) \
-ulf shlxthdl.ulf \
-rc $@ \
-rct rctmpl.txt \
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index 2f04fa6..16f606f 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
$(testtools_CLIDIR)/cli_types_bridgetest.dll : \
$(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
- $(call gb_Executable_get_target_for_build,climaker) \
+ $(call gb_Executable_get_runtime_dependencies,climaker) \
| $(testtools_CLIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
$(call gb_Helper_abbreviate_dirs, \
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index 2dd0af4..ab4469c 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(testtools_
$(testtools_JAVADIR)/done : \
$(call gb_UnoApiTarget_get_target,bridgetest) \
$(OUTDIR)/bin/types.rdb \
- $(call gb_Executable_get_target_for_build,javamaker) \
+ $(call gb_Executable_get_runtime_dependencies,javamaker) \
| $(testtools_JAVADIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index 381c746..7162611 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -29,21 +29,12 @@ $(eval $(call gb_CustomTarget_CustomTarget,testtools/uno_test))
# this target is phony to run it every time
.PHONY : $(call gb_CustomTarget_get_target,testtools/uno_test)
-# NOTE: the dependencies on ure/services.rdb and ure/types.rdb are implicitly
-# required due to the settings for URE_SERVICES and URE_TYPES in
-# cppuhelper/source/unorc; the dependency on ure/services.rdb is also there
-# because we need some of the URE libs from stoc and this is the easiest way to
-# ensure they are available when the test is run .-)
$(call gb_CustomTarget_get_target,testtools/uno_test) : \
- $(call gb_Executable_get_target_for_build,uno) \
+ $(call gb_Executable_get_runtime_dependencies,uno) \
$(call gb_InternalUnoApi_get_target,bridgetest) \
- $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
- $(call gb_Package_get_target_for_build,cppuhelper_unorc) \
- $(call gb_Rdb_get_outdir_target,uno_services) \
- $(call gb_Rdb_get_outdir_target_for_build,ure/services) \
- $(call gb_UnoApiMerge_get_target_for_build,ure/types)
+ $(call gb_Rdb_get_outdir_target,uno_services)
$(call gb_Helper_abbreviate_dirs,\
- $(call gb_Executable_get_target_for_build,uno) \
+ $(call gb_Executable_get_command,uno) \
-s com.sun.star.test.bridge.BridgeTest \
-- com.sun.star.test.bridge.CppTestObject \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_outdir_target,uno_services)) \
diff --git a/tools/CustomTarget_reversemap.mk b/tools/CustomTarget_reversemap.mk
index 5cfdaed..f4056cc 100644
--- a/tools/CustomTarget_reversemap.mk
+++ b/tools/CustomTarget_reversemap.mk
@@ -29,8 +29,7 @@ $(call gb_CustomTarget_get_target,tools/reversemap) : \
$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx
$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx : \
- $(call gb_Executable_get_target_for_build,bestreversemap) \
- | $(if $(filter-out ANDROID,$(OS)),$(call gb_Library_get_target,sal_textenc)) \
+ $(call gb_Executable_get_runtime_dependencies,bestreversemap) \
$(call gb_CustomTarget_get_workdir,tools/reversemap)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
$(call gb_Helper_execute,bestreversemap > $@)
diff --git a/touch/CustomTarget_touch_javamaker.mk b/touch/CustomTarget_touch_javamaker.mk
index ccb135a..f0537fa 100644
--- a/touch/CustomTarget_touch_javamaker.mk
+++ b/touch/CustomTarget_touch_javamaker.mk
@@ -13,7 +13,7 @@ touch_javamaker_DIR := $(call gb_CustomTarget_get_workdir,touch)
$(call gb_CustomTarget_get_target,touch/touch_javamaker) : $(touch_javamaker_DIR)/done
$(touch_javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,touch) $(OUTDIR)/bin/types.rdb \
- $(call gb_Executable_get_target_for_build,javamaker) | $(touch_javamaker_DIR)/.dir
+ $(call gb_Executable_get_runtime_dependencies,javamaker) | $(touch_javamaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
rm -r $(touch_javamaker_DIR) && \
diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk
index a19a3a5..fc0a39a 100644
--- a/unoil/CustomTarget_climaker.mk
+++ b/unoil/CustomTarget_climaker.mk
@@ -39,7 +39,7 @@ $(call gb_CustomTarget_get_target,unoil/climaker) : \
$(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
$(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
$(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
- $(call gb_Executable_get_target_for_build,climaker) \
+ $(call gb_Executable_get_runtime_dependencies,climaker) \
| $(unoil_CLIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
$(call gb_Helper_abbreviate_dirs, \
diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk
index 5419f96..27e45dc 100644
--- a/unoil/CustomTarget_javamaker.mk
+++ b/unoil/CustomTarget_javamaker.mk
@@ -32,7 +32,7 @@ unoil_JAVADIR := $(call gb_CustomTarget_get_workdir,unoil/javamaker)
$(call gb_CustomTarget_get_target,unoil/javamaker) : $(unoil_JAVADIR)/done
$(unoil_JAVADIR)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
- $(call gb_Executable_get_target_for_build,javamaker) \
+ $(call gb_Executable_get_runtime_dependencies,javamaker) \
| $(unoil_JAVADIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
$(call gb_Helper_abbreviate_dirs, \
commit 0d6f8e5c048d3caef43bf26f2ae683224dec6921
Author: David Tardon <dtardon at redhat.com>
Date: Sun Dec 30 12:20:50 2012 +0100
allow setting runtime deps of executables in one place
Change-Id: I325287cba773df848a8797486c149502abae9c9d
diff --git a/solenv/bin/concat-deps b/solenv/bin/concat-deps
new file mode 100755
index 0000000..6391ed6
Binary files /dev/null and b/solenv/bin/concat-deps differ
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 2fa6750..4683d0e 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -31,10 +31,20 @@
# defined by platform
# gb_Executable_Executable_platform
+$(dir $(call gb_Executable_get_runtime_target,%)).dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_Executable_get_runtime_target,%))%/.dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_Executable_get_runtime_target,%) : $(call gb_Executable_get_target,%)
+ touch $@
+
.PHONY : $(call gb_Executable_get_clean_target,%)
$(call gb_Executable_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Executable_get_target,$*) \
+ $(call gb_Executable_get_runtime_target,$*) \
$(AUXTARGETS))
define gb_Executable_Executable
@@ -52,6 +62,7 @@ $(call gb_LinkTarget_set_targettype,$(2),Executable)
$(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS))
$(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \
| $(dir $(call gb_Executable_get_target,$(1))).dir
+$(call gb_Executable_get_runtime_target,$(1)) :| $(dir $(call gb_Executable_get_runtime_target,$(1))).dir
$(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Executable_Executable_platform,$(1),$(2))
@@ -148,4 +159,39 @@ $(eval $(foreach method,\
$(call gb_Executable_forward_to_Linktarget,$(method))\
))
+# Run-time use
+
+# Add dependencies needed for running the executable
+#
+# gb_Executable_add_runtime_dependencies executable dependencies
+define gb_Executable_add_runtime_dependencies
+$(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
+define gb_Executable_get_runtime_dependencies
+$(call gb_Executable_get_runtime_target,$(1))
+endef
+
+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
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 9c6b6e9..c7ffdc6 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -133,6 +133,14 @@ gb_Jar_KNOWN := $$(foreach group,$$(gb_Jar_VALIDGROUPS),$$(gb_Jar_$$(group)))
endef
+define gb_Helper_process_executable_registrations
+$(foreach group,$(gb_Executable_VALIDGROUPS),\
+ $(foreach executable,$(gb_Executable_$(group)),\
+ $(if $(filter-out undefined,$(origin gb_Executable__register_$(executable))),\
+ $(call gb_Executable__register_$(executable)))))
+
+endef
+
define gb_Helper_register_executables
ifeq ($$(filter $(1),$$(gb_Executable_VALIDGROUPS)),)
$$(eval $$(call gb_Output_error,$(1) is not a valid group for executables. Valid groups are: $$(gb_Executable_VALIDGROUPS)))
@@ -198,7 +206,7 @@ $(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def)))
endef
define gb_Helper_execute
-$(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
+$(call gb_Executable_get_command,$(1))
endef
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index d9213ec..b201fbb 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -106,6 +106,7 @@ gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
+gb_Executable_get_runtime_target = $(WORKDIR)/Executable/$(1).run
gb_ExtensionTarget_get_target = $(WORKDIR)/ExtensionTarget/$(1).oxt
gb_ExtensionTarget_get_rootdir = $(WORKDIR)/ExtensionTarget/$(1)/root
gb_ExtensionTarget_get_workdir = $(WORKDIR)/ExtensionTarget/$(1)
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index edb95c5..d7b804d 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -337,6 +337,8 @@ include $(foreach class, \
InstallScript \
,$(GBUILDDIR)/$(class).mk)
+$(eval $(call gb_Helper_process_executable_registrations))
+
# optional extensions that should never be essential
ifneq ($(wildcard $(GBUILDDIR)/extensions/post_*.mk),)
include $(wildcard $(GBUILDDIR)/extensions/post_*.mk)
More information about the Libreoffice-commits
mailing list