Changeset 22

Timestamp:

10/21/08 13:45:29 (4 years ago)

Author:

rkuck

Message:

Creation of default path of installed AVANGO now properly escapes strings

We now also properly combine the paths using the os specific separator.

Location:

trunk/avango-build

Files:

• SConscript (modified) (2 diffs)
• src/avango/build/defaults.py.in (modified) (1 diff)

trunk/avango-build/SConscript

@@ -25 +25 @@
 
 import avango.build
+import os
 
 Alias('install', Alias('install-build'))
@@ -46 +47 @@
 Install(avango.build.get_python_path('avango/build/tools'), build_tools_module)
 
+def build_path(*args):
+  return repr(os.pathsep.join([ x for x in args if x ]))
+
 local_env = avango.build.Environment()
 local_env['SUBST'] = {
-    'BINARY_PATH': ':'.join((local_env['BINARY_PATH'], avango.build.get_binary_path().abspath)),
-    'INCLUDE_PATH': ':'.join((local_env['INCLUDE_PATH'], avango.build.get_include_path().abspath)),
-    'LIBRARY_PATH': ':'.join((local_env['LIBRARY_PATH'], avango.build.get_library_path().abspath)),
-    'PKG_CONFIG_PATH': ':'.join((local_env['PKG_CONFIG_PATH'], avango.build.get_pkgconfig_path().abspath)),
-    'PYTHON_PATH': ':'.join((local_env['PYTHON_PATH'], avango.build.get_python_path().abspath)),
+    'BINARY_PATH': build_path(local_env['BINARY_PATH'], avango.build.get_binary_path().abspath),
+    'INCLUDE_PATH': build_path(local_env['INCLUDE_PATH'], avango.build.get_include_path().abspath),
+    'LIBRARY_PATH': build_path(local_env['LIBRARY_PATH'], avango.build.get_library_path().abspath),
+    'PKG_CONFIG_PATH': build_path(local_env['PKG_CONFIG_PATH'], avango.build.get_pkgconfig_path().abspath),
+    'PYTHON_PATH': build_path(local_env['PYTHON_PATH'], avango.build.get_python_path().abspath),
     }
 defaults = local_env.Subst('src/avango/build/defaults.py.in')

trunk/avango-build/src/avango/build/defaults.py.in

@@ -13 +13 @@
 ##########################################################################
 
-BINARY_PATH='%(BINARY_PATH)s'
-INCLUDE_PATH='%(INCLUDE_PATH)s'
-LIBRARY_PATH='%(LIBRARY_PATH)s'
-PKG_CONFIG_PATH='%(PKG_CONFIG_PATH)s'
-PYTHON_PATH='%(PYTHON_PATH)s'
+BINARY_PATH=%(BINARY_PATH)s
+INCLUDE_PATH=%(INCLUDE_PATH)s
+LIBRARY_PATH=%(LIBRARY_PATH)s
+PKG_CONFIG_PATH=%(PKG_CONFIG_PATH)s
+PYTHON_PATH=%(PYTHON_PATH)s