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.16 by schorsch, Thu Mar 10 01:49:56 2016 UTC vs.
Revision 1.18 by schorsch, Mon Mar 28 17:48:43 2016 UTC

# Line 3 | Line 3 | import os
3   import sys
4   import string
5  
6 + PATHFILE = 'raypaths.py'
7   OPTFILE = 'rayopts.py'
8 < def set_opts(env):
8 <        # XXX add some caching
8 > def set_pre_opts(env):
9          vars = Variables(OPTFILE, ARGUMENTS)
10          vars.Add('SKIP', 'Skip Display of License terms', 0)
11 +        vars.Add('RAD_DEBUG',   'Build a debug version',  0)
12 +        vars.Update(env)
13 +        vars.Save(OPTFILE, env)
14 +
15 + def set_opts(env):
16 +        vars = Variables(PATHFILE, ARGUMENTS)
17          vars.Add('RAD_BINDIR',  'Install executables here',   env['RAD_BINDIR'])
18          vars.Add('RAD_RLIBDIR', 'Install support files here', env['RAD_RLIBDIR'])
19          vars.Add('RAD_MANDIR',  'Install man pages here',     env['RAD_MANDIR'])
14        vars.Add('RAD_DEBUG',   'Build a debug version',  0)
20          vars.Update(env)
21 <        vars.Save(OPTFILE, env)
21 >        vars.Save(PATHFILE, env)
22          Help(vars.GenerateHelpText(env, sort=cmp))
23          # where stuff is located in the source tree
24          # the binary target libs are configured by platform
# Line 52 | Line 57 | for item in sys.argv[1:]:
57   env = Environment(TARGET_ARCH=_arch)
58   env.Decider('timestamp-match')
59  
60 + from build_utils import install
61 + script_b = Builder(action = install.install_script, suffix = '')
62 + env.Append(BUILDERS={'InstallScript': script_b})
63   if os.name == 'posix':
56        from build_utils import install
57        script_b = Builder(action = install.install_script, suffix = '')
58        env.Append(BUILDERS={'InstallScript': script_b})
64          tclscript_b = Builder(action = install.install_tclscript, suffix = '')
65          env.Append(BUILDERS={'InstallTCLScript': tclscript_b})
66  
67 + # set debug before loading platforms
68 + set_pre_opts(env)
69 +
70   # configure platform-specific stuff
71   from build_utils import load_plat
72 < load_plat.load_plat(env, ARGUMENTS, arch=_arch)
72 > load_plat.load_plat(env, vars, arch=_arch)
73  
74   # override options
75   set_opts(env)
76  
77   # accept license
78   if ((not env['SKIP']
79 <                        or env['SKIP'].strip().lower() in (0,'0','no','false'))
79 >                        or env['SKIP'].strip().lower() in (0,'0','n','no','false',None))
80                  and not '-c' in sys.argv and not 'test' in sys.argv):
81          from build_utils import copyright
82          copyright.show_license()
# Line 85 | Line 93 | else:
93          SConscript(os.path.join('src', 'common', 'SConscript'),
94                          variant_dir=os.path.join(env['RAD_BUILDOBJ'],'common'), duplicate=0)
95          post_common_setup(env)
96 <        for d in Split('meta cv gen ot rt px hd util cal'):
97 <                print d
96 >        dirs = Split('''meta cv gen ot rt px hd util cal''')
97 >        if os.path.isfile('src/winimage/SConscript'):
98 >                dirs.append('winimage')
99 >        if os.path.isfile('src/winrview/SConscript'):
100 >                dirs.append('winrview')
101 >        for d in dirs:
102 >                print(d)
103                  SConscript(os.path.join('src', d, 'SConscript'),
104                                  variant_dir=os.path.join(env['RAD_BUILDOBJ'], d), duplicate=0)
105  
# Line 100 | Line 113 | env.Alias('bininstall',  '$RAD_BINDIR')
113   env.Alias('rlibinstall', '$RAD_RLIBDIR')
114   env.Alias('maninstall',  '$RAD_MANDIR')
115  
116 < env.Alias('build',   ['$RAD_BUILDBIN'])
116 > env.Alias('build',   ['$RAD_BUILDBIN', '$RAD_BUILDRLIB'])
117   env.Alias('test',    ['#test'])
118   env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall'])
119  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines