Revert "Revert "Restructuring SDK so that it builds inside a normal chrome checkout.""

This reverts commit 5034eda4c488c4f47361bd3b70f52a375837326f.

BUG=105658
TEST=

Review URL: http://codereview.chromium.org/8687022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111827 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 27 insertions, 11 deletions

diff --git a/native_client_sdk/src/libraries/scons b/native_client_sdk/src/libraries/scons
index 053e32d..d4daf81 100755
--- a/native_client_sdk/src/libraries/scons
+++ b/native_client_sdk/src/libraries/scons
@@ -6,6 +6,7 @@
 
 readonly SCRIPT_DIR="$(dirname "$0")"
 readonly SCRIPT_DIR_ABS="$(cd "${SCRIPT_DIR}" ; pwd -P)"
+readonly SRC_DIR="$(dirname $(dirname $(dirname ${SCRIPT_DIR_ABS})))"
 
 # NACL_SDK_ROOT must be set.
 if [ x"${NACL_SDK_ROOT}"x == "xx" ] ; then
@@ -24,15 +25,23 @@ if [ x"${NACL_TARGET_PLATFORM}"x == "xx" ] ; then
 fi
 
 readonly NACL_PLATFORM_DIR="${NACL_SDK_ROOT}/${NACL_TARGET_PLATFORM}"
-readonly BASE_SCRIPT="${NACL_PLATFORM_DIR}/third_party/scons-2.0.1/script/scons"
 
-export SCONS_LIB_DIR="${NACL_PLATFORM_DIR}/third_party/scons-2.0.1/engine"
-export PYTHONPATH="${NACL_PLATFORM_DIR}/third_party/scons-2.0.1/engine:${NACL_PLATFORM_DIR}/build_tools"
+SCONS_DIR="${NACL_PLATFORM_DIR}/third_party/scons-2.0.1"
+
+if [ ! -f ${SCONS_DIR}/script/scons ]; then
+  SCONS_DIR="${SRC_DIR}/third_party/scons-2.0.1"
+fi
+
+BASE_SCRIPT="${SCONS_DIR}/script/scons"
+
+export SCONS_LIB_DIR="${SCONS_DIR}/engine"
+export PYTHONPATH="${SCONS_LIB_DIR}"
+export PYTHONPATH="${PYTHONPATH}:${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.
-export PYMOX="${NACL_PLATFORM_DIR}/third_party/pymox"
+export PYMOX="${NACL_PLATFORM_DIR}/third_party/pymox/src"
 
 "${BASE_SCRIPT}" --file=build.scons \
-                 --site-dir="${NACL_PLATFORM_DIR}/build_tools/nacl_sdk_scons" \
+                 --site-dir="${SCRIPT_DIR_ABS}/../build_tools/nacl_sdk_scons" \
                  $*
-
diff --git a/native_client_sdk/src/libraries/scons.bat b/native_client_sdk/src/libraries/scons.bat
index 889a757..d3c6c06 100755
--- a/native_client_sdk/src/libraries/scons.bat
+++ b/native_client_sdk/src/libraries/scons.bat
@@ -27,17 +27,24 @@ if not defined NACL_TARGET_PLATFORM (
 
 set NACL_PLATFORM_DIR=%NACL_SDK_ROOT%\%NACL_TARGET_PLATFORM%
 
-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
+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
 
 :: 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
+set PYMOX=%NACL_PLATFORM_DIR%\third_party\pymox\src
+
+set BASE_SCRIPT=%SCONS_DIR%\script\scons
 
 :: Run the included copy of scons.
-python -O -OO "%NACL_PLATFORM_DIR%\third_party\scons-2.0.1\script\scons" ^
+python -O -OO %BASE_SCRIPT% ^
 --warn no-visual-c-missing ^
 --file=build.scons ^
---site-dir="%NACL_PLATFORM_DIR%\build_tools\nacl_sdk_scons" %*
+--site-dir="%~dp0..\build_tools\nacl_sdk_scons" %*
 
 :end