ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/SConstruct
(Generate patch)

Comparing ray/SConstruct (file contents):
Revision 1.19 by schorsch, Tue Apr 19 21:21:23 2016 UTC vs.
Revision 1.20 by schorsch, Mon Jan 8 13:38:37 2018 UTC

# Line 1 | Line 1
1 + from __future__ import division, print_function, unicode_literals
2  
3   import os
4   import sys
4 import string
5  
6 < PATHFILE = 'scbuild/raypaths.py'
7 < OPTFILE = 'scbuild/rayopts.py'
8 < def set_pre_opts():
9 <        vars = Variables(OPTFILE, ARGUMENTS)
6 > def set_pre_opts(testenv):
7 >        optfile = File(testenv['CFG_OPTFILE']).abspath
8 >        vars = Variables(optfile, ARGUMENTS)
9          vars.Add('SKIP', 'Skip Display of License terms', 0)
10          vars.Add('RAD_DEBUG',  'Build a debug version',  0)
11 <        vars.Add('MSVC_VERSION', 'Microsoft VC Version',  '12.0')
12 <        vars.Add('TARGET_ARCH',  'Windows only: "x68" or "amd64"',  '')
11 >        if testenv['CFG_PLATSYS'] == 'Windows':
12 >                # no default, will select the most recent one when empty
13 >                vars.Add('MSVC_VERSION', 'Microsoft VC Version',  )
14 >        vars.Update(testenv)
15          return vars
16  
17 < def set_opts(env):
18 <        vars = Variables(PATHFILE, ARGUMENTS)
17 > def set_opts(env, pathfile):
18 >        vars = Variables(pathfile, ARGUMENTS)
19 >        vars.Add('RAD_BASEDIR', 'Installation base directory', env['RAD_BASEDIR'])
20          vars.Add('RAD_BINDIR',  'Install executables here',   env['RAD_BINDIR'])
21          vars.Add('RAD_RLIBDIR', 'Install support files here', env['RAD_RLIBDIR'])
22          vars.Add('RAD_MANDIR',  'Install man pages here',     env['RAD_MANDIR'])
23          vars.Update(env)
24 <        vars.Save(PATHFILE, env)
25 <        Help(vars.GenerateHelpText(env, sort=cmp))
24 >        vars.Save(pathfile, env)
25 >        Help(vars.GenerateHelpText(env))
26          # where stuff is located in the source tree
27          # the binary target libs are configured by platform
28          env['RAD_BUILDRLIB'] = '#lib'
# Line 48 | Line 50 | def shareinstall_setup(env):
50          if 'install' in sys.argv or 'maninstall' in sys.argv:
51                  install.install_manfiles(env)
52  
53 + # first figure out the platform
54 + from build_utils import load_plat
55 + testenv = Environment()
56 + load_plat.identify_plat(testenv)
57  
58   # set stuff before loading platforms
59 < prevars = set_pre_opts()
59 > prevars = set_pre_opts(testenv)
60 >
61   # Set up build environment
62   env = Environment(variables=prevars)
56 prevars.Save(OPTFILE, env)
63   env.Decider('timestamp-match')
64  
65   from build_utils import install
# Line 63 | Line 69 | if os.name == 'posix':
69          tclscript_b = Builder(action = install.install_tclscript, suffix = '')
70          env.Append(BUILDERS={'InstallTCLScript': tclscript_b})
71  
66
72   # configure platform-specific stuff
73 < from build_utils import load_plat
69 < load_plat.load_plat(env)
73 > load_plat.load_plat(env, testenv)
74  
75   # override options
76 < set_opts(env)
76 > cfg_pathfile = File(testenv['CFG_PATHFILE']).abspath
77 > set_opts(env, cfg_pathfile)
78  
79 + load_plat.combine_instpaths(env)
80 +
81   # accept license
82   if ((not env['SKIP']
83                          or env['SKIP'].strip().lower() in (0,'0','n','no','false',None))
84                  and not '-c' in sys.argv and not 'test' in sys.argv):
85          from build_utils import copyright
86          copyright.show_license()
87 +        testenv['SKIP'] = '1'
88  
89 + # We waited to save this, so that we can add the SKIP
90 + prevars.Save(File(testenv['CFG_OPTFILE']).abspath, testenv)
91 +
92   # fill in generic config
93   allplats_setup(env)
94  
95 + print('Installation directories:')
96 + print('Base:     ', env.subst('$RAD_BASEDIR'))
97 + print('Binaries: ', env.subst('$RAD_BINDIR'))
98 + print('Library:  ', env.subst('$RAD_RLIBDIR'))
99 + print('Manpages: ', env.subst('$RAD_MANDIR'))
100 + print()
101 +
102   # Bring in all the actual things to build
103   Export('env')
104   if 'test' in sys.argv:
# Line 100 | Line 118 | else:
118                  SConscript(os.path.join('src', d, 'SConscript'),
119                                  variant_dir=os.path.join(env['RAD_BUILDOBJ'], d), duplicate=0)
120  
121 <        if string.find(string.join(sys.argv[1:]), 'install') > -1:
121 >        if ' '.join(sys.argv[1:]).find('install') > -1:
122                  shareinstall_setup(env)
123  
124   Default('.')
# Line 110 | Line 128 | env.Alias('bininstall',  '$RAD_BINDIR')
128   env.Alias('rlibinstall', '$RAD_RLIBDIR')
129   env.Alias('maninstall',  '$RAD_MANDIR')
130  
131 < env.Alias('build',   ['$RAD_BUILDBIN', '$RAD_BUILDRLIB'])
131 > env.Alias('build',   ['$RAD_BUILDBIN']) #, '$RAD_BUILDRLIB'])
132   env.Alias('test',    ['#test'])
133   env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall'])
134  
135 < # vim: set syntax=python:
135 > # vi: set ts=4 sw=4 :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines