This makes some changes to the o3d tree in preparation

for landing in Chrome.

The biggest pieces here are moving some of the third party
dependencies back into o3d/third_party because they need
to be distinct from the chrome versions of the same packages,
and because O3D is the only one using the dependency.
(NPAPI in particular).

Also the plugin gyp file is now modified so that it can handle
being part of both a chrome developer tree and an o3d developer
tree (in the latter case, it generates the plugin and installer, in
the former it does not)

BE AWARE that this change will change the main solution/xcodebuild file
from "build/all" to be "build/o3d", but rebuilding from gyp files will NOT
remove the old "build/all" one, so you might be tricked into opening the
wrong one.

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

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

o3d/DEPS_chrome

@@ -0,0 +1,72 @@
+vars = {
+  "o3d_code_rev": "149",
+}
+
+deps = {
+  "src/o3d/o3d_assets":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/o3d_assets@" + Var("o3d_code_rev"),
+
+  "src/third_party/antlr3":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/antlr3@" + Var("o3d_code_rev"),
+
+  "src/third_party/cg":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cg@" + Var("o3d_code_rev"),
+
+  "src/third_party/fcollada":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + Var("o3d_code_rev"),
+
+  "src/third_party/jsdoctoolkit":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@" + Var("o3d_code_rev"),
+
+  "src/third_party/pdiff":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var("o3d_code_rev"),
+
+  "src/third_party/zip_utils":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" + Var("o3d_code_rev"),
+
+  "src/third_party/selenium_rc":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@" + Var("o3d_code_rev"),
+}
+
+deps_os = {
+  "win": {
+    "src/third_party/wix_2_0_4221":
+      "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@" + Var("o3d_code_rev"),
+  },
+}
+vars = {
+  "o3d_code_rev": "149",
+}
+
+deps = {
+  "src/o3d/o3d_assets":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/o3d_assets@" + Var("o3d_code_rev"),
+
+  "src/third_party/antlr3":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/antlr3@" + Var("o3d_code_rev"),
+
+  "src/third_party/cg":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cg@" + Var("o3d_code_rev"),
+
+  "src/third_party/fcollada":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + Var("o3d_code_rev"),
+
+  "src/third_party/jsdoctoolkit":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@" + Var("o3d_code_rev"),
+
+  "src/third_party/pdiff":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var("o3d_code_rev"),
+
+  "src/third_party/zip_utils":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" + Var("o3d_code_rev"),
+
+  "src/third_party/selenium_rc":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@" + Var("o3d_code_rev"),
+}
+
+deps_os = {
+  "win": {
+    "src/third_party/wix_2_0_4221":
+      "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@" + Var("o3d_code_rev"),
+  },
+}

o3d/DEPS_gyp

@@ -41,15 +41,29 @@ deps = {
   "third_party/scons":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var("o3d_code_rev"),
 
-  "third_party/vectormath":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" + Var("o3d_code_rev"),
-
   "third_party/zip_utils":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/zip_utils@" + Var("o3d_code_rev"),
 
   "third_party/selenium_rc":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/selenium_rc@" + Var("o3d_code_rev"),
 
+# Stuff that is O3D specific (from a Chrome point of view).
+
+  "o3d/third_party/vectormath":
+    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/vectormath@" + Var("o3d_code_rev"),
+
+  "o3d/third_party/nixysa":
+    "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"),
+
+  "o3d/third_party/npapi":
+    "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_rev"),
+
+  "o3d/third_party/ply":
+    "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@" + Var("gflags_rev"),
+
 # Stuff from the Chromium tree.
 
   "third_party/harfbuzz":
@@ -97,18 +111,6 @@ deps = {
   "breakpad/src":
     "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev"),
 
-  "third_party/nixysa":
-    "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"),
-
-  "third_party/npapi":
-    "http://nixysa.googlecode.com/svn/trunk/third_party/npapi@" + Var("nixysa_rev"),
-
-  "third_party/ply":
-    "http://nixysa.googlecode.com/svn/trunk/third_party/ply-3.1@" + Var("nixysa_rev"),
-
-  "third_party/gflags":
-    "http://google-gflags.googlecode.com/svn/trunk@" + Var("gflags_rev"),
-
   "testing/gtest":
     "http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"),
 
@@ -155,6 +157,6 @@ hooks = [
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": "\\.gypi?$|[/\\\\]src[/\\\\]tools[/\\\\]gyp[/\\\\]|[/\\\\]src[/\\\\]o3d[/\\\\]build[/\\\\]gyp_o3d$|MANIFEST$",
-    "action": ["python", "o3d/build/gyp_o3d", "o3d/build/all.gyp"],
+    "action": ["python", "o3d/build/gyp_o3d", "o3d/build/o3d.gyp"],
   },
 ]

o3d/build/common.gypi

@@ -12,15 +12,21 @@
     'gtestdir': 'testing/gtest/include',
     'jpegdir': 'third_party/libjpeg',
     'nacldir': 'third_party/native_client/googleclient',
-    'nixysadir': 'third_party/nixysa',
-    'npapidir': 'third_party/npapi',
+    'nixysadir': 'o3d/third_party/nixysa',
+    'npapidir': 'o3d/third_party/npapi',
     'pdiffdir': 'third_party/pdiff/files',
     'pngdir': 'third_party/libpng',
     'screenshotsdir': 'o3d_assets/tests/screenshots',
     'seleniumdir': 'third_party/selenium_rc/files',
     'skiadir': 'third_party/skia/include',
     'zlibdir': 'third_party/zlib',
-    'o3d_in_chrome%': 0,
+    # If the DEPS file exists two levels up, then we're in a Chrome tree.
+    'o3d_in_chrome%': '<!(python <(DEPTH)/o3d/build/file_exists.py ../../DEPS)',
+    # We default to building everything only if the assets exist.
+    # (and the teapot is the least likely asset to change).
+    # This is so that chrome developers get a much reduced dependency set.
+    'o3d_developer%': '<!(python <(DEPTH)/o3d/build/file_exists.py '
+                      '../o3d_assets/samples/convert_assets/teapot.zip)',
     'selenium_screenshots%': 0,
   },
   'target_defaults': {
@@ -66,6 +72,7 @@
             'OS_WIN',
             'UNICODE',
             'NACL_WINDOWS',
+            '_X86_',
           ],
           # Disable warning: "'this' : used in base member initialization list."
           'msvs_disabled_warnings': [4355],

o3d/build/o3d.gyp

@@ -0,0 +1,15 @@
+# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'O3D',
+      'type': 'none',
+      'dependencies': [
+        '<!(python select_dependencies.py):*',
+      ],
+    },
+  ],
+}

o3d/build/all.gyp → o3d/build/o3d_all.gyp

@@ -8,7 +8,7 @@
   ],
   'targets': [
     {
-      'target_name': 'All',
+      'target_name': 'O3D_All',
       'type': 'none',
       'dependencies': [
         '../../<(antlrdir)/antlr.gyp:*',
@@ -25,10 +25,10 @@
         '../import/import.gyp:o3dImport',
         '../installer/installer.gyp:installer',
         '../plugin/idl/idl.gyp:o3dPluginIdl',
+        '../plugin/idl/idl.gyp:o3dNpnApi',
         '../plugin/plugin.gyp:npo3dautoplugin',
         '../samples/samples.gyp:*',
         '../tests/selenium/selenium.gyp:*',
-        '../serializer/serializer.gyp:o3dSerializer',
         '../tests/tests.gyp:unit_tests',
         '../utils/utils.gyp:o3dUtils',
       ],
@@ -51,9 +51,3 @@
     },
   ],
 }
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2: