ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/build_utils/load_plat.py
(Generate patch)

Comparing ray/build_utils/load_plat.py (file contents):
Revision 1.9 by schorsch, Wed Jun 7 12:25:36 2006 UTC vs.
Revision 1.13 by schorsch, Sat Mar 5 00:40:25 2016 UTC

# Line 8 | Line 8 | _platdir = 'platform'
8  
9  
10   def read_plat(env, args, fn):
11 <        cfig = ConfigParser.ConfigParser(env.Dictionary())
11 >        envdict = env.Dictionary().copy()
12 >        # can't feed ConfigParser the original dict, because it also
13 >        # contains non-string values.
14 >        for k,v in envdict.items():
15 >                if not isinstance(v, str):
16 >                        del envdict[k]
17 >        cfig = ConfigParser.ConfigParser(envdict)
18          cfig.read(fn)
19 <        buildvars = [['CC'], # replace
19 >        buildvars = [['CC',
20 >                        'TIFFINCLUDE', # where to find preinstalled tifflib headers
21 >                        'TIFFLIB',     # where to find a preinstalled tifflib library
22 >                        ], # replace
23                          ['CPPPATH', 'CPPDEFINES', 'CPPFLAGS', 'CCFLAGS',
24 <                        'LIBPATH', 'LINKFLAGS']] # append
24 >                        'LIBPATH', 'LINKFLAGS',
25 >                        'EZXML_CPPDEFINES', # build flags specific to ezxml.c
26 >                        ]] # append
27          vars = [
28                  ['install',
29                          ['RAD_BASEDIR', 'RAD_BINDIR', 'RAD_RLIBDIR', 'RAD_MANDIR'],
30                          []],
31                  ['code',
32 <                        [], # replace
32 >                        [   # replace
33 >                        ],
34                          [   # append
35 <                        'RAD_COMPAT',    # currently obsolete
35 >                        'RAD_COMPAT',     # theoretically obsolete (src/common/strcmp.c)
36                          'RAD_MATHCOMPAT', # erf.c floating point error function
37                          'RAD_ARGSCOMPAT', # fixargv0.c for Windows
38                          'RAD_NETCOMPAT',  # [win_]netproc.c for ranimate
39                          'RAD_MLIB',       # usually 'm', or any fastlib available
40                          'RAD_SOCKETLIB',  # ws_2_32 on Windows (VC links it automatically)
41 <                        'RAD_PROCESS']],  # our process abstraction and win_popen()
41 >                        'RAD_PROCESS',    # our process abstraction and win_popen()
42 >                        'RAD_PCALLS',     # more custom process abstraction
43 >                        ]],
44          ]
45          if args.get('RAD_DEBUG',0):
46                  vars.insert(0, ['debug'] + buildvars)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines