Skip to content

C
core
Kaydet (Commit) b6076ec3 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

gbuild: fix build executable dependencies: 

Rules that invoke generated executables should have dependencies on
those executables.
üst 23605574
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 19 deletions
solenv/gbuild/AllLangResTarget.mk
Dosyayı görüntüle @ b6076ec3
...@@ -73,8 +73,8 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) ...@@ -73,8 +73,8 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)
# defined by platform # defined by platform
# gb_SrsPartTarget__command_dep # gb_SrsPartTarget__command_dep
gb_SrsPartTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc$(gb_Executable_EXT_for_build) gb_ResTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc$(gb_Executable_EXT_for_build)
gb_SrsPartTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_SrsPartTarget_RSCTARGET) gb_ResTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_ResTarget_RSCTARGET)
define gb_SrsPartTarget__command define gb_SrsPartTarget__command
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
...@@ -86,12 +86,13 @@ $(call gb_Helper_abbreviate_dirs,\ ...@@ -86,12 +86,13 @@ $(call gb_Helper_abbreviate_dirs,\
$(DEFS) \ $(DEFS) \
-fp=$(1) \ -fp=$(1) \
$(if $(MERGEDFILE),$(MERGEDFILE),$<)" > $${RESPONSEFILE} && \ $(if $(MERGEDFILE),$(MERGEDFILE),$<)" > $${RESPONSEFILE} && \
$(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \ $(gb_ResTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
rm -rf $${RESPONSEFILE}) rm -rf $${RESPONSEFILE})
endef endef
$(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartTarget_RSCTARGET) $(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) \
$(gb_ResTarget_RSCTARGET)
$(call gb_SrsPartTarget__command_dep,$*,$<) $(call gb_SrsPartTarget__command_dep,$*,$<)
$(call gb_SrsPartTarget__command,$@,$*,$<) $(call gb_SrsPartTarget__command,$@,$*,$<)
...@@ -315,8 +316,6 @@ endef ...@@ -315,8 +316,6 @@ endef
# ResTarget # ResTarget
gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET)
gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/ gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/
$(call gb_ResTarget_get_clean_target,%) : $(call gb_ResTarget_get_clean_target,%) :
...@@ -324,7 +323,8 @@ $(call gb_ResTarget_get_clean_target,%) : ...@@ -324,7 +323,8 @@ $(call gb_ResTarget_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*)) rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_outdir_imagelist_target,$*))
$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCTARGET) $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
$(gb_ResTarget_RSCTARGET)
$(call gb_Output_announce,$*,$(true),RES,2) $(call gb_Output_announce,$*,$(true),RES,2)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) $(OUTDIR)/bin \ mkdir -p $(dir $@) $(OUTDIR)/bin \
...@@ -344,7 +344,8 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCT ...@@ -344,7 +344,8 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCT
-subMODULE=$(dir $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \ -subMODULE=$(dir $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \ -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \ -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
$(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \ $(filter-out $(gb_Helper_MISCDUMMY) $(gb_ResTarget_RSCTARGET),$^)" \
> $${RESPONSEFILE} && \
$(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \ $(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE}) rm -f $${RESPONSEFILE})
......
solenv/gbuild/ComponentTarget.mk
Dosyayı görüntüle @ b6076ec3
...@@ -51,7 +51,8 @@ $(call gb_ComponentTarget_get_clean_target,%) : ...@@ -51,7 +51,8 @@ $(call gb_ComponentTarget_get_clean_target,%) :
$(call gb_ComponentTarget_get_target,$*) \ $(call gb_ComponentTarget_get_target,$*) \
$(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET) $(call gb_ComponentTarget_get_target,%) : \
$(call gb_ComponentTarget_get_source,$(SRCDIR),%) $(gb_XSLTPROCTARGET)
$(call gb_ComponentTarget__command,$@,$<,$*) $(call gb_ComponentTarget__command,$@,$<,$*)
$(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_target,%) :
......
solenv/gbuild/Extension.mk
Dosyayı görüntüle @ b6076ec3
...@@ -166,7 +166,8 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(S ...@@ -166,7 +166,8 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(S
$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF) $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
endif endif
$(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) \
$(gb_Extension_PROPMERGETARGET)
$$(call gb_Output_announce,$(2),$(true),PRP,3) $$(call gb_Output_announce,$(2),$(true),PRP,3)
mkdir -p $$(dir $$@) && \ mkdir -p $$(dir $$@) && \
cp -f $$< $$@ \ cp -f $$< $$@ \
...@@ -188,7 +189,7 @@ $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2 ...@@ -188,7 +189,7 @@ $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2
$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))localize.sdf $(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst $(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3))))localize.sdf
$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF) $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
$(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) $(gb_Extension_HELPEXTARGET)
$$(call gb_Output_announce,$(2),$(true),XHP,3) $$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@) && \ mkdir -p $$(dir $$@) && \
$(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$(SDF) $(gb_Extension_HELPEXCOMMAND) -i $$< -o $$@ -l $(4) -m $$(SDF)
......
solenv/gbuild/SdiTarget.mk
Dosyayı görüntüle @ b6076ec3
...@@ -35,7 +35,7 @@ gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl) ...@@ -35,7 +35,7 @@ gb_SdiTarget_SVIDLTARGET := $(call gb_Executable_get_target_for_build,svidl)
gb_SdiTarget_SVIDLCOMMAND := \ gb_SdiTarget_SVIDLCOMMAND := \
$(gb_Helper_set_ld_path) $(gb_SdiTarget_SVIDLTARGET) $(gb_Helper_set_ld_path) $(gb_SdiTarget_SVIDLTARGET)
$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET) $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLTARGET)
$(call gb_Output_announce,$*,$(true),SDI,1) $(call gb_Output_announce,$*,$(true),SDI,1)
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) $(dir $(call gb_SdiTarget_get_dep_target,$*))) mkdir -p $(dir $@) $(dir $(call gb_SdiTarget_get_dep_target,$*)))
......
solenv/gbuild/UnoApiTarget.mk
Dosyayı görüntüle @ b6076ec3
...@@ -66,8 +66,9 @@ define gb_UnoApiPartTarget__command ...@@ -66,8 +66,9 @@ define gb_UnoApiPartTarget__command
endef endef
$(call gb_UnoApiPartTarget_get_target,%.done) : $(call gb_UnoApiPartTarget_get_target,%.done) : \
$(call gb_UnoApiPartTarget__command,$@,$*,$?) $(gb_UnoApiPartTarget_IDLCTARGET)
$(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCTARGET),$?))
ifeq ($(gb_FULLDEPS),$(true)) ifeq ($(gb_FULLDEPS),$(true))
...@@ -133,9 +134,12 @@ $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3 ...@@ -133,9 +134,12 @@ $(if $(or $(and $(1),$(2),$(3)),$(and $(1),$(2)),$(and $(2),$(3)),$(and $(1),$(3
$(if $(4),,$(error No root has been set for the rdb file)) $(if $(4),,$(error No root has been set for the rdb file))
endef endef
$(call gb_UnoApiTarget_get_target,%): # FIXME cannot have a dependency on $(gb_UnoApiTarget_RDBMAKERTARGET) here
# because that leads to dependency cycle because rdbmaker depends on offapi
$(call gb_UnoApiTarget_get_target,%) : $(gb_UnoApiTarget_XML2CMPTARGET) \
$(gb_UnoApiTarget_REGCOMPARETARGET) $(gb_UnoApiTarget_REGMERGETARGET)
$(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT)) $(call gb_UnoApiTarget__check_mode,$(UNOAPI_FILES),$(UNOAPI_MERGE),$(UNOAPI_XML),$(UNOAPI_ROOT))
$(call gb_UnoApiTarget__command,$@,$*,$<,$?) $(call gb_UnoApiTarget__command,$@,$*)
.PHONY : $(call gb_UnoApiTarget_get_clean_target,%) .PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
$(call gb_UnoApiTarget_get_clean_target,%) : $(call gb_UnoApiTarget_get_clean_target,%) :
...@@ -281,15 +285,18 @@ touch $(1) ...@@ -281,15 +285,18 @@ touch $(1)
endef endef
$(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : $(call gb_UnoApiHeadersTarget_get_bootstrap_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
$(call gb_Output_announce,$*,$(true),HPB,3) $(call gb_Output_announce,$*,$(true),HPB,3)
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*)) $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$*))
$(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : $(call gb_UnoApiHeadersTarget_get_comprehensive_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
$(call gb_Output_announce,$*,$(true),HPC,3) $(call gb_Output_announce,$*,$(true),HPC,3)
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C) $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$*),-C)
$(call gb_UnoApiHeadersTarget_get_target,%) : $(call gb_UnoApiHeadersTarget_get_target,%) : \
$(gb_UnoApiHeadersTarget_CPPUMAKERTARGET)
$(call gb_Output_announce,$*,$(true),HPP,3) $(call gb_Output_announce,$*,$(true),HPP,3)
$(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L) $(call gb_UnoApiHeadersTarget__command,$@,$*,$(call gb_UnoApiHeadersTarget_get_dir,$*),-L)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment