diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 19:09:48 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 19:09:48 +0000 |
| commit | e0d017becefca651f1eee66d535b7460a2b63d46 (patch) | |
| tree | 899ee1731450c0486eb2ce627dfe1e6a41d43929 | |
| parent | a6ed015caa2c8c20b602b3b8873443ec035ca43c (diff) | |
| download | chromium_src-e0d017becefca651f1eee66d535b7460a2b63d46.zip chromium_src-e0d017becefca651f1eee66d535b7460a2b63d46.tar.gz chromium_src-e0d017becefca651f1eee66d535b7460a2b63d46.tar.bz2 | |
Reconstructing thomaslewis' change 118477.
I'm submitting this now to get more things working on the continuous build.
BUG=None
TEST=None
TBR=thomaslewis
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18080 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | o3d/plugin/build.scons | 3 | ||||
| -rw-r--r-- | o3d/tests/build.scons | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/o3d/plugin/build.scons b/o3d/plugin/build.scons index 40c8719..dbb5664 100644 --- a/o3d/plugin/build.scons +++ b/o3d/plugin/build.scons @@ -334,7 +334,8 @@ if env.Bit('mac'): env['MAC_INSTALLER_PROJECT'] = 'open_source_o3d_mac_npapi_metapackage.packproj' - make_installer = int(ARGUMENTS.get('MAKE_INSTALLER', 0)) + # Default is make the installer. + make_installer = int(ARGUMENTS.get('MAKE_INSTALLER', 1)) diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index 8bfde29..467da26 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -649,7 +649,7 @@ if env.AnyBits('mac', 'windows'): selenium_env.AlwaysBuild(selenium_env.Alias('prep_selenium', [], [Delete('$TARGET_ROOT/${PREP_SELENIUM_ARCHIVE_NAME}'), '$SETUP_SCRIPTS && ' - 'cd ..\o3d-internal && cd tests && cd lab_automation && ' + + 'cd .. && cd o3d-internal && cd tests && cd lab_automation && ' + sys.executable + ' prepare_selenium_tests.py ' '$TARGET_ROOT/${PREP_SELENIUM_ARCHIVE_NAME}', Delete('$PREP_SELENIUM_ARCHIVE'), |