Changeset 531 for branches

Timestamp:

09/19/07 17:33:19 (14 months ago)

Author:

david

Message:

• added support libxml2
• moved comman cxx flags into a variable
• added support for 'config.py' file

Files:

• branches/strict-xml-branch/SConstruct (modified) (4 diffs)

branches/strict-xml-branch/SConstruct

@@ -28 +28 @@
     LIBDIR_SCHEMA='lib'
 
-opts = Options()
+opts = Options('config.py')
 opts.Add('PREFIX', 'The install path "prefix"', '/usr/local')
 opts.Add(PathOption('BOOST_INCLUDES', 'Search path for boost include files', '/usr/include'))
@@ -34 +34 @@
 opts.Add('BOOST_TOOLKIT','Specify boost toolkit e.g. gcc41.','',False)
 opts.Add(('FREETYPE_CONFIG', 'The path to the freetype-config executable.', 'freetype-config'))
+opts.Add(('XML2_CONFIG', 'The path to the xml2-config executable.', ''))
 opts.Add(PathOption('FRIBIDI_INCLUDES', 'Search path for fribidi include files', '/usr/include'))
 opts.Add(PathOption('FRIBIDI_LIBS','Search path for fribidi include files','/usr/' + LIBDIR_SCHEMA))
@@ -96 +97 @@
 env.ParseConfig(env['FREETYPE_CONFIG'] + ' --libs --cflags')
 
+if env['XML2_CONFIG']:
+    env.ParseConfig(env['XML2_CONFIG'] + ' --libs --cflags')
+    env.MergeFlags('-DHAVE_LIBXML2');
+else:
+    env.MergeFlags('-DBOOST_PROPERTY_TREE_XML_PARSER_TINYXML -DTIXML_USE_STL');
+
 if env['BIDI']:
     env.Append(CXXFLAGS = '-DUSE_FRIBIDI')
@@ -225 +232 @@
 else: pthread = '-pthread'
 
+common_cxx_flags = '-ansi -Wall %s -ftemplate-depth-100  -D%s ' % (pthread, env['PLATFORM'].upper());
+
 if env['DEBUG']:
-    env.Append(CXXFLAGS = '-ansi -Wall %s -ftemplate-depth-100 -O0 -fno-inline -g -DDEBUG -DMAPNIK_DEBUG -D%s ' % (pthread, env['PLATFORM'].upper()))
-else:
-    env.Append(CXXFLAGS = '-ansi -Wall %s -ftemplate-depth-100 -O2 -finline-functions -Wno-inline -DNDEBUG -D%s' % (pthread,env['PLATFORM'].upper()))
+    env.Append(CXXFLAGS = common_cxx_flags + '-O0 -fno-inline -g -DDEBUG -DMAPNIK_DEBUG')
+else:
+    env.Append(CXXFLAGS = common_cxx_flags + '-O2 -finline-functions -Wno-inline -DNDEBUG')
 
 # Install some free default fonts