Changeset 1187

Timestamp:

06/29/09 10:04:44 (14 months ago)

Author:

artem

Message:

+ Cleaner builds - don't import everything from ENV!
+ Add FRAMEWORK_SEARCH_PATH option for Max OS X

Location:

trunk

Files:

• SConstruct (modified) (2 diffs)
• bindings/python/SConscript (modified) (1 diff)

trunk/SConstruct

@@ -36 +36 @@
 
 #### SCons build options and initial setup ####
-env = Environment(ENV=os.environ)
+env = Environment()
 
 def color_print(color,text,newline=True):
@@ -161 +161 @@
     PathVariable('PYTHON','Full path to Python executable used to build bindings', sys.executable),
     BoolVariable('FRAMEWORK_PYTHON', 'Link against Framework Python on Mac OS X', 'True'),
+    PathVariable('FRAMEWORK_SEARCH_PATH','Top framework search path on Mac OS X', '/'),
     BoolVariable('FULL_LIB_PATH', 'Use the full path for the libmapnik.dylib "install_name" when linking on Mac OS X', 'False'),
     ListVariable('BINDINGS','Language bindings to build','all',['python']),

trunk/bindings/python/SConscript

@@ -42 +42 @@
         libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')])
     if env['FRAMEWORK_PYTHON']:
-        linkflags = '-F/ -framework Python'
+        linkflags = '-F%s -framework Python' % env['FRAMEWORK_SEARCH_PATH']
     else:
         linkflags = '-lpython%s' % env['PYTHON_VERSION']