--- ray/build_utils/load_plat.py	2006/06/06 22:32:05	1.8
+++ ray/build_utils/load_plat.py	2016/03/10 01:49:56	1.15
@@ -1,6 +1,7 @@
 
 import os
 import sys
+import platform
 import ConfigParser
 
 
@@ -8,25 +9,39 @@ _platdir = 'platform'
 
 
 def read_plat(env, args, fn):
-	cfig = ConfigParser.ConfigParser(env.Dictionary())
+	envdict = env.Dictionary().copy()
+	# can't feed ConfigParser the original dict, because it also
+	# contains non-string values.
+	for k,v in envdict.items():
+		if not isinstance(v, str):
+			del envdict[k]
+	cfig = ConfigParser.ConfigParser(envdict)
 	cfig.read(fn)
-	buildvars = [['CC'], # replace
+	buildvars = [['CC',
+			'TIFFINCLUDE', # where to find preinstalled tifflib headers
+			'TIFFLIB',     # where to find a preinstalled tifflib library
+			], # replace
 			['CPPPATH', 'CPPDEFINES', 'CPPFLAGS', 'CCFLAGS',
-			'LIBPATH', 'LINKFLAGS']] # append
+			'LIBPATH', 'LINKFLAGS',
+			'EZXML_CPPDEFINES', # build flags specific to ezxml.c
+			]] # append
 	vars = [
 		['install',
 			['RAD_BASEDIR', 'RAD_BINDIR', 'RAD_RLIBDIR', 'RAD_MANDIR'],
 			[]],
 		['code',
-			[], # replace
+			[   # replace
+			],
 			[   # append
-			'RAD_COMPAT',    # currently obsolete
+			'RAD_COMPAT',     # theoretically obsolete (src/common/strcmp.c)
 			'RAD_MATHCOMPAT', # erf.c floating point error function
 			'RAD_ARGSCOMPAT', # fixargv0.c for Windows
 			'RAD_NETCOMPAT',  # [win_]netproc.c for ranimate
 			'RAD_MLIB',       # usually 'm', or any fastlib available
 			'RAD_SOCKETLIB',  # ws_2_32 on Windows (VC links it automatically)
-			'RAD_PROCESS']],  # our process abstraction and win_popen()
+			'RAD_PROCESS',    # our process abstraction and win_popen()
+			'RAD_PCALLS',     # more custom process abstraction
+			]],
 	]
 	if args.get('RAD_DEBUG',0):
 		vars.insert(0, ['debug'] + buildvars)
@@ -36,13 +51,17 @@ def read_plat(env, args, fn):
 			for p in section[1]: # single items to replace
 				try: v = cfig.get(section[0], p)
 				except ConfigParser.NoOptionError: continue
+				if section[0] == 'install' and '{' in v:
+					try:
+						vv = v.format(**os.environ)
+					except KeyError: vv = v
+					else: v = vv
 				env[p] = v
-				#print '%s: %s' % (p, env[p])
+				#print('%s: %s' % (p, env[p]))
 			for p in section[2]: # multiple items to append
 				try: v = cfig.get(section[0], p)
 				except ConfigParser.NoOptionError: continue
-				apply(env.Append,[],{p:`v`.split()})
-				#print '%s: %s' % (p, env[p])
+				apply(env.Append,[],{p:env.Split(v)})
 	# XXX Check that basedir exists.
 	for k in ['RAD_BINDIR', 'RAD_RLIBDIR', 'RAD_MANDIR']:
 		if (env.has_key('RAD_BASEDIR') and env.has_key(k)
@@ -50,27 +69,27 @@ def read_plat(env, args, fn):
 			env[k] = os.path.join(env['RAD_BASEDIR'],env[k])
 
 
-def load_plat(env, args, platform=None):
-	if platform == None: # override
-		p = sys.platform
-	else: p = platform
-	if p == 'win32' and 'gcc' in env['TOOLS']:
-		# we don't really want to know this here...
-		p = 'mingw'
-	pl = []
-	print 'Detected platform "%s" (%s).' % (sys.platform, os.name)
-	for i in [len(p), -1, -2]:
-		pfn = os.path.join(_platdir, p[:i] + '_custom.cfg')
-		if os.path.isfile(pfn):
-			print 'Reading configuration "%s"' % pfn
-			read_plat(env, args, pfn)
-			return 1
-		pfn = os.path.join(_platdir, p[:i] + '.cfg')
-		if os.path.isfile(pfn):
-			print 'Reading configuration "%s"' % pfn
-			read_plat(env, args, pfn)
-			return 1
-		
+def load_plat(env, args, arch=None):
+	cfgname = 'posix'
+	memmodel, binformat = platform.architecture()
+	platsys = platform.system()
+	print 'Detected platform "%s" (%s).' % (platsys, memmodel)
+	cfgname = platsys + '_' + memmodel[:2]
+	env['RAD_BUILDBIN'] = os.path.join('#scbuild', cfgname, 'bin')
+	env['RAD_BUILDLIB']  = os.path.join('#scbuild', cfgname, 'lib')
+	env['RAD_BUILDOBJ']  = os.path.join('#scbuild', cfgname, 'obj')
+
+	pfn = os.path.join(_platdir, cfgname + '_custom.cfg')
+	if os.path.isfile(pfn):
+		print 'Reading configuration "%s"' % pfn
+		read_plat(env, args, pfn)
+		return 1
+	pfn = os.path.join(_platdir, cfgname + '.cfg')
+	if os.path.isfile(pfn):
+		print 'Reading configuration "%s"' % pfn
+		read_plat(env, args, pfn)
+		return 1
+
 	if os.name == 'posix':
 		pfn = os.path.join(_platdir, 'posix.cfg')
 		if os.path.isfile(pfn):
@@ -78,7 +97,7 @@ def load_plat(env, args, platform=None):
 			read_plat(env, args, pfn)
 			return 1
 
-	print 'Platform "%s/%s" not supported yet' % (os.name, sys.platform)
+	print 'Platform "%s", system "%s" not supported yet' % (os.name, sys.platform)
 	sys.exit(2)