Kaydet (Commit) 823ef200 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Clean up deliver, showdeliverables, showmodules targets

- deliver was only relevant for dmake
- showdeliverables works only per-module
- "'showmodules' is now pointless, it was used to identify modules from
  tail_build"
  [<http://lists.freedesktop.org/archives/libreoffice/2013-February/046510.html>
  "Re: Show module dependencies"]

Change-Id: I400ec5bed4397a12ce4c5b604253c74ef7de0ce7
üst 307c8cdd
...@@ -77,7 +77,7 @@ $(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call gb_Output_warn,T ...@@ -77,7 +77,7 @@ $(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call gb_Output_warn,T
export gb_TAILBUILDTARGET=all slowcheck export gb_TAILBUILDTARGET=all slowcheck
define gbuild_module_rules define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).showdeliverables $(1).subsequentcheck
$(1): bootstrap fetch $(1): bootstrap fetch
cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
...@@ -91,15 +91,12 @@ $(1).all: bootstrap fetch ...@@ -91,15 +91,12 @@ $(1).all: bootstrap fetch
) \ ) \
$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
$(1).build $(1).check $(1).clean: $(1).build $(1).check $(1).clean $(1).showdeliverables:
cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@) cd $(1) && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) $$(patsubst $(1).%,%,$$@)
$(1).subsequentcheck: $(1).subsequentcheck:
cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck cd $(1) && $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck
$(1).deliver:
@true
endef endef
define gbuild_modules_rules define gbuild_modules_rules
......
...@@ -34,15 +34,14 @@ AVAILABLE TARGETS ...@@ -34,15 +34,14 @@ AVAILABLE TARGETS
subsequentcheck run system tests (requires full installation) subsequentcheck run system tests (requires full installation)
check run unit tests and if in toplevel subsequentcheck check run unit tests and if in toplevel subsequentcheck
clean remove all generated files clean remove all generated files
showdeliverables show the targets delivered to OUTDIR and their source
showmodules show the modules that would be loaded
debugrun starts the dev-install instance and allows tests to be run debugrun starts the dev-install instance and allows tests to be run
against it against it
<module> build the named module <module> build the named module
<module>.check run unittests of the named module <module>.check run unittests of the named module
<module>.clean clean the named module <module>.clean clean the named module
<module>.all build the named module and the pre-requisite modules for it <module>.all build the named module and the pre-requisite modules for it
<module>.deliver for dmake modules only, deliver the named module <module>.showdeliverables show the targets delivered to OUTDIR and their
source
cmd execute the command contained in the variable cmd="" cmd execute the command contained in the variable cmd=""
in a shell with config_host.mk or config_build.mk in a shell with config_host.mk or config_build.mk
environement set. (see gb_SIDE) environement set. (see gb_SIDE)
......
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