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.10 by greg, Thu May 27 19:32:11 2010 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 < 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))
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 >        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, 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))
26          # where stuff is located in the source tree
27 <        env['RAD_BUILDLIB']  = '#src/lib'
20 <        env['RAD_BUILDBIN']  = '#bin'
27 >        # the binary target libs are configured by platform
28          env['RAD_BUILDRLIB'] = '#lib'
29          env['RAD_BUILDMAN']  = '#doc/man'
23        # compatibility modules
24        env['RAD_COMPAT'] = 'timegm.o'
30  
31   def allplats_setup(env):
32          from build_utils import find_libs
# Line 29 | Line 34 | def allplats_setup(env):
34          find_libs.find_x11(env)
35          find_libs.find_gl(env) # OpenGL
36          find_libs.find_libtiff(env)
37 +        find_libs.find_pyinstaller(env)
38  
39   def post_common_setup(env):
40          env.Append(CPPPATH = [os.path.join('#src', 'common')])
41 <        env.Append(LIBPATH=['../lib']) # our own libs
41 >        env.Append(LIBPATH=[env['RAD_BUILDLIB']]) # our own libs
42          if not env.has_key('RAD_MLIB'):
43                  env['RAD_MLIB'] = [] #['m'] # no seperate mlib on Win
44  
# Line 44 | 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(testenv)
60 +
61   # Set up build environment
62 < env = Environment(tools=['mingw'])
62 > env = Environment(variables=prevars)
63   env.Decider('timestamp-match')
64  
65 + from build_utils import install
66 + script_b = Builder(action = install.install_script, suffix = '')
67 + env.Append(BUILDERS={'InstallScript': script_b})
68   if os.name == 'posix':
69 <        from build_utils import install
70 <        csh_b = Builder(action = install.install_cshscript,
54 <                        suffix = '', src_suffix = '.csh')
55 <        env.Append(BUILDERS={'InstallCsh': csh_b})
69 >        tclscript_b = Builder(action = install.install_tclscript, suffix = '')
70 >        env.Append(BUILDERS={'InstallTCLScript': tclscript_b})
71  
72   # configure platform-specific stuff
73 < from build_utils import load_plat
59 < load_plat.load_plat(env, ARGUMENTS, platform=None)
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','no','false'))
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')
# Line 78 | Line 105 | if 'test' in sys.argv:
105          SConscript(os.path.join('test', 'SConscript'))
106          
107   else:
108 <        SConscript(os.path.join('src', 'common', 'SConscript'))
108 >        SConscript(os.path.join('src', 'common', 'SConscript'),
109 >                        variant_dir=os.path.join(env['RAD_BUILDOBJ'],'common'), duplicate=0)
110          post_common_setup(env)
111 <        for d in Split('meta cv gen ot rt px hd util cal'):
112 <                print d
113 <                SConscript(os.path.join('src', d, 'SConscript'))
111 >        dirs = Split('''meta cv gen ot rt px hd util cal''')
112 >        if os.path.isfile('src/winimage/SConscript'):
113 >                dirs.append('winimage')
114 >        if os.path.isfile('src/winrview/SConscript'):
115 >                dirs.append('winrview')
116 >        for d in dirs:
117 >                print(d)
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 94 | Line 128 | env.Alias('bininstall',  '$RAD_BINDIR')
128   env.Alias('rlibinstall', '$RAD_RLIBDIR')
129   env.Alias('maninstall',  '$RAD_MANDIR')
130  
131 < env.Alias('build',   ['#bin'])
131 > env.Alias('build',   ['$RAD_BUILDBIN']) #, '$RAD_BUILDRLIB'])
132   env.Alias('test',    ['#test'])
133   env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall'])
134  
135 + # vi: set ts=4 sw=4 :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines