mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I did not want to push that...

Browse Source 
It does not work, anyway.

This reverts commit ee18b30b03.

Change-Id: Ibe21a2a62ecbfaf8dcd87113bde386050ffde25a
This commit is contained in:
David Tardon
2012-12-31 12:59:47 +01:00
parent a084ea6068
commit 7d6112773e
12 changed files with 72 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
solenv/gbuild/AllLangResTarget.mk
View File

@@ -47,8 +47,8 @@
# SrsPartMergeTarget class # SrsPartMergeTarget class
gb_SrsPartMergeTarget_TRANSEXDEPS = $(call gb_Executable_get_runtime_dependencies,transex3) gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3)
gb_SrsPartMergeTarget_TRANSEXCOMMAND = $(call gb_Executable_get_command,transex3) gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,transex3)
define gb_SrsPartMergeTarget__command define gb_SrsPartMergeTarget__command
$(call gb_Output_announce,$(3),$(true),srs,1) $(call gb_Output_announce,$(3),$(true),srs,1)
@@ -86,8 +86,8 @@ endef
# defined by platform # defined by platform
# gb_SrsPartTarget__command_dep # gb_SrsPartTarget__command_dep
gb_ResTarget_RSCDEPS = $(call gb_Executable_get_runtime_dependencies,rsc) 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_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,rsc)
define gb_SrsPartTarget__command define gb_SrsPartTarget__command
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\

4
solenv/gbuild/CliUnoApi.mk
View File

@@ -11,8 +11,8 @@
gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT) gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT)
gb_CliUnoApiTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,climaker) gb_CliUnoApiTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker)
gb_CliUnoApiTarget_COMMAND = $(call gb_Executable_get_command,climaker) gb_CliUnoApiTarget_COMMAND := $(call gb_Executable_get_command,climaker)
define gb_CliUnoApiTarget__command define gb_CliUnoApiTarget__command
$(call gb_Output_announce,$(2),$(true),CLI,4) $(call gb_Output_announce,$(2),$(true),CLI,4)

4
solenv/gbuild/Configuration.mk
View File

@@ -251,8 +251,8 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
# XcuMergeTarget class # XcuMergeTarget class
gb_XcuMergeTarget_CFGEXDEPS = $(call gb_Executable_get_runtime_dependencies,cfgex) gb_XcuMergeTarget_CFGEXDEPS := $(call gb_Executable_get_runtime_dependencies,cfgex)
gb_XcuMergeTarget_CFGEXCOMMAND = $(call gb_Executable_get_command,cfgex) gb_XcuMergeTarget_CFGEXCOMMAND := $(call gb_Executable_get_command,cfgex)
# PRJNAME is computed from the stem (parameter $(2)) # PRJNAME is computed from the stem (parameter $(2))
define gb_XcuMergeTarget__command define gb_XcuMergeTarget__command

4
solenv/gbuild/CppunitTest.mk
View File

@@ -52,8 +52,8 @@ endif
# gb_CppunitTest_get_filename # 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 # 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) ifneq ($(CROSS_COMPILING),YES)
gb_CppunitTest_CPPTESTDEPS = $(call gb_Executable_get_runtime_dependencies,cppunit/cppunittester) gb_CppunitTest_CPPTESTDEPS := $(call gb_Executable_get_runtime_dependencies,cppunit/cppunittester)
gb_CppunitTest_CPPTESTCOMMAND = $(call gb_Executable_get_command,cppunit/cppunittester) gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_command,cppunit/cppunittester)
endif endif
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1)) gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))

4
solenv/gbuild/Dictionary.mk
View File

@@ -11,8 +11,8 @@
gb_ThesaurusIndexTarget_CHECK_TARGET := $(SRCDIR)/dictionaries/util/th_check.pl 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_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_DEPS := $(call gb_Executable_get_runtime_dependencies,idxdict)
gb_ThesaurusIndexTarget_INDEX_COMMAND = $(call gb_Executable_get_command,idxdict) gb_ThesaurusIndexTarget_INDEX_COMMAND := $(call gb_Executable_get_command,idxdict)
define gb_ThesaurusIndexTarget__command define gb_ThesaurusIndexTarget__command
$(call gb_Output_announce,$(2),$(true),THI,1) $(call gb_Output_announce,$(2),$(true),THI,1)

