ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

depot: add REBUILD argument to create, build tools

Browse Source 
Fixes #2617
This commit is contained in:
Norman Feske 2017-12-14 20:11:59 +01:00 committed by Christian Helmuth
parent 7e3334ca02
commit 2f7217b29f
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/depot.txt
View File

@ -339,7 +339,7 @@ found besides the binary archive's location named with a '.build' suffix.
By default, the build tool won't attempt to rebuild a binary archive that is By default, the build tool won't attempt to rebuild a binary archive that is
already present in the depot. However, it is possible to force a rebuild via already present in the depot. However, it is possible to force a rebuild via
the 'FORCE=1' argument. the 'REBUILD=1' argument.
Publishing archives Publishing archives
@ -474,6 +474,15 @@ updates hash files of the involved recipes by taking the current date as
version name. This is a valuable assistance in situations where a commonly version name. This is a valuable assistance in situations where a commonly
used API changes. In this case, the versions of the API and all dependent used API changes. In this case, the versions of the API and all dependent
archives must be increased, which would be a labour-intensive task otherwise. archives must be increased, which would be a labour-intensive task otherwise.
If the depot already contains an archive of the current version, the create
tools won't re-create the depot archive by default. Local modifications of
the source code in the repository do not automatically result in a new archive.
To ensure that the depot archive is current, one can specify 'FORCE=1' to
the create tool. With this argument, existing depot archives are replaced by
freshly extracted ones and version updates are detected. When specified for
creating binary archives, 'FORCE=1' normally implies 'REBUILD=1'. To prevent
the superfluous rebuild of binary archives whose source versions remain
unchanged, 'FORCE=1' can be combined with the argument 'REBUILD='.
Accessing depot content from run scripts Accessing depot content from run scripts

4
tool/depot/build
View File

@ -34,7 +34,7 @@ define HELP_MESSAGE
The following arguments tweak the operation of the tool: The following arguments tweak the operation of the tool:
FORCE=1 Replace existing archives with freshly created REBUILD=1 Replace existing archives with freshly created
ones. ones.
VERBOSE= Show individual operations. VERBOSE= Show individual operations.
@ -134,7 +134,7 @@ execute_generated_build_mk_file: $(BUILD_MK_FILE)
$(VERBOSE)$(MAKE) $(if $(VERBOSE),--quiet) -f $(BUILD_MK_FILE) \ $(VERBOSE)$(MAKE) $(if $(VERBOSE),--quiet) -f $(BUILD_MK_FILE) \
-C $(DEPOT_DIR) VERBOSE=$(VERBOSE) -C $(DEPOT_DIR) VERBOSE=$(VERBOSE)
ifneq ($(FORCE),) ifneq ($(REBUILD),)
execute_generated_build_mk_file: wipe_existing_archives execute_generated_build_mk_file: wipe_existing_archives
endif endif

4
tool/depot/create
View File

@ -53,10 +53,12 @@ versioned_archive = $(if $(call archive_has_type,$1,bin),$(call _versioned_src_o
# to be used within a rule body only (when the 'extract' rule has completed) # to be used within a rule body only (when the 'extract' rule has completed)
VERSIONED_ARCHIVES = $(strip $(foreach A,$(MAKECMDGOALS),$(call versioned_archive,$A))) VERSIONED_ARCHIVES = $(strip $(foreach A,$(MAKECMDGOALS),$(call versioned_archive,$A)))
REBUILD ?= $(FORCE)
build: extract build: extract
$(if $(VERSIONED_ARCHIVES),\ $(if $(VERSIONED_ARCHIVES),\
$(VERBOSE)$(MAKE) -f $(GENODE_DIR)/tool/depot/build $(VERSIONED_ARCHIVES) \ $(VERBOSE)$(MAKE) -f $(GENODE_DIR)/tool/depot/build $(VERSIONED_ARCHIVES) \
VERBOSE=$(VERBOSE) FORCE=$(FORCE) \ VERBOSE=$(VERBOSE) REBUILD=$(REBUILD) \
KEEP_BUILD_DIR=$(KEEP_BUILD_DIR)) KEEP_BUILD_DIR=$(KEEP_BUILD_DIR))
$(MAKECMDGOALS): build $(MAKECMDGOALS): build