--- ray/SConstruct 2010/06/02 15:58:30 1.11 +++ ray/SConstruct 2018/01/09 00:08:57 1.21 @@ -1,23 +1,32 @@ +from __future__ import division, print_function, unicode_literals import os import sys -import string -OPTFILE = 'rayopts.py' -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)) +def set_pre_opts(testenv): + optfile = File(testenv['CFG_OPTFILE']).abspath + vars = Variables(optfile, ARGUMENTS) + vars.Add('SKIP', 'Skip Display of License terms', 0) + vars.Add('RAD_DEBUG', 'Build a debug version', 0) + if testenv['CFG_PLATSYS'] == 'Windows': + # no default, will select the most recent one when empty + vars.Add('MSVC_VERSION', 'Microsoft VC Version', ) + else: # not yet supported on Windows + vars.Add('PMAP_OOC', 'Build Pmap with Out-of-core Data', 1) + vars.Update(testenv) + return vars + +def set_opts(env, pathfile): + vars = Variables(pathfile, ARGUMENTS) + vars.Add('RAD_BASEDIR', 'Installation base directory', env['RAD_BASEDIR']) + 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)) # where stuff is located in the source tree - env['RAD_BUILDLIB'] = '#src/lib' - env['RAD_BUILDBIN'] = '#bin' + # the binary target libs are configured by platform env['RAD_BUILDRLIB'] = '#lib' env['RAD_BUILDMAN'] = '#doc/man' @@ -27,10 +36,11 @@ def allplats_setup(env): find_libs.find_x11(env) find_libs.find_gl(env) # OpenGL find_libs.find_libtiff(env) + find_libs.find_pyinstaller(env) def post_common_setup(env): env.Append(CPPPATH = [os.path.join('#src', 'common')]) - env.Append(LIBPATH=['../lib']) # our own libs + 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 @@ -42,33 +52,59 @@ def shareinstall_setup(env): if 'install' in sys.argv or 'maninstall' in sys.argv: install.install_manfiles(env) +# first figure out the platform +from build_utils import load_plat +testenv = Environment() +load_plat.identify_plat(testenv) + +# set stuff before loading platforms +prevars = set_pre_opts(testenv) + # Set up build environment -env = Environment(tools=['mingw']) +env = Environment(variables=prevars) env.Decider('timestamp-match') +if env.get('PMAP_OOC', 0) in (0,'0','','n','no','false',False,None): + print('Building Photon-Maps with In-core KD-Tree') +else: + print('Building Photon-Maps with Out-of-core Octree') + +from build_utils import install +script_b = Builder(action = install.install_script, suffix = '') +env.Append(BUILDERS={'InstallScript': script_b}) 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}) + tclscript_b = Builder(action = install.install_tclscript, suffix = '') + env.Append(BUILDERS={'InstallTCLScript': tclscript_b}) # configure platform-specific stuff -from build_utils import load_plat -load_plat.load_plat(env, ARGUMENTS, platform=None) +load_plat.load_plat(env, testenv) # override options -set_opts(env) +cfg_pathfile = File(testenv['CFG_PATHFILE']).abspath +set_opts(env, cfg_pathfile) +load_plat.combine_instpaths(env) + # accept license if ((not env['SKIP'] - or env['SKIP'].strip().lower() in (0,'0','no','false')) + 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() + testenv['SKIP'] = '1' +# We waited to save this, so that we can add the SKIP +prevars.Save(File(testenv['CFG_OPTFILE']).abspath, testenv) + # fill in generic config allplats_setup(env) +print('Installation directories:') +print('Base: ', env.subst('$RAD_BASEDIR')) +print('Binaries: ', env.subst('$RAD_BINDIR')) +print('Library: ', env.subst('$RAD_RLIBDIR')) +print('Manpages: ', env.subst('$RAD_MANDIR')) +print() # Bring in all the actual things to build Export('env') @@ -76,13 +112,20 @@ if 'test' in sys.argv: SConscript(os.path.join('test', 'SConscript')) else: - SConscript(os.path.join('src', 'common', 'SConscript')) + 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')) + dirs = Split('''meta cv gen ot rt px hd util cal''') + if os.path.isfile('src/winimage/SConscript'): + dirs.append('winimage') + if os.path.isfile('src/winrview/SConscript'): + dirs.append('winrview') + for d in dirs: + 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: + if ' '.join(sys.argv[1:]).find('install') > -1: shareinstall_setup(env) Default('.') @@ -92,7 +135,9 @@ env.Alias('bininstall', '$RAD_BINDIR') env.Alias('rlibinstall', '$RAD_RLIBDIR') env.Alias('maninstall', '$RAD_MANDIR') -env.Alias('build', ['#bin']) +env.Alias('build', ['$RAD_BUILDBIN']) #, '$RAD_BUILDRLIB']) env.Alias('test', ['#test']) env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall']) +# vi: set ts=4 sw=4 : +# vim: set syntax=python :