24
solenv/gbuild/Executable.mk
View File

@@ -169,28 +169,4 @@ $(call gb_Executable_get_runtime_target,$(1)) : $(2)
endef 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: # vim: set noet sw=4:

24
solenv/gbuild/ExtensionTarget.mk
View File

@@ -33,21 +33,21 @@
gb_ExtensionTarget__get_preparation_target = $(WORKDIR)/ExtensionTarget/$(1).prepare gb_ExtensionTarget__get_preparation_target = $(WORKDIR)/ExtensionTarget/$(1).prepare
gb_ExtensionTarget_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q) gb_ExtensionTarget_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
gb_ExtensionTarget_XRMEXDEPS = $(call gb_Executable_get_runtime_dependencies,xrmex) gb_ExtensionTarget_XRMEXDEPS := $(call gb_Executable_get_runtime_dependencies,xrmex)
gb_ExtensionTarget_XRMEXCOMMAND = $(call gb_Executable_get_command,xrmex) gb_ExtensionTarget_XRMEXCOMMAND := $(call gb_Executable_get_command,xrmex)
gb_ExtensionTarget_PROPMERGEDEPS = $(call gb_Executable_get_runtime_dependencies,propex) gb_ExtensionTarget_PROPMERGEDEPS := $(call gb_Executable_get_runtime_dependencies,propex)
gb_ExtensionTarget_PROPMERGECOMMAND = $(call gb_Executable_get_command,propex) gb_ExtensionTarget_PROPMERGECOMMAND := $(call gb_Executable_get_command,propex)
gb_ExtensionTarget_TREEXDEPS = $(call gb_Executable_get_runtime_dependencies,treex) gb_ExtensionTarget_TREEXDEPS := $(call gb_Executable_get_runtime_dependencies,treex)
gb_ExtensionTarget_TREEXCOMMAND = $(call gb_Executable_get_command,treex) gb_ExtensionTarget_TREEXCOMMAND := $(call gb_Executable_get_command,treex)
gb_ExtensionTarget_HELPEXDEPS = $(call gb_Executable_get_runtime_dependencies,helpex) gb_ExtensionTarget_HELPEXDEPS := $(call gb_Executable_get_runtime_dependencies,helpex)
gb_ExtensionTarget_HELPEXCOMMAND = $(call gb_Executable_get_command,helpex) gb_ExtensionTarget_HELPEXCOMMAND := $(call gb_Executable_get_command,helpex)
gb_ExtensionTarget_HELPINDEXERDEPS = $(call gb_Executable_get_runtime_dependencies,HelpIndexer) gb_ExtensionTarget_HELPINDEXERDEPS := $(call gb_Executable_get_runtime_dependencies,HelpIndexer)
gb_ExtensionTarget_HELPINDEXERCOMMAND = $(call gb_Executable_get_command,HelpIndexer) gb_ExtensionTarget_HELPINDEXERCOMMAND := $(call gb_Executable_get_command,HelpIndexer)
gb_ExtensionTarget_HELPLINKERDEPS = $(call gb_Executable_get_runtime_dependencies,HelpLinker) gb_ExtensionTarget_HELPLINKERDEPS := $(call gb_Executable_get_runtime_dependencies,HelpLinker)
gb_ExtensionTarget_HELPLINKERCOMMAND = $(call gb_Executable_get_command,HelpLinker) gb_ExtensionTarget_HELPLINKERCOMMAND := $(call gb_Executable_get_command,HelpLinker)
# does not contain en-US because it is special cased in gb_ExtensionTarget_ExtensionTarget # 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_TRANS_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
gb_ExtensionTarget_ALL_LANGS := en-US $(gb_ExtensionTarget_TRANS_LANGS) gb_ExtensionTarget_ALL_LANGS := en-US $(gb_ExtensionTarget_TRANS_LANGS)

12
solenv/gbuild/InstallModuleTarget.mk
View File

