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

Cleaning SConstruct a little bit. No new functionality.

Browse source
This commit is contained in:
Jean-Francois Doyon 2006-02-05 22:03:43 +00:00
parent e455c19431
commit 0aac110961
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
SConstruct
View file

@ -89,11 +89,17 @@ for libinfo in BOOST_LIBSHEADERS:
print 'Could not find header or shared library for boost %s, exiting!' % libinfo[0] print 'Could not find header or shared library for boost %s, exiting!' % libinfo[0]
Exit(1) Exit(1)
Export('env')
inputplugins = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])]
bindings = [ binding.strip() for binding in Split(env['BINDINGS'])]
# Check out the Python situation # Check out the Python situation
if 'python' in env['BINDINGS']: if 'python' in env['BINDINGS']:
if not os.access(env['PYTHON'], os.X_OK): if not os.access(env['PYTHON'], os.X_OK):
print 'Cannot run python, make sure that you have the permissions to execute it.' print "Cannot run python interpreter at '%s', make sure that you have the permissions to execute it." % env['PYTHON']
Exit(1) Exit(1)
env['PYTHON_PREFIX'] = os.popen("%s -c 'import sys; print sys.prefix'" % env['PYTHON']).read().strip() env['PYTHON_PREFIX'] = os.popen("%s -c 'import sys; print sys.prefix'" % env['PYTHON']).read().strip()
@ -113,6 +119,8 @@ if 'python' in env['BINDINGS']:
print 'Python %s prefix... %s' % (env['PYTHON_VERSION'], env['PYTHON_PREFIX']) print 'Python %s prefix... %s' % (env['PYTHON_VERSION'], env['PYTHON_PREFIX'])
SConscript('bindings/python/SConscript')
env = conf.Finish() env = conf.Finish()
# Setup the c++ args for our own codebase # Setup the c++ args for our own codebase
@ -122,21 +130,17 @@ if env['DEBUG']:
else: else:
env.Append(CXXFLAGS = '-Wall -ftemplate-depth-100 -O3 -finline-functions -Wno-inline -pthread -DNDEBUG') env.Append(CXXFLAGS = '-Wall -ftemplate-depth-100 -O3 -finline-functions -Wno-inline -pthread -DNDEBUG')
# Build the input plug-ins
inputplugins = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])]
Export('env')
# Build agg first, doesn't need anything special # Build agg first, doesn't need anything special
SConscript('agg/SConscript') SConscript('agg/SConscript')
# Build shapeindex and remove it's dependency from the LIBS # Build shapeindex and remove its dependency from the LIBS
if 'boost_program_options' in env['LIBS'] or 'boost_program_options-gcc-mt' in env['LIBS']: if 'boost_program_options' in env['LIBS'] or 'boost_program_options-gcc-mt' in env['LIBS']:
SConscript('utils/shapeindex/SConscript') SConscript('utils/shapeindex/SConscript')
# Build the input plug-ins
if 'postgis' in inputplugins and 'pq' in env['LIBS']: if 'postgis' in inputplugins and 'pq' in env['LIBS']:
SConscript('plugins/input/postgis/SConscript') SConscript('plugins/input/postgis/SConscript')
env['LIBS'].remove('pq') env['LIBS'].remove('pq')
@ -150,10 +154,3 @@ if 'raster' in inputplugins:
# Build the core library # Build the core library
SConscript('src/SConscript') SConscript('src/SConscript')
# Build python bindings
bindings = [ binding.strip() for binding in Split(env['BINDINGS'])]
if 'python' in bindings:
SConscript('bindings/python/SConscript')