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

speed up scons by > 2x

Browse source
This commit is contained in:
Dane Springmeyer 2012-07-06 18:08:19 -07:00
parent 269569250c
commit 17d3414b7a
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

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

6
SConstruct
View file

@ -111,6 +111,8 @@ PLUGINS = { # plugins with external dependencies
#### SCons build options and initial setup #### #### SCons build options and initial setup ####
env = Environment(ENV=os.environ) env = Environment(ENV=os.environ)
env.Decider('MD5-timestamp')
env.SourceCode(".", None)
def color_print(color,text,newline=True): def color_print(color,text,newline=True):
# 1 - red # 1 - red
@ -932,6 +934,8 @@ if not preconfigured:
color_print(1,"SCons CONFIG not found: '%s'" % conf) color_print(1,"SCons CONFIG not found: '%s'" % conf)
# Recreate the base environment using modified `opts` # Recreate the base environment using modified `opts`
env = Environment(ENV=os.environ,options=opts) env = Environment(ENV=os.environ,options=opts)
env.Decider('MD5-timestamp')
env.SourceCode(".", None)
env['USE_CONFIG'] = True env['USE_CONFIG'] = True
else: else:
color_print(4,'SCons USE_CONFIG specified as false, will not inherit variables python config file...') color_print(4,'SCons USE_CONFIG specified as false, will not inherit variables python config file...')
@ -1146,6 +1150,7 @@ if not preconfigured:
# if the user is not setting custom boost configuration # if the user is not setting custom boost configuration
# enforce boost version greater than or equal to BOOST_MIN_VERSION # enforce boost version greater than or equal to BOOST_MIN_VERSION
if not conf.CheckBoost(BOOST_MIN_VERSION): if not conf.CheckBoost(BOOST_MIN_VERSION):
color_print(4,'Found boost lib version... %s' % env.get('BOOST_LIB_VERSION_FROM_HEADER') )
color_print(1,'Boost version %s or greater is required' % BOOST_MIN_VERSION) color_print(1,'Boost version %s or greater is required' % BOOST_MIN_VERSION)
if not env['BOOST_VERSION']: if not env['BOOST_VERSION']:
env['MISSING_DEPS'].append('boost version >=%s' % BOOST_MIN_VERSION) env['MISSING_DEPS'].append('boost version >=%s' % BOOST_MIN_VERSION)
@ -1660,7 +1665,6 @@ if not HELP_REQUESTED:
# But let's also cache implicit deps... # But let's also cache implicit deps...
EnsureSConsVersion(0,98) EnsureSConsVersion(0,98)
SetOption('implicit_cache', 1) SetOption('implicit_cache', 1)
env.Decider('MD5-timestamp')
SetOption('max_drift', 1) SetOption('max_drift', 1)
else: else:

2
configure vendored
View file

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