diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
| commit | 012adff3836f208288c09323c0de2f93117c13c9 (patch) | |
| tree | d1af9d7e64632c7b79a774015cc0377f0801010c /build/SConscript.v8 | |
| parent | 5ab78644f9d8237553aab6c0b6b97463ecd67bda (diff) | |
| download | chromium_src-012adff3836f208288c09323c0de2f93117c13c9.zip chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.gz chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.bz2 | |
Rolling back CL 3578, discovered hammer.bat had not been updated yet.
Review URL: http://codereview.chromium.org/7507
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3582 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.v8')
| -rw-r--r-- | build/SConscript.v8 | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/build/SConscript.v8 b/build/SConscript.v8 index 7820f16..8eeef09 100644 --- a/build/SConscript.v8 +++ b/build/SConscript.v8 @@ -2,9 +2,6 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - -import os - Import('env') # Grab the -j flag from the outer environment, if available. @@ -25,16 +22,13 @@ env = env.Clone( '--warn=no-no-parallel-support' + cpu_flag), ) -if env['PLATFORM'] == 'win32': - env['ENV']['ProgramFiles'] = os.environ['ProgramFiles'] - # Rather than build v8 with our own commands, we just shell out to v8's # own SCons-based build, since their build system is complicated. # This SConscript just declares dependencies on the outputs of that build. mksnapshot_exe = env.File('$V8_MODE_DIR/mksnapshot${PROGSUFFIX}') -libraries_empty_obj = env.File('$V8_MODE_DIR/libraries-empty${OBJSUFFIX}') libraries_obj = env.File('$V8_MODE_DIR/libraries${OBJSUFFIX}') +libraries_empty_obj = env.File('$V8_MODE_DIR/libraries-empty${OBJSUFFIX}') snapshot_obj = env.File('$V8_MODE_DIR/snapshot${OBJSUFFIX}') snapshot_empty_obj = env.File('$V8_MODE_DIR/snapshot-empty${OBJSUFFIX}') v8_bin = env.File('$V8_SRC_DIR/shell${PROGSUFFIX}') @@ -70,13 +64,20 @@ env.AlwaysBuild(v8) # rebuild them (thereby causing us to always rebuild their dependents). env.Precious(v8) +env.Install('$V8_DIR', v8) + + +i = env.Install('$LIBS_DIR', v8_lib) +env.Alias('webkit', i) + +i = env.Install('$TARGET_ROOT', v8_bin) +env.Alias('chrome', i) -# TODO(bradnelson): remove if we confirm we no longer need this. # To satisfy tests expecting the following .exe name. -#if env['PLATFORM'] == 'win32': -# # TODO(evanm): this may be necessary on other platforms(?) -# i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8_bin) -# env.Alias('chrome', i) +if env['PLATFORM'] == 'win32': + # TODO(evanm): this may be necessary on other platforms(?) + i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8_bin) + env.Alias('chrome', i) env.ChromeStaticLibrary('v8_snapshot', [libraries_empty_obj, snapshot_obj]) |