[Csp-commits] svn:csp r1885 - trunk/csp/bin

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

Author: mkrose
Date: 2006-04-08 16:58:23 -0700 (Sat, 08 Apr 2006)
New Revision: 1885

Modified:
   trunk/csp/bin/sim.py
Log:
Force CSPDEVPACK to the start of PATH when running under windows
to ensure that the correct devpack dlls are found.

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

Modified: trunk/csp/bin/sim.py
===================================================================
--- trunk/csp/bin/sim.py	2006-04-08 21:12:45 UTC (rev 1884)
+++ trunk/csp/bin/sim.py	2006-04-08 23:58:23 UTC (rev 1885)
@@ -58,6 +58,24 @@
 	return os.path.join(*(['..'] * (len(a) - i) + list(b[i:])))
 
 
+def configureEnvironment():
+	os.environ.setdefault('CSPLOG_FILE', 'sim.log')
+	os.environ.setdefault('CSPLOG_PRIORITY', '2')
+
+	# for Windows, ensure that the devpack bin path is searched ahead of
+	# any other directories in PATH.
+	CSPDEVPACK=os.environ.get('CSPDEVPACK')
+	if CSPDEVPACK:
+		PATH = os.environ.get('PATH', '')
+		CSPDEVPACK_BIN = os.path.join(CSPDEVPACK, 'bin')
+		if not PATH.startswith(CSPDEVPACK_BIN):
+			print 'WARNING: placing %s at start of PATH' % CSPDEVPACK_BIN
+			os.environ['PATH'] = os.pathsep.join([CSPDEVPACK_BIN, PATH])
+	elif sys.platform.startswith('win'):
+		print 'WARNING: CSPDEVPACK environment variable not set; required libraries'
+		print 'may not be found.'
+
+
 def checkModuleSpace():
 	"""
 	Check that the bootstrap module works correctly and that the top-level csp
@@ -76,7 +94,6 @@
 	IS_FROZEN = hasattr(csp, '__loader__')
 
 
-
 def checkData():
 	"""Spot check some of the data to detect common problems."""
 	DATA = os.path.join('..', 'data')
@@ -331,8 +348,7 @@
 
 
 if __name__ == '__main__':
-	os.environ.setdefault('CSPLOG_FILE', 'sim.log')
-	os.environ.setdefault('CSPLOG_PRIORITY', '2')
+	configureEnvironment()
 	checkModuleSpace()
 	checkData()
 	importModules()