scons: move all configure options to 'scons configure' stage, using pickling to maintain configure options across builds
This commit is contained in:
parent
6a84586489
commit
9f40e90def
2 changed files with 513 additions and 483 deletions
987
SConstruct
987
SConstruct
File diff suppressed because it is too large
Load diff
|
@ -24,15 +24,10 @@ import re
|
||||||
import os
|
import os
|
||||||
|
|
||||||
Import('env')
|
Import('env')
|
||||||
Import('conf')
|
|
||||||
|
|
||||||
prefix = env['PREFIX']
|
prefix = env['PREFIX']
|
||||||
install_prefix = env['DESTDIR'] + '/' + prefix
|
install_prefix = env['DESTDIR'] + '/' + prefix
|
||||||
|
|
||||||
if env['CAIRO'] and conf.CheckPKGConfig('0.15.0') and conf.CheckPKG('pycairo'):
|
|
||||||
env.ParseConfig('pkg-config --cflags pycairo')
|
|
||||||
env.Append(CXXFLAGS = '-DHAVE_PYCAIRO');
|
|
||||||
|
|
||||||
linkflags = ''
|
linkflags = ''
|
||||||
libraries = ['mapnik','png','jpeg']
|
libraries = ['mapnik','png','jpeg']
|
||||||
libraries.append('boost_python%s' % env['BOOST_APPEND'])
|
libraries.append('boost_python%s' % env['BOOST_APPEND'])
|
||||||
|
@ -72,6 +67,10 @@ exp = r"%s{2,}" % os.sep
|
||||||
mapnik_lib_path = re.sub(exp,os.sep, prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'])
|
mapnik_lib_path = re.sub(exp,os.sep, prefix + '/' + env['LIBDIR_SCHEMA'] + env['LIB_DIR_NAME'])
|
||||||
file('mapnik/paths.py','w').write(paths % (mapnik_lib_path))
|
file('mapnik/paths.py','w').write(paths % (mapnik_lib_path))
|
||||||
|
|
||||||
|
try:
|
||||||
|
os.chmod('mapnik/paths.py',0666)
|
||||||
|
except: pass
|
||||||
|
|
||||||
# install the core mapnik python files, including '__init__.py' and 'paths.py'
|
# install the core mapnik python files, including '__init__.py' and 'paths.py'
|
||||||
init_files = glob.glob('mapnik/*.py')
|
init_files = glob.glob('mapnik/*.py')
|
||||||
init_module = env.Install(env['PYTHON_INSTALL_LOCATION'] + '/mapnik', init_files)
|
init_module = env.Install(env['PYTHON_INSTALL_LOCATION'] + '/mapnik', init_files)
|
||||||
|
|
Loading…
Reference in a new issue