--- ray/SConstruct	2008/12/23 15:03:58	1.7
+++ ray/SConstruct	2016/03/10 17:36:18	1.17
@@ -3,35 +3,40 @@ import os
 import sys
 import string
 
+PATHFILE = 'raypaths.py'
 OPTFILE = 'rayopts.py'
+def set_pre_opts(env):
+	vars = Variables(OPTFILE, ARGUMENTS)
+	vars.Add('SKIP', 'Skip Display of License terms', 0)
+	vars.Add('RAD_DEBUG',   'Build a debug version',  0)
+	vars.Update(env) 
+	vars.Save(OPTFILE, env)
+
 def set_opts(env):
-    # XXX add some caching
-    opts = Options(OPTFILE, ARGUMENTS)
-    opts.Add('SKIP', 'Skip Display of License terms', 0)
-    opts.Add('RAD_BINDIR',  'Install executables here',   env['RAD_BINDIR'])
-    opts.Add('RAD_RLIBDIR', 'Install support files here', env['RAD_RLIBDIR'])
-    opts.Add('RAD_MANDIR',  'Install man pages here',     env['RAD_MANDIR'])
-    opts.Add('RAD_DEBUG',   'Build a debug version',  0)
-    opts.Update(env) 
-    opts.Save(OPTFILE, env)
-    Help(opts.GenerateHelpText(env, sort=cmp))
+	vars = Variables(PATHFILE, ARGUMENTS)
+	vars.Add('RAD_BINDIR',  'Install executables here',   env['RAD_BINDIR'])
+	vars.Add('RAD_RLIBDIR', 'Install support files here', env['RAD_RLIBDIR'])
+	vars.Add('RAD_MANDIR',  'Install man pages here',     env['RAD_MANDIR'])
+	vars.Update(env) 
+	vars.Save(PATHFILE, env)
+	Help(vars.GenerateHelpText(env, sort=cmp))
 	# where stuff is located in the source tree
-    env['RAD_BUILDLIB']  = '#src/lib'
-    env['RAD_BUILDBIN']  = '#bin'
-    env['RAD_BUILDRLIB'] = '#lib'
-    env['RAD_BUILDMAN']  = '#doc/man'
+	# the binary target libs are configured by platform
+	env['RAD_BUILDRLIB'] = '#lib'
+	env['RAD_BUILDMAN']  = '#doc/man'
 
 def allplats_setup(env):
-    from build_utils import find_libs
-    find_libs.find_x11(env)
-    find_libs.find_gl(env) # OpenGL
-    find_libs.find_libtiff(env)
+	from build_utils import find_libs
+	find_libs.find_radlib(env)
+	find_libs.find_x11(env)
+	find_libs.find_gl(env) # OpenGL
+	find_libs.find_libtiff(env)
 
 def post_common_setup(env):
-    env.Append(CPPPATH = [os.path.join('#src', 'common')])
-    env.Append(LIBPATH=['../lib']) # our own libs
-    if not env.has_key('RAD_MLIB'):
-        env['RAD_MLIB'] = [] #['m'] # no seperate mlib on Win
+	env.Append(CPPPATH = [os.path.join('#src', 'common')])
+	env.Append(LIBPATH=[env['RAD_BUILDLIB']]) # our own libs
+	if not env.has_key('RAD_MLIB'):
+		env['RAD_MLIB'] = [] #['m'] # no seperate mlib on Win
 
 def shareinstall_setup(env):
 	from build_utils import install
@@ -41,43 +46,60 @@ def shareinstall_setup(env):
 	if 'install' in sys.argv or 'maninstall' in sys.argv:
 		install.install_manfiles(env)
 
+_arch = None
+for item in sys.argv[1:]:
+	if item.startswith('TARGET_ARCH'):
+		res = item.split('=')
+		if len(res) == 2:
+			_arch = res[1].strip()
+
 # Set up build environment
-env = Environment()
+env = Environment(TARGET_ARCH=_arch)
 env.Decider('timestamp-match')
 
 if os.name == 'posix':
 	from build_utils import install
-	csh_b = Builder(action = install.install_cshscript,
-			suffix = '', src_suffix = '.csh')
-	env.Append(BUILDERS={'InstallCsh': csh_b})
+	script_b = Builder(action = install.install_script, suffix = '')
+	env.Append(BUILDERS={'InstallScript': script_b})
+	tclscript_b = Builder(action = install.install_tclscript, suffix = '')
+	env.Append(BUILDERS={'InstallTCLScript': tclscript_b})
 
+# set debug before loading platforms
+set_pre_opts(env)
+
 # configure platform-specific stuff
 from build_utils import load_plat
-load_plat.load_plat(env, ARGUMENTS, platform=None)
+load_plat.load_plat(env, vars, arch=_arch)
 
 # override options
 set_opts(env)
 
 # accept license
-if not env['SKIP'] and not '-c' in sys.argv:
-    from build_utils import copyright
-    copyright.show_license()
+if ((not env['SKIP']
+			or env['SKIP'].strip().lower() in (0,'0','n','no','false',None))
+		and not '-c' in sys.argv and not 'test' in sys.argv):
+	from build_utils import copyright
+	copyright.show_license()
 
 # fill in generic config
 allplats_setup(env)
 
-		
-
 # Bring in all the actual things to build
 Export('env')
-SConscript(os.path.join('src', 'common', 'SConscript'))
-post_common_setup(env)
-for d in Split('meta cv gen ot rt px hd util cal'):
-    print d
-    SConscript(os.path.join('src', d, 'SConscript'))
+if 'test' in sys.argv:
+	SConscript(os.path.join('test', 'SConscript'))
+	
+else:
+	SConscript(os.path.join('src', 'common', 'SConscript'),
+			variant_dir=os.path.join(env['RAD_BUILDOBJ'],'common'), duplicate=0)
+	post_common_setup(env)
+	for d in Split('meta cv gen ot rt px hd util cal'):
+		print d
+		SConscript(os.path.join('src', d, 'SConscript'),
+				variant_dir=os.path.join(env['RAD_BUILDOBJ'], d), duplicate=0)
 
-if string.find(string.join(sys.argv[1:]), 'install') > -1:
-	shareinstall_setup(env)
+	if string.find(string.join(sys.argv[1:]), 'install') > -1:
+		shareinstall_setup(env)
 
 Default('.')
 
@@ -86,7 +108,8 @@ env.Alias('bininstall',  '$RAD_BINDIR')
 env.Alias('rlibinstall', '$RAD_RLIBDIR')
 env.Alias('maninstall',  '$RAD_MANDIR')
 
-env.Alias('build',   ['#bin'])
-env.Alias('test',    ['#src/test'])
+env.Alias('build',   ['$RAD_BUILDBIN'])
+env.Alias('test',    ['#test'])
 env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall'])
 
+# vim: set syntax=python: