1 |
|
|
2 |
|
import os |
3 |
|
import sys |
4 |
< |
import string |
4 |
> |
import platform |
5 |
|
import ConfigParser |
6 |
|
|
7 |
|
|
9 |
|
|
10 |
|
|
11 |
|
def read_plat(env, args, fn): |
12 |
< |
cfig = ConfigParser.ConfigParser(env.Dictionary()) |
12 |
> |
envdict = env.Dictionary().copy() |
13 |
> |
# can't feed ConfigParser the original dict, because it also |
14 |
> |
# contains non-string values. |
15 |
> |
for k,v in envdict.items(): |
16 |
> |
if not isinstance(v, str): |
17 |
> |
del envdict[k] |
18 |
> |
cfig = ConfigParser.ConfigParser(envdict) |
19 |
|
cfig.read(fn) |
20 |
< |
buildvars = [['CC'], # replace |
20 |
> |
buildvars = [['CC', |
21 |
> |
'TIFFINCLUDE', # where to find preinstalled tifflib headers |
22 |
> |
'TIFFLIB', # where to find a preinstalled tifflib library |
23 |
> |
], # replace |
24 |
|
['CPPPATH', 'CPPDEFINES', 'CPPFLAGS', 'CCFLAGS', |
25 |
< |
'LIBPATH', 'LINKFLAGS']] # append |
25 |
> |
'LIBPATH', 'LINKFLAGS', |
26 |
> |
'EZXML_CPPDEFINES', # build flags specific to ezxml.c |
27 |
> |
]] # append |
28 |
|
vars = [ |
29 |
|
['install', |
30 |
|
['RAD_BASEDIR', 'RAD_BINDIR', 'RAD_RLIBDIR', 'RAD_MANDIR'], |
31 |
|
[]], |
32 |
|
['code', |
33 |
< |
[], # replace |
33 |
> |
[ # replace |
34 |
> |
], |
35 |
|
[ # append |
36 |
< |
'RAD_COMPAT', # currently obsolete |
36 |
> |
'RAD_COMPAT', # theoretically obsolete (src/common/strcmp.c) |
37 |
|
'RAD_MATHCOMPAT', # erf.c floating point error function |
38 |
|
'RAD_ARGSCOMPAT', # fixargv0.c for Windows |
39 |
|
'RAD_NETCOMPAT', # [win_]netproc.c for ranimate |
40 |
|
'RAD_MLIB', # usually 'm', or any fastlib available |
41 |
|
'RAD_SOCKETLIB', # ws_2_32 on Windows (VC links it automatically) |
42 |
< |
'RAD_PROCESS']], # our process abstraction and win_popen() |
42 |
> |
'RAD_PROCESS', # our process abstraction and win_popen() |
43 |
> |
'RAD_PCALLS', # more custom process abstraction |
44 |
> |
]], |
45 |
|
] |
46 |
|
if args.get('RAD_DEBUG',0): |
47 |
|
vars.insert(0, ['debug'] + buildvars) |
56 |
|
for p in section[2]: # multiple items to append |
57 |
|
try: v = cfig.get(section[0], p) |
58 |
|
except ConfigParser.NoOptionError: continue |
59 |
< |
apply(env.Append,[],{p:string.split(v)}) |
46 |
< |
#print '%s: %s' % (p, env[p]) |
59 |
> |
apply(env.Append,[],{p:env.Split(v)}) |
60 |
|
# XXX Check that basedir exists. |
61 |
|
for k in ['RAD_BINDIR', 'RAD_RLIBDIR', 'RAD_MANDIR']: |
62 |
|
if (env.has_key('RAD_BASEDIR') and env.has_key(k) |
64 |
|
env[k] = os.path.join(env['RAD_BASEDIR'],env[k]) |
65 |
|
|
66 |
|
|
67 |
< |
def load_plat(env, args, platform=None): |
68 |
< |
if platform == None: # override |
67 |
> |
def load_plat(env, args, ourplat=None): |
68 |
> |
if ourplat == None: # override |
69 |
|
p = sys.platform |
70 |
< |
else: p = platform |
70 |
> |
else: p = ourplat |
71 |
> |
# if p == 'win32' and platform.architecture()[0] == '64bit': |
72 |
> |
# p = 'win64' |
73 |
|
if p == 'win32' and 'gcc' in env['TOOLS']: |
74 |
|
# we don't really want to know this here... |
75 |
|
p = 'mingw' |