diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 01:16:22 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-29 01:16:22 +0000 |
| commit | 564c99137aeb3b64c8be6847b9f79b78b484c7bb (patch) | |
| tree | e4e7b0eb662b60fe13a66bb5419b7bbd464d13e0 /native_client_sdk/src/libraries/scons.bat | |
| parent | 3ce5797c5647c455f65ef970fffd0e7e0c1e53cb (diff) | |
| download | chromium_src-564c99137aeb3b64c8be6847b9f79b78b484c7bb.zip chromium_src-564c99137aeb3b64c8be6847b9f79b78b484c7bb.tar.gz chromium_src-564c99137aeb3b64c8be6847b9f79b78b484c7bb.tar.bz2 | |
Revert "Restructuring SDK so that it builds inside a normal chrome checkout."
This reverts commit f93e934130f674cde671d49f17dc152793e943ca.
Revert "Make archiving source independent of which buildbot_run.py is run from."
This reverts commit c4ab747a752ee8228bfb78f71b54df8ef9104c7e.
BUG=105658
Review URL: http://codereview.chromium.org/8664018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/libraries/scons.bat')
| -rwxr-xr-x | native_client_sdk/src/libraries/scons.bat | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/native_client_sdk/src/libraries/scons.bat b/native_client_sdk/src/libraries/scons.bat index d3c6c06..889a757 100755 --- a/native_client_sdk/src/libraries/scons.bat +++ b/native_client_sdk/src/libraries/scons.bat @@ -27,24 +27,17 @@ if not defined NACL_TARGET_PLATFORM ( set NACL_PLATFORM_DIR=%NACL_SDK_ROOT%\%NACL_TARGET_PLATFORM% -set SCONS_DIR=%NACL_PLATFORM_DIR%\third_party\scons-2.0.1 -if exist %SCONS_DIR% goto gotscons -set SCONS_DIR=%~dp0..\..\..\third_party\scons-2.0.1 -:gotscons - -set SCONS_LIB_DIR=%SCONS_DIR%\engine -set PYTHONPATH=%SCONS_LIB_DIR%;%NACL_PLATFORM_DIR%\build_tools +set SCONS_LIB_DIR=%NACL_PLATFORM_DIR%\third_party\scons-2.0.1\engine +set PYTHONPATH=%NACL_PLATFORM_DIR%\third_party\scons-2.0.1\engine;%NACL_PLATFORM_DIR%\build_tools :: We have to do this because scons overrides PYTHONPATH and does not preserve :: what is provided by the OS. The custom variable name won't be overwritten. -set PYMOX=%NACL_PLATFORM_DIR%\third_party\pymox\src - -set BASE_SCRIPT=%SCONS_DIR%\script\scons +set PYMOX=%NACL_PLATFORM_DIR%\third_party\pymox :: Run the included copy of scons. -python -O -OO %BASE_SCRIPT% ^ +python -O -OO "%NACL_PLATFORM_DIR%\third_party\scons-2.0.1\script\scons" ^ --warn no-visual-c-missing ^ --file=build.scons ^ ---site-dir="%~dp0..\build_tools\nacl_sdk_scons" %* +--site-dir="%NACL_PLATFORM_DIR%\build_tools\nacl_sdk_scons" %* :end |