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

# Line 57 | 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':
61        from build_utils import install
62        script_b = Builder(action = install.install_script, suffix = '')
63        env.Append(BUILDERS={'InstallScript': script_b})
64          tclscript_b = Builder(action = install.install_tclscript, suffix = '')
65          env.Append(BUILDERS={'InstallTCLScript': tclscript_b})
66  
# Line 93 | 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 108 | 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