[Csp-commits] svn:csp r2079 - trunk/csp/tools/build

[<sv...@ww...>]

Author: mkrose
Date: 2007-04-13 21:13:53 -0700 (Fri, 13 Apr 2007)
New Revision: 2079

Modified:
   trunk/csp/tools/build/libconf.py
   trunk/csp/tools/build/rules.py
Log:
Fix build under newer versions of SCons.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=2079

Modified: trunk/csp/tools/build/libconf.py
===================================================================
--- trunk/csp/tools/build/libconf.py	2007-04-10 08:13:34 UTC (rev 2078)
+++ trunk/csp/tools/build/libconf.py	2007-04-14 04:13:53 UTC (rev 2079)
@@ -144,10 +144,12 @@
 		if not path:
 			print 'CSPDEVPACK environment variable not set.'
 			sys.exit(1)
+		if path.startswith('"') and path.endswith('"'):
+			path = path[1:-1]
 		try:
-			v = map(int, re.search(r'[0-9.]+$', path).group().split('.'))
+			v = map(int, re.search(r'([0-9.]+)"?$', path).group(1).split('.'))
 		except Exception:
-			print 'CSPDEVPACK environment variable (%s) is does not look like a valid devpack path.' % path
+			print 'CSPDEVPACK environment variable (%s) does not look like a valid devpack path.' % path
 			sys.exit(1)
 		if v < map(int, DevpackConfig.VERSION.split('.')):
 			print 'The installed devpack (%s) is too old; need version %s' % (path, version)

Modified: trunk/csp/tools/build/rules.py
===================================================================
--- trunk/csp/tools/build/rules.py	2007-04-10 08:13:34 UTC (rev 2078)
+++ trunk/csp/tools/build/rules.py	2007-04-14 04:13:53 UTC (rev 2079)
@@ -259,6 +259,9 @@
 			sources += group.sources
 			headers += group.headers
 			misc += group.misc
+		sources = map(str, sources)
+		headers = map(str, headers)
+		misc = map(str, misc)
 		dbg = self._env.MSVSProject(target=self._name+'-dbg.vcproj', srcs=sources, incs=headers, misc=misc, buildtarget=target, variant='Debug')
 		rel = self._env.MSVSProject(target=self._name+'-rel.vcproj', srcs=sources, incs=headers, misc=misc, buildtarget=target, variant='Release')
 		scons.Alias('vs', [dbg, rel])