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.7 by schorsch, Tue Dec 23 15:03:58 2008 UTC vs.
Revision 1.8 by schorsch, Fri Dec 26 17:00:32 2008 UTC

# Line 5 | Line 5 | 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))
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))
18          # where stuff is located in the source tree
19 <    env['RAD_BUILDLIB']  = '#src/lib'
20 <    env['RAD_BUILDBIN']  = '#bin'
21 <    env['RAD_BUILDRLIB'] = '#lib'
22 <    env['RAD_BUILDMAN']  = '#doc/man'
19 >        env['RAD_BUILDLIB']  = '#src/lib'
20 >        env['RAD_BUILDBIN']  = '#bin'
21 >        env['RAD_BUILDRLIB'] = '#lib'
22 >        env['RAD_BUILDMAN']  = '#doc/man'
23  
24   def allplats_setup(env):
25 <    from build_utils import find_libs
26 <    find_libs.find_x11(env)
27 <    find_libs.find_gl(env) # OpenGL
28 <    find_libs.find_libtiff(env)
25 >        from build_utils import find_libs
26 >        find_libs.find_x11(env)
27 >        find_libs.find_gl(env) # OpenGL
28 >        find_libs.find_libtiff(env)
29  
30   def post_common_setup(env):
31 <    env.Append(CPPPATH = [os.path.join('#src', 'common')])
32 <    env.Append(LIBPATH=['../lib']) # our own libs
33 <    if not env.has_key('RAD_MLIB'):
34 <        env['RAD_MLIB'] = [] #['m'] # no seperate mlib on Win
31 >        env.Append(CPPPATH = [os.path.join('#src', 'common')])
32 >        env.Append(LIBPATH=['../lib']) # our own libs
33 >        if not env.has_key('RAD_MLIB'):
34 >                env['RAD_MLIB'] = [] #['m'] # no seperate mlib on Win
35  
36   def shareinstall_setup(env):
37          from build_utils import install
# Line 59 | Line 59 | load_plat.load_plat(env, ARGUMENTS, platform=None)
59   set_opts(env)
60  
61   # accept license
62 < if not env['SKIP'] and not '-c' in sys.argv:
63 <    from build_utils import copyright
64 <    copyright.show_license()
62 > if ((not env['SKIP']
63 >                        or env['SKIP'].strip().lower() in (0,'0','no','false'))
64 >                and not '-c' in sys.argv and not 'test' in sys.argv):
65 >        from build_utils import copyright
66 >        copyright.show_license()
67  
68   # fill in generic config
69   allplats_setup(env)
70  
69                
71  
72   # Bring in all the actual things to build
73   Export('env')
74 < SConscript(os.path.join('src', 'common', 'SConscript'))
75 < post_common_setup(env)
76 < for d in Split('meta cv gen ot rt px hd util cal'):
77 <    print d
78 <    SConscript(os.path.join('src', d, 'SConscript'))
74 > if 'test' in sys.argv:
75 >        SConscript(os.path.join('test', 'SConscript'))
76 >        
77 > else:
78 >        SConscript(os.path.join('src', 'common', 'SConscript'))
79 >        post_common_setup(env)
80 >        for d in Split('meta cv gen ot rt px hd util cal'):
81 >                print d
82 >                SConscript(os.path.join('src', d, 'SConscript'))
83  
84 < if string.find(string.join(sys.argv[1:]), 'install') > -1:
85 <        shareinstall_setup(env)
84 >        if string.find(string.join(sys.argv[1:]), 'install') > -1:
85 >                shareinstall_setup(env)
86  
87   Default('.')
88  
# Line 87 | Line 92 | env.Alias('rlibinstall', '$RAD_RLIBDIR')
92   env.Alias('maninstall',  '$RAD_MANDIR')
93  
94   env.Alias('build',   ['#bin'])
95 < env.Alias('test',    ['#src/test'])
95 > env.Alias('test',    ['#test'])
96   env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall'])
97  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines