|
Line
Link Here
|
| 0 |
-- a/SConstruct |
0 |
++ b/SConstruct |
|
Lines 664-669
Link Here
|
| 664 |
result = Options() |
664 |
result = Options() |
| 665 |
result.Add('mode', 'compilation mode (debug, release)', 'release') |
665 |
result.Add('mode', 'compilation mode (debug, release)', 'release') |
| 666 |
result.Add('sample', 'build sample (shell, process)', '') |
666 |
result.Add('sample', 'build sample (shell, process)', '') |
|
|
667 |
result.Add('install', 'install result files', '') |
| 667 |
result.Add('env', 'override environment settings (NAME0:value0,NAME1:value1,...)', '') |
668 |
result.Add('env', 'override environment settings (NAME0:value0,NAME1:value1,...)', '') |
| 668 |
result.Add('importenv', 'import environment settings (NAME0,NAME1,...)', '') |
669 |
result.Add('importenv', 'import environment settings (NAME0,NAME1,...)', '') |
| 669 |
for (name, option) in SIMPLE_OPTIONS.iteritems(): |
670 |
for (name, option) in SIMPLE_OPTIONS.iteritems(): |
|
Lines 989-1000
Link Here
|
| 989 |
env.Alias('sample', samples) |
990 |
env.Alias('sample', samples) |
| 990 |
env.Alias('d8', d8s) |
991 |
env.Alias('d8', d8s) |
| 991 |
|
992 |
|
|
|
993 |
install_dirs = [] |
| 994 |
destdir = ARGUMENTS.get('DESTDIR', '') |
| 995 |
prefix = ARGUMENTS.get('PREFIX', '/usr') |
| 996 |
libdir = [ destdir + prefix + '/lib/' ] |
| 997 |
incdir = [ destdir + prefix + '/include/' ] |
| 998 |
for lib in libraries: |
| 999 |
env.Install(libdir, lib[0]) |
| 1000 |
if dir not in install_dirs: |
| 1001 |
install_dirs += libdir |
| 1002 |
for include in [ 'include/v8.h', 'include/v8-debug.h' ]: |
| 1003 |
env.Install(incdir, include); |
| 1004 |
install_dirs += incdir |
| 1005 |
env.Alias('install', install_dirs) |
| 1006 |
|
| 1007 |
# Always build at least the library |
| 1008 |
env.Default('library') |
| 1009 |
|
| 1010 |
|
| 992 |
if env['sample']: |
1011 |
if env['sample']: |
| 993 |
env.Default('sample') |
1012 |
env.Default('sample') |
|
|
1013 |
elif env['install']: |
| 1014 |
env.Default('install') |
| 994 |
else: |
1015 |
else: |
| 995 |
env.Default('library') |
1016 |
env.Default('library') |
| 996 |
|
1017 |
|
| 997 |
|
1018 |
|
|
|
1019 |
|
| 998 |
# We disable deprecation warnings because we need to be able to use |
1020 |
# We disable deprecation warnings because we need to be able to use |
| 999 |
# env.Copy without getting warnings for compatibility with older |
1021 |
# env.Copy without getting warnings for compatibility with older |
| 1000 |
# version of scons. Also, there's a bug in some revisions that |
1022 |
# version of scons. Also, there's a bug in some revisions that |
