sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scons: better handling of implicit dependencies - also add distclean target - refs #1395, #1324, and #1310

Browse source
This commit is contained in:
Dane Springmeyer 2012-08-16 14:12:49 -07:00
parent d902de1c08
commit 57246bb569
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Makefile
View file

@ -1,21 +1,24 @@
all: mapnik all: mapnik
install: install:
@python scons/scons.py --config=cache --implicit-deps-unchanged --max-drift=1 install @python scons/scons.py --config=cache --implicit-cache --max-drift=1 install
mapnik: mapnik:
@python scons/scons.py --config=cache --implicit-deps-unchanged --max-drift=1 @python scons/scons.py --config=cache --implicit-cache --max-drift=1
clean: clean:
python scons/scons.py -c --config=cache --implicit-deps-unchanged --max-drift=1 @python scons/scons.py -c --config=cache --implicit-cache --max-drift=1
@if test -e ".sconsign.dblite"; then rm ".sconsign.dblite"; fi
reset: distclean:
if test -e ".sconf_temp/"; then rm -r ".sconf_temp/"; fi if test -e ".sconf_temp/"; then rm -r ".sconf_temp/"; fi
if test -e ".sconsign.dblite"; then rm ".sconsign.dblite"; fi if test -e ".sconsign.dblite"; then rm ".sconsign.dblite"; fi
if test -e "config.cache"; then rm "config.cache"; fi if test -e "config.cache"; then rm "config.cache"; fi
reset: distclean
uninstall: uninstall:
python scons/scons.py --config=cache --implicit-deps-unchanged --max-drift=1 uninstall python scons/scons.py --config=cache --implicit-cache --max-drift=1 uninstall
test: test:
@echo "*** Running visual tests..." @echo "*** Running visual tests..."

5
SConstruct
View file

@ -1659,11 +1659,6 @@ if not HELP_REQUESTED:
SetOption('implicit_cache', 1) SetOption('implicit_cache', 1)
SetOption('max_drift', 1) SetOption('max_drift', 1)
else:
# Set the cache mode to 'force' unless requested, avoiding hidden caching of Scons 'opts' in '.sconsign.dblite'
# This allows for a SCONS_LOCAL_CONFIG, if present, to be used as the primary means of storing paths to successful build dependencies
SetCacheMode('force')
if env['JOBS'] > 1: if env['JOBS'] > 1:
SetOption("num_jobs", env['JOBS']) SetOption("num_jobs", env['JOBS'])

2
configure vendored
View file

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
python scons/scons.py --implicit-cache configure "$@" python scons/scons.py --implicit-deps-changed configure "$@"