suzanne.soy/os-test-framework
1
0
Fork 0
Code Issues 48 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Split the clean target into clean and clean_reproducible

Browse Source
This commit is contained in:
Georges Dupéron 2018-09-26 23:41:15 +02:00
parent 017b038ac4
commit 239f050a4b
No known key found for this signature in database
GPG Key ID: C7976374130A80F7
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -111,13 +111,23 @@ ${bld}/makefile_file_targets: ${bld}/makefile_non_file_targets ${bld}/makefile_t
@comm -23 ${bld}/makefile_targets ${bld}/makefile_non_file_targets > $@ @comm -23 ${bld}/makefile_targets ${bld}/makefile_non_file_targets > $@
${built_directories}: ${bld}/check_makefile ${built_directories}: ${bld}/check_makefile
${more_built_directories}: Makefile Makefile.example-os Makefile.test-example-os ${more_built_directories}: ${Makefiles}
mkdir -p $@ && touch $@ mkdir -p $@ && touch $@
.PHONY: clean .PHONY: clean
clean: ${bld}/check_makefile clean: clean_reproducible ${bld}/check_makefile
rm -f ${built_files} ${temp_files} ${bld}/${reproducible_os_filename} rm -f ${built_files} ${temp_files}
if test -d ${bld}/reproducible; then \ for d in $$(echo ${more_built_directories} ${temp_directories} | tr ' ' '\n' | sort --reverse); do \
if test -e "$$d"; then \
rmdir "$$d"; \
fi; \
done
.PHONY: clean_reproducible
clean_reproducible: ${bld}/check_makefile
# Calling make unconditionally would cause infinite recursion, so we
# first check whether there is anything to remove.
if test -d ${bld}/reproducible -o -f ${bld}/${reproducible_os_filename}; then \
unset MAKEFLAGS MAKELEVEL MAKE_TERMERR MFLAGS; \ unset MAKEFLAGS MAKELEVEL MAKE_TERMERR MFLAGS; \
make OS_FILENAME=${reproducible_os_filename} \ make OS_FILENAME=${reproducible_os_filename} \
BUILD_DIR=${bld}/reproducible \ BUILD_DIR=${bld}/reproducible \
@ -125,11 +135,6 @@ clean: ${bld}/check_makefile
COMMIT_TIMESTAMP_ISO_8601=${COMMIT_TIMESTAMP_ISO_8601} \ COMMIT_TIMESTAMP_ISO_8601=${COMMIT_TIMESTAMP_ISO_8601} \
clean; \ clean; \
fi fi
for d in $$(echo ${more_built_directories} ${temp_directories} | tr ' ' '\n' | sort --reverse); do \
if test -e "$$d"; then \
rmdir "$$d"; \
fi; \
done
.gitignore: ${bld}/check_makefile .gitignore: ${bld}/check_makefile
for f in ${built_files}; do echo "/$$f"; done | sort > $@ for f in ${built_files}; do echo "/$$f"; done | sort > $@