@@ -74,8 +74,8 @@ endef
# ScpPreprocessTarget class # ScpPreprocessTarget class
gb_ScpPreprocessTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,cpp) gb_ScpPreprocessTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,cpp)
gb_ScpPreprocessTarget_COMMAND = $(call gb_Executable_get_command,cpp) gb_ScpPreprocessTarget_COMMAND := $(call gb_Executable_get_command,cpp)
gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp
@@ -111,8 +111,8 @@ endef
# ScpMergeTarget class # ScpMergeTarget class
gb_ScpMergeTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,ulfex) gb_ScpMergeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfex)
gb_ScpMergeTarget_COMMAND = $(call gb_Executable_get_command,ulfex) gb_ScpMergeTarget_COMMAND := $(call gb_Executable_get_command,ulfex)
gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf
@@ -155,8 +155,8 @@ endef
# platform: # platform:
# gb_ScpConvertTarget_ScpConvertTarget_platform # gb_ScpConvertTarget_ScpConvertTarget_platform
gb_ScpConvertTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,ulfconv) gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv)
gb_ScpConvertTarget_COMMAND = $(call gb_Executable_get_command,ulfconv) gb_ScpConvertTarget_COMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,ulfconv)
define gb_ScpConvertTarget__command define gb_ScpConvertTarget__command
$(call gb_Output_announce,$(2),$(true),SCC,1) $(call gb_Output_announce,$(2),$(true),SCC,1)

4
solenv/gbuild/SdiTarget.mk
View File

@@ -31,8 +31,8 @@
# (This can be workarounded by using gb_Package, but really should not.) # (This can be workarounded by using gb_Package, but really should not.)
# SdiTarget class # SdiTarget class
gb_SdiTarget_SVIDLDEPS = $(call gb_Executable_get_runtime_dependencies,svidl) gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl)
gb_SdiTarget_SVIDLCOMMAND = $(call gb_Executable_get_command,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_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS)
$(call gb_Output_announce,$*,$(true),SDI,1) $(call gb_Output_announce,$*,$(true),SDI,1)

30
solenv/gbuild/TargetLocations.mk
View File

@@ -343,6 +343,36 @@ define gb_StaticLibrary_get_filename
$(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES))) $(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
endef 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_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1)) gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1)) gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))

4
solenv/gbuild/UI.mk
View File

@@ -13,8 +13,8 @@
gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget
gb_UILocalizeTarget_DEPS = $(call gb_Executable_get_runtime_dependencies,uiex) gb_UILocalizeTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,uiex)
gb_UILocalizeTarget_COMMAND = $(call gb_Executable_get_command,uiex) gb_UILocalizeTarget_COMMAND := $(call gb_Executable_get_command,uiex)
# If translatable strings from a .ui file are not merged into the # If translatable strings from a .ui file are not merged into the
# respective .po file yet, the produced translated files are empty (that # respective .po file yet, the produced translated files are empty (that

16
solenv/gbuild/UnoApiTarget.mk
View File

@@ -28,8 +28,8 @@
# UnoApiPartTarget # UnoApiPartTarget
gb_UnoApiPartTarget_IDLCDEPS = $(call gb_Executable_get_runtime_dependencies,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) 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, # The .urd files are actually created by the gb_UnoApiPartTarget__command,
# invoked for the per-directory .done files. # invoked for the per-directory .done files.
@@ -83,10 +83,10 @@ endif
# UnoApiTarget # UnoApiTarget
gb_UnoApiTarget_REGCOMPAREDEPS = $(call gb_Executable_get_runtime_dependencies,regcompare) 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_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regcompare)
gb_UnoApiTarget_REGMERGEDEPS = $(call gb_Executable_get_runtime_dependencies,regmerge) 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_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,regmerge)
gb_UnoApiTarget_TYPESRDB := $(call gb_UnoApiTarget_get_target,types) 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)) $(eval $(call gb_Output_error,gb_UnoApiHeadersTarget_select_variant must be defined by platform))
endif endif
gb_UnoApiHeadersTarget_CPPUMAKERDEPS = $(call gb_Executable_get_runtime_dependencies,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) gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,cppumaker)
define gb_UnoApiHeadersTarget__command define gb_UnoApiHeadersTarget__command
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\