[Csp-commits] svn:csp r1883 - in trunk/csp: . tools

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

Author: mkrose
Date: 2006-04-08 14:10:34 -0700 (Sat, 08 Apr 2006)
New Revision: 1883

Modified:
   trunk/csp/SConstruct
   trunk/csp/tools/build.py
Log:
Increase minimum devpack version to 0.6 and adjust paths for
the new directory layout (no 'usr' directory).

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

Modified: trunk/csp/SConstruct
===================================================================
--- trunk/csp/SConstruct	2006-04-08 21:07:24 UTC (rev 1882)
+++ trunk/csp/SConstruct	2006-04-08 21:10:34 UTC (rev 1883)
@@ -39,7 +39,7 @@
 
 build.CheckSConsVersion('0.96.1')
 build.CheckPythonVersion('2.2.2')
-build.DevpackConfig.SetMinimumVersion('0.5')
+build.DevpackConfig.SetMinimumVersion('0.6')
 
 
 # several global targets (e.g. 'all') are shared between copied subenvironments;

Modified: trunk/csp/tools/build.py
===================================================================
--- trunk/csp/tools/build.py	2006-04-08 21:07:24 UTC (rev 1882)
+++ trunk/csp/tools/build.py	2006-04-08 21:10:34 UTC (rev 1883)
@@ -1132,9 +1132,9 @@
 			print 'The installed devpack (%s) is too old; need version %s' % (path, version)
 			sys.exit(1)
 		DevpackConfig._checkPath(path)
-		DevpackConfig._checkPath(path, 'usr', 'bin')
-		DevpackConfig._checkPath(path, 'usr', 'lib')
-		DevpackConfig._checkPath(path, 'usr', 'include')
+		DevpackConfig._checkPath(path, 'bin')
+		DevpackConfig._checkPath(path, 'lib')
+		DevpackConfig._checkPath(path, 'include')
 		DevpackConfig.DEVPACK = path
 	_Find = staticmethod(_Find)
 
@@ -1152,16 +1152,16 @@
 			DevpackConfig._Find()
 			dp = DevpackConfig.DEVPACK
 			for dll in self._dlls:
-				self._checkPath(dp, 'usr', 'bin', dll + '.dll')
-				self._checkPath(dp, 'usr', 'lib', dll + '.lib')
+				self._checkPath(dp, 'bin', dll + '.dll')
+				self._checkPath(dp, 'lib', dll + '.lib')
 			for lib in self._libs:
-				self._checkPath(dp, 'usr', 'lib', lib + '.lib')
+				self._checkPath(dp, 'lib', lib + '.lib')
 			for header in self._headers:
 				if isinstance(header, tuple):
 					header = os.path.join(*header)
-				self._checkPath(os.path.join(dp, 'usr', 'include', header))
-			conf.env.AppendUnique(CPPPATH=[os.path.join(dp, 'usr', 'include')])
-			conf.env.AppendUnique(LIBPATH=[os.path.join(dp, 'usr', 'lib')])
+				self._checkPath(os.path.join(dp, 'include', header))
+			conf.env.AppendUnique(CPPPATH=[os.path.join(dp, 'include')])
+			conf.env.AppendUnique(LIBPATH=[os.path.join(dp, 'lib')])
 			conf.env.AppendUnique(LIBS=self._dlls + self._libs)
 		return 1