This adds a DEPS file for o3d that maps in all of its dependencies,

and updates the build files so that it will build.
Review URL: http://codereview.chromium.org/115847

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

5 files changed, 142 insertions, 15 deletions

diff --git a/o3d/DEPS b/o3d/DEPS
new file mode 100644
index 0000000..a1136b3
--- /dev/null
+++ b/o3d/DEPS
@@ -0,0 +1,104 @@
+vars = {
+  "chromium_trunk":
+    "http://src.chromium.org/svn/trunk",
+  "nixysa_rev": "21",
+  "o3d_code_rev": "71",
+}
+
+deps = {
+  "o3d/o3d_assets":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/o3d_assets@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/antlr3":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/antlr3@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/cg":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cg@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/chrome":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/chrome@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/doxygen":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/doxygen@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/fcollada":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/glew":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/glew@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/icu38":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/icu38@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/java":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/java@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/jpeg":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jpeg@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/pdiff":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/png":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/png@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/py":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/py@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/scons":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/skia":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/skia@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/v8":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/v8@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/vectormath":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/wix_2_0_4221":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/zip_utils":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/zlib":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zlib@" + Var("o3d_code_rev"),
+
+  # NACL has to be in this weird directory because it looks for
+  # googleclient two levels above it.
+  "o3d/third_party/native_client/googleclient/native_client":
+    "http://nativeclient.googlecode.com/svn/trunk/nacl/googleclient/native_client@188",
+
+  "o3d/third_party/breakpad/files":
+    "http://google-breakpad.googlecode.com/svn/trunk/@329",
+
+  "o3d/third_party/nixysa/files":
+    "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"),
+
+  "o3d/third_party/npapi/files":
+    "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_rev"),
+
+  "o3d/third_party/ply/files":
+    "http://nixysa.googlecode.com/svn/trunk/third_party/ply-3.1@" + Var("nixysa_rev"),
+
+  "o3d/third_party/gflags/":
+    "http://google-gflags.googlecode.com/svn/trunk@30",
+
+  "o3d/third_party/gtest/files":
+    "http://googletest.googlecode.com/svn/tags/release-1.2.1",
+
+  "o3d/third_party/gmock/files":
+    "http://googlemock.googlecode.com/svn/tags/release-1.0.0",
+
+  "o3d/third_party/jsdoctoolkit/files":
+    "http://jsdoc-toolkit.googlecode.com/svn/tags/jsdoc_toolkit-2.1.0/jsdoc-toolkit",
+}
+
+deps_os = {
+  "win": {
+    "o3d/third_party/python_24":
+      Var("chromium_trunk") + "/deps/third_party/python_24@7444",
+  },
+}
diff --git a/o3d/main.scons b/o3d/main.scons
index 4303675..1f026fc 100644
--- a/o3d/main.scons
+++ b/o3d/main.scons
@@ -82,7 +82,6 @@ base_env.ApplySConscript(['svn_paths.scons'])
 
 base_env.Append(
     # Some derived paths
-    NACL_IMC_SOURCE_DIR = '$NACL_DIR/intermodule_comm',
     NACL_NRD_XFER_SOURCE_DIR = '$NACL_DIR/src/trusted/desc',
     NACL_PLUGIN_SOURCE_DIR = '$NACL_DIR/npapi_plugin',
     DOCS_DIR = '$DESTINATION_ROOT/docs',
@@ -92,7 +91,8 @@ base_env.Append(
         '$SCONSTRUCT_DIR',
         '$CHROME_SRC_DIR',
         '$GTEST_DIR/include',
-        '$EXPERIMENTAL_O3D_DIR'
+        '$EXPERIMENTAL_O3D_DIR',
+        '$NACL_DIR/..',
     ],
     LIBPATH = '$LIBS_DIR',
     RENDERER_INCLUDE_PATH = [
@@ -105,7 +105,7 @@ base_env.Append(
     RENDERER_LIBS = [
         'libjpeg',
         'libpng',
-        'zlib'
+        'zlib',
         ],
 
     CPPDEFINES = [
@@ -231,8 +231,7 @@ def AddNaclBuildCommand(env, variant, platforms):
              for f in build_libs]
   nacl_build_tool = '$PYTHON $SCONS_DIR/scons.py'
   env.Command(targets,
-              ['$NACL_IMC_SOURCE_DIR', '$NACL_NRD_XFER_SOURCE_DIR',
-               '$NACL_PLUGIN_SOURCE_DIR'],
+              ['$NACL_NRD_XFER_SOURCE_DIR', '$NACL_PLUGIN_SOURCE_DIR'],
               nacl_build_tool + ' '
               'MODE=$NACL_VARIANT '
               'naclsdk_validate=0 '
diff --git a/o3d/scons b/o3d/scons
index ff8f01a..b12b295 100644
--- a/o3d/scons
+++ b/o3d/scons
@@ -1,9 +1,32 @@
 #!/bin/bash
-# @@REWRITE(insert sh-copyright)
-# @@REWRITE(delete-start)
-# Copyright 2009 Google Inc. All Rights Reserved.
-# Author: piman@google.com (Antoine Labour)
-# @@REWRITE(delete-end)
+# Copyright 2009, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 readonly SCRIPT_DIR="$(dirname "$0")"
 readonly SCRIPT_DIR_ABS="$(cd "$SCRIPT_DIR" ; pwd)"
@@ -12,6 +35,6 @@ readonly SCRIPT_DIR_ABS="$(cd "$SCRIPT_DIR" ; pwd)"
 if [ "$OSTYPE" = "cygwin" ]; then
   "$SCRIPT_DIR_ABS/scons.bat" "$@"
 else
-  "$SCRIPT_DIR_ABS/../third_party/scons/scons.py" -f main.scons "$@"
+  "$SCRIPT_DIR_ABS/third_party/scons/scons.py" -f main.scons "$@"
 fi
 
diff --git a/o3d/scons.bat b/o3d/scons.bat
index 1793f88..757c738 100644
--- a/o3d/scons.bat
+++ b/o3d/scons.bat
@@ -28,5 +28,4 @@ REM THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 REM (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 REM OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-"%~dp0\..\third_party\python_24\python" -O -OO "%~dp0\..\third_party\scons\scons.py" -f main.scons %*
+"%~dp0\third_party\python_24\python" -O -OO "%~dp0\third_party\scons\scons.py" -f main.scons %*
diff --git a/o3d/svn_paths.scons b/o3d/svn_paths.scons
index 6e7f96e..a9e0f48 100644
--- a/o3d/svn_paths.scons
+++ b/o3d/svn_paths.scons
@@ -33,7 +33,7 @@ import sys
 
 Import('env')
 env.Replace(
-    GOOGLECLIENT = '$SCONSTRUCT_DIR/..',
+    GOOGLECLIENT = '$SCONSTRUCT_DIR',
     THIRD_PARTY = '$GOOGLECLIENT/third_party',
 
     # A whole bunch of third-party and internal dependencies
@@ -56,7 +56,9 @@ env.Replace(
     # Set this to run an hermetic version of Firefox with Selenium on the Mac.
     # See tests/build.scons
     MAC_HERMETIC_FIREFOX_DIR = None,
-    NACL_DIR = '$GOOGLECLIENT/native_client',
+    # NACL has to be in this weird directory because it looks for
+    # googleclient two levels above it.
+    NACL_DIR = '$THIRD_PARTY/native_client/googleclient/native_client',
     NIXYSA_DIR = '$THIRD_PARTY/nixysa/files',
     NPAPI_DIR = '$THIRD_PARTY/npapi/files',
     PDIFF_DIR = '$THIRD_PARTY/pdiff/files',