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.13 by schorsch, Sat Mar 5 13:24:58 2016 UTC vs.
Revision 1.15 by schorsch, Sun Mar 6 01:13:17 2016 UTC

# Line 6 | Line 6 | import string
6   OPTFILE = 'rayopts.py'
7   def set_opts(env):
8          # XXX add some caching
9 <        opts = Options(OPTFILE, ARGUMENTS)
10 <        opts.Add('SKIP', 'Skip Display of License terms', 0)
11 <        opts.Add('RAD_BINDIR',  'Install executables here',   env['RAD_BINDIR'])
12 <        opts.Add('RAD_RLIBDIR', 'Install support files here', env['RAD_RLIBDIR'])
13 <        opts.Add('RAD_MANDIR',  'Install man pages here',     env['RAD_MANDIR'])
14 <        opts.Add('RAD_DEBUG',   'Build a debug version',  0)
15 <        opts.Update(env)
16 <        opts.Save(OPTFILE, env)
17 <        Help(opts.GenerateHelpText(env, sort=cmp))
9 >        vars = Variables(OPTFILE, ARGUMENTS)
10 >        vars.Add('SKIP', 'Skip Display of License terms', 0)
11 >        vars.Add('RAD_BINDIR',  'Install executables here',   env['RAD_BINDIR'])
12 >        vars.Add('RAD_RLIBDIR', 'Install support files here', env['RAD_RLIBDIR'])
13 >        vars.Add('RAD_MANDIR',  'Install man pages here',     env['RAD_MANDIR'])
14 >        vars.Add('RAD_DEBUG',   'Build a debug version',  0)
15 >        vars.Update(env)
16 >        vars.Save(OPTFILE, env)
17 >        Help(vars.GenerateHelpText(env, sort=cmp))
18          # where stuff is located in the source tree
19          env['RAD_BUILDLIB']  = '#src/lib'
20          env['RAD_BUILDBIN']  = '#bin'
# Line 55 | Line 55 | if os.name == 'posix':
55  
56   # configure platform-specific stuff
57   from build_utils import load_plat
58 < load_plat.load_plat(env, ARGUMENTS, platform=None)
58 > load_plat.load_plat(env, ARGUMENTS, ourplat=None)
59  
60   # override options
61   set_opts(env)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines