1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
--- SConstruct.orig 2008-08-24 00:37:34 UTC
+++ SConstruct
@@ -24,28 +24,28 @@ release = '0.79' # should get from a file, and use on
conf_file = 'nonpareil.conf'
#-----------------------------------------------------------------------------
-# Options
+# Variables
#-----------------------------------------------------------------------------
-opts = Options (conf_file)
+opts = Variables (conf_file)
-opts.AddOptions (EnumOption ('host',
+opts.AddVariables (EnumVariable ('host',
help = 'host build platform',
allowed_values = ('posix', 'win32'),
default = 'posix',
ignorecase = 1),
- EnumOption ('target',
+ EnumVariable ('target',
help = 'execution target platform',
allowed_values = ('posix', 'win32'),
default = 'posix',
ignorecase = 1),
- PathOption ('prefix',
+ PathVariable ('prefix',
'installation path prefix',
'/usr/local'),
- # Don't use PathOption for other paths, because we don't
+ # Don't use PathVariable for other paths, because we don't
# require the directories to preexist.
('bindir',
'path for executable files (default is $prefix/bin)',
@@ -59,25 +59,25 @@ opts.AddOptions (EnumOption ('host',
'installation virtual root directory (for packaging)',
''),
- BoolOption ('debug',
+ BoolVariable ('debug',
help = 'compile for debugging',
default = 1),
# Feature switches:
- BoolOption ('has_debugger_gui',
+ BoolVariable ('has_debugger_gui',
help = 'enable debugger GUI interface',
default = 0),
- BoolOption ('has_debugger_cli',
+ BoolVariable ('has_debugger_cli',
help = 'enable debugger command-line interface',
default = 0),
- BoolOption ('use_tcl',
+ BoolVariable ('use_tcl',
help = 'use Tcl as debug command interpreter (only when debugger CLI is enabled)',
default = 1), # only if has_debugger_cli
- BoolOption ('use_readline',
+ BoolVariable ('use_readline',
help = 'use Readline library for command editing and history (only when debugger CLI is enabled)',
default = 1)) # only if has_debugger_cli
@@ -235,7 +235,7 @@ SConscript (['rom/SConscript',
# host platform code
#-----------------------------------------------------------------------------
-native_env = env.Copy ()
+native_env = env.Clone ()
native_env ['build_target_only'] = 0
SConscript ('src/SConscript',
build_dir = 'build/' + env ['host'],
@@ -256,7 +256,7 @@ SConscript ('asm/SConscript',
#-----------------------------------------------------------------------------
if (env ['host'] != env ['target']):
- cross_build_env = env.Copy ()
+ cross_build_env = env.Clone ()
cross_build_env ['build_target_only'] = 1
SConscript ('src/SConscript',
build_dir = 'build/' + env ['target'],
|
