This change kills the SCons build, since we have switched completely

over to GYP. It also copies the contents of DEPS_gyp to DEPS, and removes the DEPS_gyp file. Review URL: http://codereview.chromium.org/354011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30729 0039d316-1c4b-4281-b951-d872f2087c98
author: gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> 2009-11-02 19:00:07 +0000
committer: gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> 2009-11-02 19:00:07 +0000
commit: 7937c84250348ba25af03cfdc6d8d9d0a7098128 (patch)
tree: 9bf54cfa70cde313d00040d252c3105a2ecfb293 /o3d
parent: 83aec62c726e56e6c5c0499c872aab03ff031a3c (diff)
download: chromium_src-7937c84250348ba25af03cfdc6d8d9d0a7098128.zip
chromium_src-7937c84250348ba25af03cfdc6d8d9d0a7098128.tar.gz
chromium_src-7937c84250348ba25af03cfdc6d8d9d0a7098128.tar.bz2
34 files changed, 106 insertions, 5520 deletions
diff --git a/o3d/DEPS b/o3d/DEPS
index ca420be..63f8604 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -1,89 +1,59 @@
 vars = {
-  "chromium_trunk":
-    "http://src.chromium.org/svn/trunk",
-  "nixysa_rev": "54",
-  "chromium_rev": "22547",
+  "chromium_trunk": "http://src.chromium.org/svn/trunk",
+  "nixysa_rev": "56",
+  "chromium_rev": "28829",
   "o3d_code_rev": "157",
-  "skia_rev": "279",
+  "skia_rev": "376",
   "gyp_rev": "725",
-  "gtest_rev": "267",
+  "gtest_rev": "329",
   "gflags_rev": "30",
-  "breakpad_rev": "346",
-  "v8_rev": "2624",
+  "breakpad_rev": "391",
+  "v8_rev": "2901",
+  "nacl_rev": "842",
 }
 
 deps = {
   "o3d/o3d_assets":
     "http://o3d.googlecode.com/svn/trunk/googleclient/o3d_assets@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/antlr3":
+  "third_party/antlr3":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/antlr3@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/cg":
+  "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/fcollada":
+  "third_party/fcollada":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/glew":
+  "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/jpeg":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jpeg@" + Var("o3d_code_rev"),
-
-  "o3d/third_party/jsdoctoolkit":
+  "third_party/jsdoctoolkit":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/libevent":
+  "third_party/libevent":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/libevent@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/makeself":
+  "third_party/makeself":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/makeself@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/pdiff":
+  "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/scons":
+  "third_party/scons":
     "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + Var("o3d_code_rev"),
 
-  "o3d/third_party/selenium_rc":
+  "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"),
 
-  "o3d/third_party/skia":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/skia/files@" + 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/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"),
-
-  "o3d/third_party/v8":
-    "http://v8.googlecode.com/svn/trunk@" + Var("v8_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":
-    "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev"),
-
   "o3d/third_party/nixysa":
     "http://nixysa.googlecode.com/svn/trunk/nixysa@" + Var("nixysa_rev"),
 
@@ -93,22 +63,102 @@ deps = {
   "o3d/third_party/ply":
     "http://nixysa.googlecode.com/svn/trunk/third_party/ply-3.1@" + Var("nixysa_rev"),
 
-  "o3d/third_party/gflags/":
+  "o3d/third_party/gflags":
     "http://google-gflags.googlecode.com/svn/trunk@" + Var("gflags_rev"),
 
-  "o3d/third_party/gtest/files":
+# Stuff from the Chromium tree.
+
+  "third_party/harfbuzz":
+    Var("chromium_trunk") + "/src/third_party/harfbuzz@" + Var("chromium_rev"),
+
+  "third_party/icu":
+    Var("chromium_trunk") + "/deps/third_party/icu42@" + Var("chromium_rev"),
+
+  "third_party/libevent":
+    Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"),
+
+  "third_party/libjpeg":
+    Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_rev"),
+
+  "third_party/libpng":
+    Var("chromium_trunk") + "/src/third_party/libpng@" + Var("chromium_rev"),
+
+  "chrome/third_party/wtl":
+    Var("chromium_trunk") + "/src/chrome/third_party/wtl@" + Var("chromium_rev"),
+
+  "third_party/zlib":
+    Var("chromium_trunk") + "/src/third_party/zlib@" + Var("chromium_rev"),
+
+  "third_party/skia":
+    "http://skia.googlecode.com/svn/trunk@" + Var("skia_rev"),
+
+  "v8":
+    "http://v8.googlecode.com/svn/trunk@" + Var("v8_rev"),
+
+  "testing":
+    Var("chromium_trunk") + "/src/testing@" + Var("chromium_rev"),
+
+  "skia":
+    Var("chromium_trunk") + "/src/skia@" + Var("chromium_rev"),
+
+  "breakpad":
+    Var("chromium_trunk") + "/src/breakpad@" + Var("chromium_rev"),
+
+  "base":
+    Var("chromium_trunk") + "/src/base@" + Var("chromium_rev"),
+
+  "native_client":
+    "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" + Var("nacl_rev"),
+
+  "breakpad/src":
+    "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev"),
+
+  "testing/gtest":
     "http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"),
 
-  "o3d/third_party/gmock/files":
+  "testing/gmock":
     Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"),
 
+  # Stuff needed for GYP to run
+  "build":
+    Var("chromium_trunk") + "/src/build@" + Var("chromium_rev"),
+
   "tools/gyp":
     "http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"),
 }
 
 deps_os = {
   "win": {
-    "o3d/third_party/python_24":
+    "third_party/wix_2_0_4221":
+      "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@" + Var("o3d_code_rev"),
+
+    "third_party/cygwin":
+      "/trunk/deps/third_party/cygwin@11984",
+
+    "third_party/python_24":
       Var("chromium_trunk") + "/deps/third_party/python_24@19441",
   },
+  "unix": {
+    # Linux, really.
+    "site_scons":
+      Var("chromium_trunk") + "/src/site_scons@" + Var("chromium_rev"),
+    # TODO(bradnelson): make these optional!!!
+    # These are currently required by gyp on linux (even though o3d isn't using
+    # data_pack or grit).
+    "tools/grit":
+      Var("chromium_trunk") + "/src/tools/grit@" + Var("chromium_rev"),
+    "tools/data_pack":
+      Var("chromium_trunk") + "/src/tools/data_pack@" + Var("chromium_rev"),
+    "tools/xdisplaycheck":
+      Var("chromium_trunk") + "/src/tools/xdisplaycheck@" + Var("chromium_rev"),
+
+  },
 }
+
+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/o3d.gyp", "o3d/tests/lab/ChangeResolution/change_resolution.gyp"],
+  },
+]
diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
deleted file mode 100644
index 63f8604..0000000
--- a/o3d/DEPS_gyp
+++ /dev/null
@@ -1,164 +0,0 @@
-vars = {
-  "chromium_trunk": "http://src.chromium.org/svn/trunk",
-  "nixysa_rev": "56",
-  "chromium_rev": "28829",
-  "o3d_code_rev": "157",
-  "skia_rev": "376",
-  "gyp_rev": "725",
-  "gtest_rev": "329",
-  "gflags_rev": "30",
-  "breakpad_rev": "391",
-  "v8_rev": "2901",
-  "nacl_rev": "842",
-}
-
-deps = {
-  "o3d/o3d_assets":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/o3d_assets@" + Var("o3d_code_rev"),
-
-  "third_party/antlr3":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/antlr3@" + Var("o3d_code_rev"),
-
-  "third_party/cg":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/cg@" + Var("o3d_code_rev"),
-
-  "third_party/fcollada":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/fcollada@" + Var("o3d_code_rev"),
-
-  "third_party/glew":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/glew@" + Var("o3d_code_rev"),
-
-  "third_party/jsdoctoolkit":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/jsdoctoolkit@" + Var("o3d_code_rev"),
-
-  "third_party/libevent":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/libevent@" + Var("o3d_code_rev"),
-
-  "third_party/makeself":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/makeself@" + Var("o3d_code_rev"),
-
-  "third_party/pdiff":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/pdiff@" + Var("o3d_code_rev"),
-
-  "third_party/scons":
-    "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/scons@" + 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":
-    Var("chromium_trunk") + "/src/third_party/harfbuzz@" + Var("chromium_rev"),
-
-  "third_party/icu":
-    Var("chromium_trunk") + "/deps/third_party/icu42@" + Var("chromium_rev"),
-
-  "third_party/libevent":
-    Var("chromium_trunk") + "/src/third_party/libevent@" + Var("chromium_rev"),
-
-  "third_party/libjpeg":
-    Var("chromium_trunk") + "/src/third_party/libjpeg@" + Var("chromium_rev"),
-
-  "third_party/libpng":
-    Var("chromium_trunk") + "/src/third_party/libpng@" + Var("chromium_rev"),
-
-  "chrome/third_party/wtl":
-    Var("chromium_trunk") + "/src/chrome/third_party/wtl@" + Var("chromium_rev"),
-
-  "third_party/zlib":
-    Var("chromium_trunk") + "/src/third_party/zlib@" + Var("chromium_rev"),
-
-  "third_party/skia":
-    "http://skia.googlecode.com/svn/trunk@" + Var("skia_rev"),
-
-  "v8":
-    "http://v8.googlecode.com/svn/trunk@" + Var("v8_rev"),
-
-  "testing":
-    Var("chromium_trunk") + "/src/testing@" + Var("chromium_rev"),
-
-  "skia":
-    Var("chromium_trunk") + "/src/skia@" + Var("chromium_rev"),
-
-  "breakpad":
-    Var("chromium_trunk") + "/src/breakpad@" + Var("chromium_rev"),
-
-  "base":
-    Var("chromium_trunk") + "/src/base@" + Var("chromium_rev"),
-
-  "native_client":
-    "http://nativeclient.googlecode.com/svn/trunk/src/native_client@" + Var("nacl_rev"),
-
-  "breakpad/src":
-    "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev"),
-
-  "testing/gtest":
-    "http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"),
-
-  "testing/gmock":
-    Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"),
-
-  # Stuff needed for GYP to run
-  "build":
-    Var("chromium_trunk") + "/src/build@" + Var("chromium_rev"),
-
-  "tools/gyp":
-    "http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"),
-}
-
-deps_os = {
-  "win": {
-    "third_party/wix_2_0_4221":
-      "http://o3d.googlecode.com/svn/trunk/googleclient/third_party/wix_2_0_4221@" + Var("o3d_code_rev"),
-
-    "third_party/cygwin":
-      "/trunk/deps/third_party/cygwin@11984",
-
-    "third_party/python_24":
-      Var("chromium_trunk") + "/deps/third_party/python_24@19441",
-  },
-  "unix": {
-    # Linux, really.
-    "site_scons":
-      Var("chromium_trunk") + "/src/site_scons@" + Var("chromium_rev"),
-    # TODO(bradnelson): make these optional!!!
-    # These are currently required by gyp on linux (even though o3d isn't using
-    # data_pack or grit).
-    "tools/grit":
-      Var("chromium_trunk") + "/src/tools/grit@" + Var("chromium_rev"),
-    "tools/data_pack":
-      Var("chromium_trunk") + "/src/tools/data_pack@" + Var("chromium_rev"),
-    "tools/xdisplaycheck":
-      Var("chromium_trunk") + "/src/tools/xdisplaycheck@" + Var("chromium_rev"),
-
-  },
-}
-
-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/o3d.gyp", "o3d/tests/lab/ChangeResolution/change_resolution.gyp"],
-  },
-]
diff --git a/o3d/base/build.scons b/o3d/base/build.scons
deleted file mode 100644
index 92f7954..0000000
--- a/o3d/base/build.scons
+++ /dev/null
@@ -1,158 +0,0 @@
-# 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.
-
-
-import socket
-import time
-
-Import('env')
-
-env.SConscript('icu38_o3d.scons', exports=['env'])
-env.ApplySConscript([
-    '$ICU38_DIR/using_icu38.scons',
-])
-
-# For FRIEND_TEST in gtest_prod.h
-env.Append(CPPPATH = '$GTEST_DIR/include')
-
-chrome_base_inputs = [
-  'at_exit',
-  'base_paths',
-  'base_switches',
-  'command_line',
-  'debug_util',
-  'dynamic_annotations',
-  'file_path',
-  'file_util',
-  'histogram',
-  'lazy_instance',
-  'lock',
-  'logging',
-  'message_loop',
-  'message_pump_default',
-  'path_service',
-  'pickle',
-  'ref_counted',
-  'stats_table',
-  'string_piece',
-  'string_util',
-  'string_util_icu',
-  'system_monitor',
-  'thread_collision_warner',
-  'third_party/dmg_fp/dtoa',
-  'third_party/dmg_fp/g_fmt',
-  'third_party/nspr/prtime',
-  'thread',
-  'tracked',
-  'tracked_objects',
-]
-
-inputs = [
-]
-
-if env.Bit('windows'):
-  env.Append(CCFLAGS=['/FIstdlib.h'])
-  chrome_base_inputs += [
-    'base_paths_win',
-    'condition_variable_win',
-    'debug_util_win',
-    'file_util_win',
-    'lock_impl_win',
-    'message_pump_win',
-    'platform_thread_win',
-    'process_util_win',
-    'registry',
-    'shared_memory_win',
-    'sys_info_win',
-    'sys_string_conversions_win',
-    'system_monitor_win',
-    'thread_local_storage_win',
-    'thread_local_win',
-    'time_win',
-    'waitable_event_win',
-    'win_util',
-  ]
-  # The following are cross-platform, but are not needed on linux or mac, and
-  # pull in more third-party dependencies on those platforms, so
-  # they are not built on all platforms currently.
-  # TODO: get the dependencies straightened out.
-  chrome_base_inputs += [
-    'cpu',
-    'time',
-    'timer',
-  ]
-
-chrome_base_inputs_posix = [
-  'atomicops_internals_x86_gcc',
-  'condition_variable_posix',
-  'debug_util_posix',
-  'file_util_posix',
-  'lock_impl_posix',
-  'message_pump_libevent',
-  'platform_thread_posix',
-  'process_util_posix',
-  'shared_memory_posix',
-  'string16',
-  'sys_info_posix',
-  'time',
-  'time_posix',
-  'thread_local_posix',
-  'thread_local_storage_posix',
-  'waitable_event_posix',
-]
-chrome_base_inputs_mm = []
-
-if env.Bit('linux'):
-  chrome_base_inputs += chrome_base_inputs_posix
-  chrome_base_inputs += [
-    'base_paths_linux',
-    'file_util_linux',
-    'message_pump_glib',
-    'process_util_linux',
-    'sys_string_conversions_linux',
-  ]
-
-if env.Bit('mac'):
-  chrome_base_inputs += chrome_base_inputs_posix
-  chrome_base_inputs_mm += [
-    'base_paths_mac',
-    'mac_util',
-    'file_util_mac',
-    'message_pump_mac',
-    'platform_thread_mac',
-    'process_util_mac',
-    'scoped_nsautorelease_pool',
-    'sys_string_conversions_mac',
-  ]
-
-inputs += env.MakeObjects(chrome_base_inputs, '$CHROME_SRC_DIR/base', 'cc')
-inputs += env.MakeObjects(chrome_base_inputs_mm, '$CHROME_SRC_DIR/base', 'mm')
-
-# Build a library called 'o3d_base' from the input sources.
-o3d_base_lib = env.ComponentLibrary('o3d_base', inputs)
diff --git a/o3d/base/icu38_o3d.scons b/o3d/base/icu38_o3d.scons
deleted file mode 100644
index f7d5a33..0000000
--- a/o3d/base/icu38_o3d.scons
+++ /dev/null
@@ -1,493 +0,0 @@
-# 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.
-
-#
-# This file is based on the icu38.scons file from the Chrome project,
-# Copyright (c) 2006-2008 The Chromium Authors.
-
-# Variables to control what does or doesn't get built here:
-#
-# CombinedLib
-#       When True, builds a combined libicu.a (or icu.lib) containing
-#       the common, i18n, stubdata and toolutil parts of ICU.  When
-#       False, builds those as separate libraries.
-#
-# GeneratedDataLib
-#       When True, specifies that we want to build a libicudata.a
-#       (or icudata.lib) library containing the data.  When False,
-#       we copy out the icudt38l.dat file or the Chromium icudt38.dll
-#       file.
-#
-# Note that we've only verified the behavior that each platform
-# needs to build the way it currently wants, so don't expect that
-# you can just change the way a given platform builds without maybe
-# having to fix things.  For example, attempts to set GenerateDataLib
-# on Windows will need to fix problems executing the utilities that
-# handle the generation.
-
-import os
-
-CombinedLib = True
-GenerateDataLib = False
-
-Import('env')
-
-env = env.Clone(
-    GENERATED_DIR = env.Dir('$ICU38_DIR/generated'),
-    GENCCODE = env.File('$ICU38_DIR/generated/genccode$PROGSUFFIX'),
-    ICUPKG = env.File('$ICU38_DIR/generated/icupkg$PROGSUFFIX'),
-)
-
-env.ApplySConscript([
-    '$CHROME_SRC_DIR/build/external_code.scons',
-])
-
-env.Prepend(
-    CPPPATH = [
-        '$ICU38_DIR/source/common',
-        '$ICU38_DIR/public/common',
-        '$ICU38_DIR/source/i18n',
-        '$ICU38_DIR/public/i18n',
-        '$ICU38_DIR/source/tools/toolutil',
-    ],
-    CPPDEFINES = [
-        'U_STATIC_IMPLEMENTATION',
-    ],
-)
-
-if env.Bit('mac'):
-  env.FilterOut(CCFLAGS=['-Werror'],
-                CPPDEFINES=['DEBUG'])
-  env['GENCCODE_NAME'] = 'icudt38l'
-  env['GENCCODE_FLAGS'] = '-a gcc-darwin -n $GENCCODE_NAME -e icudt38'
-  env['GENCCODE_SUFFIX'] = '.s'
-
-if env.Bit('linux'):
-  env['GENCCODE_NAME'] = 'icudt38l'
-  env['GENCCODE_FLAGS'] = '-a gcc -n $GENCCODE_NAME -e icudt38'
-  env['GENCCODE_SUFFIX'] = '.s'
-
-if env.Bit('windows'):
-  env['GENCCODE_NAME'] = 'icudt38'
-  env['GENCCODE_FLAGS'] = '-e icudt38'
-  env['GENCCODE_SUFFIX'] = '.c'
-
-if env.Bit('windows'):
-  # /Wd4996 to silence warning about strncpy
-  env.Append(CCFLAGS = ['/WX', '/wd4996'])
-else:
-  env.Append(
-      CCFLAGS = [
-          # TODO: fix ICU to not depend on this flag.
-          '-fno-strict-aliasing',
-
-          '-Wno-parentheses',
-
-          # See uprv_UnicodeStringDummy at end of source/common/unistr.cpp.
-          '-Wno-unused-function',
-      ]
-  )
-
-if 'WIN32_LEAN_AND_MEAN' in env['CPPDEFINES']:
-  env['CPPDEFINES'].remove('WIN32_LEAN_AND_MEAN')
-
-common_input_files = [
-    'source/common/bmpset.cpp',
-    'source/common/brkeng.cpp',
-    'source/common/brkiter.cpp',
-    'source/common/caniter.cpp',
-    'source/common/chariter.cpp',
-    'source/common/cmemory.c',
-    'source/common/cstring.c',
-    'source/common/cwchar.c',
-    'source/common/dictbe.cpp',
-    'source/common/locbased.cpp',
-    'source/common/locid.cpp',
-    'source/common/locmap.c',
-    'source/common/locutil.cpp',
-    'source/common/normlzr.cpp',
-    'source/common/parsepos.cpp',
-    'source/common/propname.cpp',
-    'source/common/punycode.c',
-    'source/common/putil.c',
-    'source/common/rbbi.cpp',
-    'source/common/rbbidata.cpp',
-    'source/common/rbbinode.cpp',
-    'source/common/rbbirb.cpp',
-    'source/common/rbbiscan.cpp',
-    'source/common/rbbisetb.cpp',
-    'source/common/rbbistbl.cpp',
-    'source/common/rbbitblb.cpp',
-    'source/common/resbund.cpp',
-    'source/common/resbund_cnv.cpp',
-    'source/common/ruleiter.cpp',
-    'source/common/schriter.cpp',
-    'source/common/serv.cpp',
-    'source/common/servlk.cpp',
-    'source/common/servlkf.cpp',
-    'source/common/servls.cpp',
-    'source/common/servnotf.cpp',
-    'source/common/servrbf.cpp',
-    'source/common/servslkf.cpp',
-    'source/common/triedict.cpp',
-    'source/common/uarrsort.c',
-    'source/common/ubidi.c',
-    'source/common/ubidi_props.c',
-    'source/common/ubidiln.c',
-    'source/common/ubidiwrt.c',
-    'source/common/ubrk.cpp',
-    'source/common/ucase.c',
-    'source/common/ucasemap.c',
-    'source/common/ucat.c',
-    'source/common/uchar.c',
-    'source/common/uchriter.cpp',
-    'source/common/ucln_cmn.c',
-    'source/common/ucmndata.c',
-    'source/common/ucnv.c',
-    'source/common/ucnv_bld.c',
-    'source/common/ucnv_cb.c',
-    'source/common/ucnv_cnv.c',
-    'source/common/ucnv_err.c',
-    'source/common/ucnv_ext.c',
-    'source/common/ucnv_io.c',
-    'source/common/ucnv_lmb.c',
-    'source/common/ucnv_set.c',
-    'source/common/ucnv_u16.c',
-    'source/common/ucnv_u32.c',
-    'source/common/ucnv_u7.c',
-    'source/common/ucnv_u8.c',
-    'source/common/ucnv2022.c',
-    'source/common/ucnvbocu.c',
-    'source/common/ucnvdisp.c',
-    'source/common/ucnvhz.c',
-    'source/common/ucnvisci.c',
-    'source/common/ucnvlat1.c',
-    'source/common/ucnvmbcs.c',
-    'source/common/ucnvscsu.c',
-    'source/common/ucol_swp.c',
-    'source/common/udata.c',
-    'source/common/udatamem.c',
-    'source/common/udataswp.c',
-    'source/common/uenum.c',
-    'source/common/uhash.c',
-    'source/common/uhash_us.cpp',
-    'source/common/uidna.cpp',
-    'source/common/uinit.c',
-    'source/common/uinvchar.c',
-    'source/common/uiter.cpp',
-    'source/common/uloc.c',
-    'source/common/umapfile.c',
-    'source/common/umath.c',
-    'source/common/umutex.c',
-    'source/common/unames.c',
-    'source/common/unifilt.cpp',
-    'source/common/unifunct.cpp',
-    'source/common/uniset.cpp',
-    'source/common/uniset_props.cpp',
-    'source/common/unisetspan.cpp',
-    'source/common/unistr.cpp',
-    'source/common/unistr_case.cpp',
-    'source/common/unistr_cnv.cpp',
-    'source/common/unistr_props.cpp',
-    'source/common/unorm.cpp',
-    'source/common/unorm_it.c',
-    'source/common/unormcmp.cpp',
-    'source/common/uobject.cpp',
-    'source/common/uprops.c',
-    'source/common/ures_cnv.c',
-    'source/common/uresbund.c',
-    'source/common/uresdata.c',
-    'source/common/usc_impl.c',
-    'source/common/uscript.c',
-    'source/common/uset.cpp',
-    'source/common/uset_props.cpp',
-    'source/common/usetiter.cpp',
-    'source/common/ushape.c',
-    'source/common/usprep.cpp',
-    'source/common/ustack.cpp',
-    'source/common/ustr_cnv.c',
-    'source/common/ustr_wcs.c',
-    'source/common/ustrcase.c',
-    'source/common/ustrenum.cpp',
-    'source/common/ustrfmt.c',
-    'source/common/ustring.c',
-    'source/common/ustrtrns.c',
-    'source/common/utext.cpp',
-    'source/common/utf_impl.c',
-    'source/common/util.cpp',
-    'source/common/util_props.cpp',
-    'source/common/utrace.c',
-    'source/common/utrie.c',
-    'source/common/utypes.c',
-    'source/common/uvector.cpp',
-    'source/common/uvectr32.cpp',
-    'source/common/wintz.c',
-]
-
-i18n_input_files = [
-    'source/i18n/anytrans.cpp',
-    'source/i18n/astro.cpp',
-    'source/i18n/basictz.cpp',
-    'source/i18n/bocsu.c',
-    'source/i18n/buddhcal.cpp',
-    'source/i18n/calendar.cpp',
-    'source/i18n/casetrn.cpp',
-    'source/i18n/choicfmt.cpp',
-    'source/i18n/coleitr.cpp',
-    'source/i18n/coll.cpp',
-    'source/i18n/cpdtrans.cpp',
-    'source/i18n/csdetect.cpp',
-    'source/i18n/csmatch.cpp',
-    'source/i18n/csr2022.cpp',
-    'source/i18n/csrecog.cpp',
-    'source/i18n/csrmbcs.cpp',
-    'source/i18n/csrsbcs.cpp',
-    'source/i18n/csrucode.cpp',
-    'source/i18n/csrutf8.cpp',
-    'source/i18n/curramt.cpp',
-    'source/i18n/currfmt.cpp',
-    'source/i18n/currunit.cpp',
-    'source/i18n/datefmt.cpp',
-    'source/i18n/dcfmtsym.cpp',
-    'source/i18n/decimfmt.cpp',
-    'source/i18n/digitlst.cpp',
-    'source/i18n/dtfmtsym.cpp',
-    'source/i18n/dtrule.cpp',
-    'source/i18n/esctrn.cpp',
-    'source/i18n/fmtable.cpp',
-    'source/i18n/fmtable_cnv.cpp',
-    'source/i18n/format.cpp',
-    'source/i18n/funcrepl.cpp',
-    'source/i18n/gregocal.cpp',
-    'source/i18n/gregoimp.cpp',
-    'source/i18n/hebrwcal.cpp',
-    'source/i18n/indiancal.cpp',
-    'source/i18n/inputext.cpp',
-    'source/i18n/islamcal.cpp',
-    'source/i18n/japancal.cpp',
-    'source/i18n/measfmt.cpp',
-    'source/i18n/measure.cpp',
-    'source/i18n/msgfmt.cpp',
-    'source/i18n/name2uni.cpp',
-    'source/i18n/nfrs.cpp',
-    'source/i18n/nfrule.cpp',
-    'source/i18n/nfsubs.cpp',
-    'source/i18n/nortrans.cpp',
-    'source/i18n/nultrans.cpp',
-    'source/i18n/numfmt.cpp',
-    'source/i18n/olsontz.cpp',
-    'source/i18n/persncal.cpp',
-    'source/i18n/plurfmt.cpp',
-    'source/i18n/plurrule.cpp',
-    'source/i18n/quant.cpp',
-    'source/i18n/rbnf.cpp',
-    'source/i18n/rbt.cpp',
-    'source/i18n/rbt_data.cpp',
-    'source/i18n/rbt_pars.cpp',
-    'source/i18n/rbt_rule.cpp',
-    'source/i18n/rbt_set.cpp',
-    'source/i18n/rbtz.cpp',
-    'source/i18n/regexcmp.cpp',
-    'source/i18n/regexst.cpp',
-    'source/i18n/reldtfmt.cpp',
-    'source/i18n/rematch.cpp',
-    'source/i18n/remtrans.cpp',
-    'source/i18n/repattrn.cpp',
-    'source/i18n/search.cpp',
-    'source/i18n/simpletz.cpp',
-    'source/i18n/smpdtfmt.cpp',
-    'source/i18n/sortkey.cpp',
-    'source/i18n/strmatch.cpp',
-    'source/i18n/strrepl.cpp',
-    'source/i18n/stsearch.cpp',
-    'source/i18n/taiwncal.cpp',
-    'source/i18n/tblcoll.cpp',
-    'source/i18n/timezone.cpp',
-    'source/i18n/titletrn.cpp',
-    'source/i18n/tolowtrn.cpp',
-    'source/i18n/toupptrn.cpp',
-    'source/i18n/translit.cpp',
-    'source/i18n/transreg.cpp',
-    'source/i18n/tridpars.cpp',
-    'source/i18n/tzrule.cpp',
-    'source/i18n/tztrans.cpp',
-    'source/i18n/ucal.cpp',
-    'source/i18n/ucln_in.c',
-    'source/i18n/ucol.cpp',
-    'source/i18n/ucol_bld.cpp',
-    'source/i18n/ucol_cnt.cpp',
-    'source/i18n/ucol_elm.cpp',
-    'source/i18n/ucol_res.cpp',
-    'source/i18n/ucol_sit.cpp',
-    'source/i18n/ucol_tok.cpp',
-    'source/i18n/ucol_wgt.c',
-    'source/i18n/ucoleitr.cpp',
-    'source/i18n/ucsdet.cpp',
-    'source/i18n/ucurr.cpp',
-    'source/i18n/udat.cpp',
-    'source/i18n/ulocdata.c',
-    'source/i18n/umsg.cpp',
-    'source/i18n/unesctrn.cpp',
-    'source/i18n/uni2name.cpp',
-    'source/i18n/unum.cpp',
-    'source/i18n/uregex.cpp',
-    'source/i18n/uregexc.cpp',
-    'source/i18n/usearch.cpp',
-    'source/i18n/utmscale.c',
-    'source/i18n/utrans.cpp',
-    'source/i18n/vtzone.cpp',
-    'source/i18n/windtfmt.cpp',
-    'source/i18n/winnmfmt.cpp',
-]
-
-stubdata_input_files = [
-    'source/stubdata/stubdata.c',
-]
-
-toolutil_input_files = [
-    'source/tools/toolutil/filestrm.c',
-    'source/tools/toolutil/package.cpp',
-    'source/tools/toolutil/pkgitems.cpp',
-    'source/tools/toolutil/propsvec.c',
-    'source/tools/toolutil/swapimpl.cpp',
-    'source/tools/toolutil/toolutil.c',
-    'source/tools/toolutil/toolutil.vcproj',
-    'source/tools/toolutil/ucbuf.c',
-    'source/tools/toolutil/ucm.c',
-    'source/tools/toolutil/ucmstate.c',
-    'source/tools/toolutil/unewdata.c',
-    'source/tools/toolutil/uoptions.c',
-    'source/tools/toolutil/uparse.c',
-    'source/tools/toolutil/writesrc.c',
-    'source/tools/toolutil/xmlparser.cpp',
-]
-
-def MakeObject(env, source, extra_defines):
-  base, ext = os.path.splitext(source)
-  return env.ComponentObject(base, '$ICU38_DIR/' + source,
-                             CPPDEFINES = env['CPPDEFINES'] + extra_defines)
-
-
-
-if CombinedLib:
-
-  if env.Bit('linux'):
-    # U_STATIC_IMPLEMENTATION gets overridden by U_COMBINED_IMPLEMENTATION,
-    # which on linux causes all the symbols to be exported from the shared
-    # library, conflicting with the browser's definition if it uses icu as well
-    # (e.g.  Chrome).
-    combined_flag = []
-  else:
-    combined_flag = ['U_COMBINED_IMPLEMENTATION']
-  # These empirically fail to build when U_COMMON_IMPLEMENTATION
-  # isn't defined in addition to U_COMBINED_IMPLEMENTATION.  Remove
-  # them from the source file list and re-append them with Nodes
-  # for custom-built object files with both defined.
-
-  need_common_implementation = [
-      'source/common/ubidi.c',
-      'source/common/ubidiln.c',
-  ]
-
-  objects = []
-  for n in need_common_implementation:
-    common_input_files.remove(n)
-    o = MakeObject(env, n, ['U_COMMON_IMPLEMENTATION'] + combined_flag)
-    objects.append(o)
-
-  sources = common_input_files + i18n_input_files + stubdata_input_files
-  objects += [MakeObject(env, n, combined_flag) for n in sources]
-
-  icu_lib = env.ComponentLibrary('icu', objects);
-
-else:
-
-  common_objects = [MakeObject(env, n, ['U_COMMON_IMPLEMENTATION'])
-                    for n in common_input_files]
-  icu_lib = env.ComponentLibrary('icuuc', common_objects)
-
-  i18n_objects = [MakeObject(env, n, ['U_I18N_IMPLEMENTATION'])
-                  for n in i18n_input_files]
-  env.ComponentLibrary('icui18n', i18n_objects)
-
-  stubdata_objects = [MakeObject(env, n, []) for n in stubdata_input_files]
-  env.ComponentLibrary('icudata_stub', stubdata_objects)
-
-  toolutil_objects = [MakeObject(env, n, ['U_TOOLUTIL_IMPLEMENTATION'])
-                      for n in toolutil_input_files]
-
-  env.ComponentLibrary('icutu', toolutil_objects)
-
-
-if GenerateDataLib:
-
-  icudata_lst = env.Command(['$GENERATED_DIR/icudata.lst',
-                             '$GENERATED_DIR/icudt38l/ucadata.icu'],
-                            ['source/data/in/icudt38l.dat'],
-                            ('$ICUPKG -d ${TARGETS[1].dir} --list -x "*"'
-                             ' $SOURCE > $TARGET'))
-  env.Depends(icudata_lst, '$ICUPKG')
-
-  icudt38_dat = env.Command(['$GENERATED_DIR/${GENCCODE_NAME}.dat'],
-                            icudata_lst,
-                            ('$ICUPKG -tl -c -s ${SOURCES[1].dir}'
-                             ' -a $SOURCE new $TARGET'))
-  env.Depends(icudt38_dat, '$ICUPKG')
-
-  icudt38_src = env.Command(
-      '$GENERATED_DIR/${GENCCODE_NAME}_dat${GENCCODE_SUFFIX}',
-      icudt38_dat,
-      '$GENCCODE $GENCCODE_FLAGS -d ${TARGET.dir} $SOURCE')
-  env.Depends(icudt38_src, '$GENCCODE')
-
-  icu_data = env.ComponentLibrary('icudata', icudt38_src)
-
-  if CombinedLib:
-    lib_list = ['icu']
-  else:
-    lib_list = ['icui18n', 'icutu', 'icuuc', 'icudata_stub']
-
-  env_tools = env.Clone(LIBS = lib_list)
-
-  env_tools.Program(env['GENCCODE'],
-                    '$ICU38_DIR/source/tools/genccode/genccode.c')
-  env_tools.Program(env['ICUPKG'], '$ICU38_DIR/source/tools/icupkg/icupkg.cpp')
-
-else:
-
-  icu_data = None
-
-  # The ICU library isn't useful without the data properly installed.
-  if env.Bit('windows'):
-    icu_data = env.Replicate('$ARTIFACTS_DIR', 'icudt38.dll')
-  else:
-    icu_data = env.Replicate('$ARTIFACTS_DIR',
-                             '$ICU38_DIR/source/data/in/icudt38l.dat')
-
-  env.Requires(icu_lib, icu_data)
diff --git a/o3d/bitmap/build.scons b/o3d/bitmap/build.scons
deleted file mode 100644
index 7da781b..0000000
--- a/o3d/bitmap/build.scons
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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.
-
-
-# Import the build environment that was decided in the project SConstruct.
-# This may be the Debug or Optimized environment
-import os.path;
-
-Import('env')
-
-env.Append(CPPPATH = env['RENDERER_INCLUDE_PATH'])
-
-# Create the PNG library -------------------------------------------------------
-env_png = env.Clone()
-png_sources = [
-    'png',
-    'pngerror',
-    'pnggccrd',
-    'pngget',
-    'pngmem',
-    'pngpread',
-    'pngread',
-    'pngrio',
-    'pngrtran',
-    'pngrutil',
-    'pngset',
-    'pngtrans',
-    'pngvcrd',
-    'pngwio',
-    'pngwrite',
-    'pngwtran',
-    'pngwutil',
-]
-
-if env.Bit('windows'):
-  env_png.Append(
-      CCFLAGS = [
-          '/wd4267',  # disable warning about implicit size_t conversions
-          '/wd4996',  # disable warning about unsafe string functions
-      ],
-  )
-
-png_objects = env_png.MakeObjects(png_sources, '$PNG_DIR', 'c')
-png_lib = env_png.ComponentLibrary('libpng', png_objects)
-
-
-# Create the JPEG library ------------------------------------------------------
-env_jpeg = env.Clone()
-jpeg_sources = [
-    'jcapimin',
-    'jcapistd',
-    'jccoefct',
-    'jccolor',
-    'jcdctmgr',
-    'jchuff',
-    'jcinit',
-    'jcmainct',
-    'jcmarker',
-    'jcmaster',
-    'jcomapi',
-    'jcparam',
-    'jcphuff',
-    'jcprepct',
-    'jcsample',
-    'jctrans',
-    'jdapimin',
-    'jdapistd',
-    'jdatadst',
-    'jdatasrc',
-    'jdcoefct',
-    'jdcolor',
-    'jddctmgr',
-    'jdhuff',
-    'jdinput',
-    'jdmainct',
-    'jdmarker',
-    'jdmaster',
-    'jdmerge',
-    'jdphuff',
-    'jdpostct',
-    'jdsample',
-    'jdtrans',
-    'jerror',
-    'jfdctflt',
-    'jfdctfst',
-    'jfdctint',
-    'jidctflt',
-    'jidctfst',
-    'jidctint',
-    'jidctred',
-    'jmemmgr',
-    'jmemnobs',
-    'jquant1',
-    'jquant2',
-    'jutils',
-]
-
-if env.Bit('windows'):
-  env_jpeg.Append(
-      CCFLAGS = [
-          '/TC',  # compile as C, not C++
-          '/wd4267',  # disable warning about implicit size_t conversions
-          '/wd4996',  # disable warning about unsafe string functions
-      ],
-      CPPDEFINES = ['_CRT_SECURE_NO_DEPRECATE'],
-  )
-
-jpeg_objects = env_jpeg.MakeObjects(jpeg_sources, '$JPEG_DIR', 'c')
-jpeg_lib = env_jpeg.ComponentLibrary('libjpeg', jpeg_objects)
-
-minizip_inputs = [
-  'ioapi',
-  'mztools',
-  'unzip',
-  'zip',
-]
-minizip_objects = env.MakeObjects(minizip_inputs,
-                                  '$ZLIB_DIR/contrib/minizip',
-                                  'c')
-
-zlib_inputs = [
-  'adler32',
-  'compress',
-  'crc32',
-  'deflate',
-  'gzio',
-  'infback',
-  'inffast',
-  'inflate',
-  'inftrees',
-  'trees',
-  'uncompr',
-  'zutil',
-]
-zlib_objects = env.MakeObjects(zlib_inputs, '$ZLIB_DIR', 'c')
-
-zlib_lib = env.ComponentLibrary('zlib', zlib_objects + minizip_objects)
diff --git a/o3d/breakpad/build.scons b/o3d/breakpad/build.scons
deleted file mode 100644
index 235bfdc..0000000
--- a/o3d/breakpad/build.scons
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.
-
-
-# Import the build environment that was decided in the project SConstruct.
-# This may be the Debug or Optimized environment
-Import('env')
-
-env.Append(
-    CPPPATH = [
-        '$BREAKPAD_DIR',
-    ],
-)
-# Create a list of the files used to build the target library.
-library_inputs = [
-    'win/exception_handler_win32.cc',
-    'win/breakpad_config.cc',
-    'win/bluescreen_detector.cc',
-]
-
-library_breakpad_inputs = [
-    'client/windows/handler/exception_handler',
-    'client/windows/crash_generation/crash_generation_client',
-    'common/windows/guid_string',
-    'common/windows/http_upload',
-    'common/windows/string_utils',
-]
-library_breakpad_objects = env.MakeObjects(library_breakpad_inputs,
-                                           '$BREAKPAD_DIR',
-                                           'cc')
-
-# Create a target library from the sources called 'o3dBreakpad'
-env.ComponentLibrary('o3dBreakpad', library_inputs + library_breakpad_objects)
-
-# Create a list of the files used to build 'reporter.exe'.
-reporter_inputs = [
-    'win/crash_sender_win32.cc',
-]
-reporter_breakpad_inputs = [
-    'client/windows/sender/crash_report_sender',
-]
-reporter_breakpad_objects = env.MakeObjects(reporter_breakpad_inputs,
-                                            '$BREAKPAD_DIR',
-                                            'cc')
-
-env.Append(
-    LIBS = [
-        'AdvAPI32',
-        'WinInet',
-        'shlwapi',
-        'o3dBreakpad',
-    ],
-)
-
-# Create the breakpad 'reporter.exe' tool for uploading crash reports
-reporter = env.ComponentProgram('reporter',
-                                reporter_inputs + reporter_breakpad_objects)
-
-# Copy the resulting executable to the Artifacts directory.
-env.Replicate('$ARTIFACTS_DIR', reporter)
diff --git a/o3d/compiler/antlr/build.scons b/o3d/compiler/antlr/build.scons
deleted file mode 100644
index a6d7df5..0000000
--- a/o3d/compiler/antlr/build.scons
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.
-
-
-Import('env')
-
-env.Append(CPPPATH = env['RENDERER_INCLUDE_PATH'] + ['$ANTLRLIBC_DIR/include'])
-
-if env.Bit('windows'):
-  # force these files to be compiled as C
-  env.Append(CCFLAGS = ['/TC'])
-
-# Create the Antlr C Runtime library -------------------------------------------
-antlr_sources = [
-    'antlr3baserecognizer',
-    'antlr3basetree',
-    'antlr3basetreeadaptor',
-    'antlr3bitset',
-    'antlr3collections',
-    'antlr3commontoken',
-    'antlr3commontree',
-    'antlr3commontreeadaptor',
-    'antlr3commontreenodestream',
-    'antlr3convertutf',
-    'antlr3cyclicdfa',
-    'antlr3debughandlers',
-    'antlr3encodings',
-    'antlr3exception',
-    'antlr3filestream',
-    'antlr3inputstream',
-    'antlr3intstream',
-    'antlr3lexer',
-    'antlr3parser',
-    'antlr3rewritestreams',
-    'antlr3string',
-    'antlr3stringstream',
-    'antlr3tokenstream',
-    'antlr3treeparser',
-    'antlr3ucs2inputstream',
-]
-antlr_objects = env.MakeObjects(antlr_sources, '$ANTLRLIBC_DIR/src', 'c')
-
-antlr_lib = env.ComponentLibrary('antlr3c', antlr_objects)
diff --git a/o3d/compiler/puritan/build.scons b/o3d/compiler/puritan/build.scons
deleted file mode 100644
index 7c59d0d..0000000
--- a/o3d/compiler/puritan/build.scons
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.
-
-
-# Import the build environment that was decided in the project SConstruct.
-# This may be the Debug or Optimized environment
-Import('env')
-
-# Create a list of the files used to build the target library.
-inputs = [
-'exp_gen.cc',
-'knobs.cc',
-'puritan.cc',
-'puritan_assert.cc',
-'rand.cc',
-'structure_gen.cc',
-'test_gen.cc',
-'main.cc',
-]
-
-libraries = []
-
-# On Windows link with ADVAPI32 to get better RNG.
-if env.Bit('windows'):
-    libraries += ['advapi32.lib']
-
-# Create the puritan tool for generating random HLSL shaders
-puritan = env.Program('puritan', inputs, LIBS=libraries)
-puritan_install = env.Replicate('$ARTIFACTS_DIR', puritan)
-
-env.Alias('puritan', puritan_install)
diff --git a/o3d/compiler/technique/build.scons b/o3d/compiler/technique/build.scons
deleted file mode 100644
index 384c2c4..0000000
--- a/o3d/compiler/technique/build.scons
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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.
-
-
-import os.path
-
-Import('env')
-
-env.Append(
-    CPPPATH = [
-      # Include path for generated headers.
-      env.Dir('$OBJ_ROOT/compiler/technique'),
-      # Include path for Antlr C runtime headers.
-      env.Dir('$ANTLRLIBC_DIR/include'),
-    ],
-    LIBPATH = [
-        env.Dir('$ANTLRLIBC_DIR/lib'),
-    ],
-    LIBS = [
-        'antlr3c',
-    ],
-)
-
-# Define a builder for Antlr grammars.
-def TechniqueEmitter(target, source, env):
-  # TODO this path operation is horrible, please make '.base' work
-  base_name = os.path.splitext(source[0].abspath)[0]
-  generated_targets = [env.File(base_name + 'Lexer.c'),
-                       env.File(base_name + 'Lexer.h'),
-                       env.File(base_name + 'Parser.c'),
-                       env.File(base_name + 'Parser.h'), ]
-  return generated_targets, source
-
-if env.Bit('windows'):
-  env.Append(
-    CCFLAGS=['/Wp64', '/TP'],
-  )
-else:
-  env.Append(
-    CCFLAGS = ['-x', 'c++'],
-  )
-
-# To enable ANTLRworks debugging, replace
-#   org.antlr.Tool $SOURCE
-# below, with
-#   org.antlr.Tool -debug $SOURCE
-
-env['BUILDERS']['Antlr'] = Builder(
-    action = ' '.join([
-      '$JAVA_EXE',
-      '-cp $ANTLR_DIR/antlr-3.1.1.jar',
-      'org.antlr.Tool $SOURCE',
-      '-fo $TARGET.dir']),
-    emitter = TechniqueEmitter)
-
-# Generate the parser and lexer files
-antlr_output_files = env.Antlr( env.File('Technique.g3pl') )
-# filter out only the C files from the generated files.
-antlr_c_files = [f for f in antlr_output_files if f.suffix == '.c']
-
-# Compile the resulting C and C++ files as C++ to build a library
-inputs = [
-    antlr_c_files,
-    'technique_error.cc',
-    'technique_parser.cc',
-    'technique_structures.cc',
-]
-env.ComponentLibrary('technique', inputs)
diff --git a/o3d/converter/build.scons b/o3d/converter/build.scons
deleted file mode 100644
index fd0d8c7..0000000
--- a/o3d/converter/build.scons
+++ /dev/null
@@ -1,187 +0,0 @@
-# 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.
-
-
-Import('env')
-
-env.Append(
-  LIBPATH = [
-    '$NACL_LIB_DIR',
-    '$ANTLRLIBC_DIR/lib',
-    '$OBJ_ROOT/compiler/technique',
-    '$OBJ_ROOT/compiler/antlr',
-    '$CG_DIR/lib',
-  ],
-  LIBS = [
-    'o3dConvert',
-    'o3dCore',
-    'o3dArchive',
-    'o3dImport',
-    'o3dImportConditioner',
-    'o3dCorePlatform',
-    'o3dSerializer',
-    'o3dSerializationObjects',
-    'o3dCore', # Archive and Core are mutually dependent so Core appears twice.
-    'o3dUtils',
-    'o3d_base',
-    'FColladaU',
-    'technique',
-    'antlr3c',
-    'google_nacl_imc',
-    'skia',
-  ] + env['ICU_LIBS'],
-)
-
-# add renderer specific libraries and includes to the linker environment
-env.Append(CPPPATH = env['RENDERER_INCLUDE_PATH'],
-           LIBPATH = env['RENDERER_LIB_PATH'],
-           LIBS = env['RENDERER_LIBS'])
-
-if env.Bit('windows'):
-  env.Append(
-    CCFLAGS=['/Wp64', '/D_CRT_SECURE_NO_WARNINGS'],
-    LINKFLAGS=['/SUBSYSTEM:CONSOLE'],
-    LIBS = [
-      'cg',
-      'cgGL',
-      'd3dx9',
-      'ole32',
-    ],
-  )
-
-if env.Bit('mac'):
-  env.Append(
-    LINKFLAGS = ['-F$CG_DIR'],
-    FRAMEWORKS = [
-      'ApplicationServices',
-      'Cg',
-      'Cocoa',
-      'Foundation',
-      'OpenGL',
-    ],
-    LIBS = [
-      'event',
-    ],
-  )
-
-if env.Bit('linux'):
-  env.Append(
-    LIBS = [
-      'event',
-    ],
-  )
-
-inputs = [
-  'cross/converter.cc',
-  'cross/renderer_stub.cc',
-  'cross/buffer_stub.cc',
-  'cross/texture_stub.cc',
-  ]
-
-# Create converter library.
-lib = env.ComponentLibrary('o3dConvert', inputs)
-
-# Create a target executable program called 'o3dConverter'
-if env.Bit('mac'):
-  exe = env.ComponentProgram('o3dConverter',
-                             ['mac/converter_main.mm',
-                              'cross/converter_main.cc',
-                              ])
-  # Fix executable to look for Cg.framework in the appropriate place.
-  exe_fix = env.Command('$ARTIFACTS_DIR/converter/fixed_exe.stamp',
-                        [exe], [
-    '/usr/bin/install_name_tool'
-    ' -change '
-    '@executable_path/../Library/Frameworks/Cg.framework/Cg '
-    '@executable_path/Frameworks/Cg.framework/Cg '
-    "$SOURCE",
-    'touch $TARGET',
-    ])
-  # Copy the resulting executable to the Artifacts directory.
-  exe_install = env.Replicate('$ARTIFACTS_DIR/converter', [exe])
-  env.Depends(exe_install, exe_fix)
-else:
-  exe = env.ComponentProgram('o3dConverter', ['cross/converter_main.cc'])
-  # Copy the resulting executable to the Artifacts directory.
-  exe_install = env.Replicate('$ARTIFACTS_DIR', [exe])
-
-# Create a target executable program called 'o3dVerifier'
-if env.Bit('mac'):
-  verifier_exe = env.ComponentProgram('o3dVerifier',
-                             ['mac/converter_main.mm',
-                              'cross/verifier_main.cc',
-                              ])
-  # Copy the resulting executable to the Artifacts directory.
-  verifier_exe_install = env.Replicate('$ARTIFACTS_DIR/converter',
-                                       [verifier_exe])
-  verifier_exe_fix = env.Command('$ARTIFACTS_DIR/converter/verifier_exe.stamp',
-                                 [verifier_exe_install], [
-    '/usr/bin/install_name_tool'
-    ' -change '
-    '@executable_path/../Library/Frameworks/Cg.framework/Cg '
-    '@executable_path/Frameworks/Cg.framework/Cg '
-    "$SOURCE",
-    'touch $TARGET',
-    ])
-else:
-  verifier_exe = env.ComponentProgram('o3dVerifier', ['cross/verifier_main.cc'])
-  # Copy the resulting executable to the Artifacts directory.
-  verifier_exe_install = env.Replicate('$ARTIFACTS_DIR', [verifier_exe])
-
-# Put the Cg DLL's, cgc and the d3dx9 DLL there as well.
-if env.Bit('windows'):
-  env.Requires(exe_install, env.Replicate(
-    '$ARTIFACTS_DIR', [
-    '$CG_DIR/bin/cgc.exe',
-    '$CG_DIR/bin/cg.dll',
-    '$CG_DIR/bin/cgGL.dll',
-  ]))
-
-if env.Bit('mac'):
-  env.Requires(
-      exe_install,
-      env.Command(env.Dir('$ARTIFACTS_DIR/converter/Frameworks'),
-                  env.Dir("$CG_DIR/Cg.framework"),
-                  [ # Copy in a Cg framework for the converter to use.
-                   'ditto --arch i386 "$CG_DIR/Cg.framework" '
-                   '"$ARTIFACTS_DIR/converter/Frameworks/Cg.framework"',
-                   ]))
-  env.Requires(exe_install, env.Replicate(
-    '$ARTIFACTS_DIR/converter', [
-    '$CG_DIR/bin/cgc',
-  ]))
-
-if env.Bit('linux'):
-  env.Requires(exe_install, env.Replicate(
-    '$ARTIFACTS_DIR', [
-    '$CG_DIR/bin/cgc',
-    '$CG_DIR/lib/libCg.so',
-    '$CG_DIR/lib/libCgGL.so',
-    '$GLEW_DIR/lib/libGLEW.so.1.5',
-  ]))
diff --git a/o3d/converter_edge/build.scons b/o3d/converter_edge/build.scons
deleted file mode 100644
index 283502b..0000000
--- a/o3d/converter_edge/build.scons
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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.
-
-
-Import('env')
-
-env.Append(
-  LIBPATH = [
-    '$NACL_LIB_DIR',
-    '$ANTLRLIBC_DIR/lib',
-    '$OBJ_ROOT/compiler/technique',
-    '$OBJ_ROOT/compiler/antlr',
-    '$CG_DIR/lib',
-  ],
-  LIBS = [
-    'o3dConvertEdge',
-    'o3dCore',
-    'o3dArchive',
-    'o3dImport',
-    'o3dImportConditioner',
-    'o3dCorePlatform',
-    'o3dSerializer',
-    'o3dSerializationObjects',
-    'o3dUtils',
-    'o3d_base',
-    'FColladaU',
-    'technique',
-    'antlr3c',
-    'google_nacl_imc',
-    'skia',
-  ] + env['ICU_LIBS'],
-)
-
-# add renderer specific libraries and includes to the linker environment
-env.Append(CPPPATH = env['RENDERER_INCLUDE_PATH'],
-           LIBPATH = env['RENDERER_LIB_PATH'],
-           LIBS = env['RENDERER_LIBS'])
-
-if env.Bit('windows'):
-  env.Append(
-    CCFLAGS=['/Wp64', '/D_CRT_SECURE_NO_WARNINGS'],
-    LINKFLAGS=['/SUBSYSTEM:CONSOLE'],
-    LIBS = [
-      'cg',
-      'cgGL',
-      'd3dx9',
-      'ole32',
-    ],
-  )
-
-if env.Bit('mac'):
-  env.Append(
-    LINKFLAGS = ['-F$CG_DIR'],
-    FRAMEWORKS = [
-      'ApplicationServices',
-      'Cg',
-      'Foundation',
-      'OpenGL',
-     ],
-  )
-
-inputs = [
-  'cross/converter.cc',
-  'cross/renderer_stub.cc',
-  'cross/buffer_stub.cc',
-  'cross/texture_stub.cc',
-  ]
-
-# Create converter library.
-lib = env.ComponentLibrary('o3dConvertEdge', inputs)
-
-# Create a target executable program called 'o3dConverterEdge'
-if env.Bit('mac'):
-  exe = env.ComponentProgram('o3dConverterEdge',
-                             ['mac/converter_main.mm',
-                              'cross/converter_main.cc',
-                              ])
-  # Fix executable to look for Cg.framework in the appropriate place.
-  exe_fix = env.Command('$ARTIFACTS_DIR/converter/fixed_exe.stamp',
-                        [exe], [
-    '/usr/bin/install_name_tool'
-    ' -change '
-    '@executable_path/../Library/Frameworks/Cg.framework/Cg '
-    '@executable_path/Frameworks/Cg.framework/Cg '
-    "$SOURCE",
-    'touch $TARGET',
-    ])
-  # Copy the resulting executable to the Artifacts directory.
-  exe_install = env.Replicate('$ARTIFACTS_DIR/converter', [exe])
-  env.Depends(exe_install, exe_fix)
-else:
-  exe = env.ComponentProgram('o3dConverterEdge', ['cross/converter_main.cc'])
-  # Copy the resulting executable to the Artifacts directory.
-  exe_install = env.Replicate('$ARTIFACTS_DIR', [exe])
-  
-# Put the Cg DLL's, cgc and the d3dx9 DLL there as well.
-if env.Bit('windows'):
-  env.Requires(exe_install, env.Replicate(
-    '$ARTIFACTS_DIR', [
-    '$CG_DIR/bin/cgc.exe',
-    '$CG_DIR/bin/cg.dll',
-    '$CG_DIR/bin/cgGL.dll',
-  ]))
-
-if env.Bit('mac'):
-  env.Requires(
-      exe_install,
-      env.Command(env.Dir('$ARTIFACTS_DIR/converter/Frameworks'),
-                  env.Dir("$CG_DIR/Cg.framework"),
-                  [ # Copy in a Cg framework for the converter to use.
-                   'ditto --arch i386 "$CG_DIR/Cg.framework" '
-                   '"$ARTIFACTS_DIR/converter/Frameworks/Cg.framework"',
-                   ]))
-  env.Requires(exe_install, env.Replicate(
-    '$ARTIFACTS_DIR/converter', [
-    '$CG_DIR/bin/cgc',
-  ]))
-
-if env.Bit('linux'):
-  env.Requires(exe_install, env.Replicate(
-    '$ARTIFACTS_DIR', [
-    '$CG_DIR/bin/cgc',
-    '$CG_DIR/lib/libCg.so',
-    '$CG_DIR/lib/libCgGL.so',
-    '$GLEW_DIR/lib/libGLEW.so.1.5',
-  ]))
diff --git a/o3d/core/build.scons b/o3d/core/build.scons
deleted file mode 100644
index 62e803e..0000000
--- a/o3d/core/build.scons
+++ /dev/null
@@ -1,209 +0,0 @@
-# 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.
-
-
-# Import the build environment that was decided in the project SConstruct.
-# This may be the Debug or Optimized environment
-Import('env')
-
-# Cross platform inputs used to build the cross platform library.
-cross_inputs = [
-    'cross/bounding_box.cc',
-    'cross/buffer.cc',
-    'cross/canvas.cc',
-    'cross/canvas_paint.cc',
-    'cross/canvas_shader.cc',
-    'cross/class_manager.cc',
-    'cross/clear_buffer.cc',
-    'cross/client.cc',
-    'cross/client_info.cc',
-    'cross/core_metrics.cc',
-    'cross/counter.cc',
-    'cross/counter_manager.cc',
-    'cross/curve.cc',
-    'cross/draw_context.cc',
-    'cross/draw_element.cc',
-    'cross/draw_list.cc',
-    'cross/draw_list_manager.cc',
-    'cross/draw_pass.cc',
-    'cross/effect.cc',
-    'cross/element.cc',
-    'cross/error_status.cc',
-    'cross/error_stream_manager.cc',
-    'cross/evaluation_counter.cc',
-    'cross/event.cc',
-    'cross/event_manager.cc',
-    'cross/features.cc',
-    'cross/field.cc',
-    'cross/file_request.cc',
-    'cross/function.cc',
-    'cross/iclass_manager.cc',
-    'cross/ierror_status.cc',
-    'cross/id_manager.cc',
-    'cross/image_utils.cc',
-    'cross/imain_thread_task_poster.cc',
-    'cross/material.cc',
-    'cross/math_utilities.cc',
-    'cross/matrix4_axis_rotation.cc',
-    'cross/matrix4_composition.cc',
-    'cross/matrix4_scale.cc',
-    'cross/matrix4_translation.cc',
-    'cross/message_commands.cc',
-    'cross/message_queue.cc',
-    'cross/named_object.cc',
-    'cross/object_base.cc',
-    'cross/object_manager.cc',
-    'cross/pack.cc',
-    'cross/param.cc',
-    'cross/param_array.cc',
-    'cross/param_cache.cc',
-    'cross/param_object.cc',
-    'cross/param_operation.cc',
-    'cross/primitive.cc',
-    'cross/profiler.cc',
-    'cross/ray_intersection_info.cc',
-    'cross/renderer.cc',
-    'cross/render_context.cc',
-    'cross/render_node.cc',
-    'cross/render_surface.cc',
-    'cross/render_surface_set.cc',
-    'cross/sampler.cc',
-    'cross/semantic_manager.cc',
-    'cross/service_locator.cc',
-    'cross/shape.cc',
-    'cross/skin.cc',
-    'cross/state.cc',
-    'cross/state_set.cc',
-    'cross/standard_param.cc',
-    'cross/stream.cc',
-    'cross/stream_bank.cc',
-    'cross/texture.cc',
-    'cross/texture_base.cc',
-    'cross/timer.cc',
-    'cross/tree_traversal.cc',
-    'cross/transform.cc',
-    'cross/transformation_context.cc',
-    'cross/vertex_source.cc',
-    'cross/viewport.cc',
-    # These will eventually move, but they are cross platform now
-    'cross/bitmap.cc',
-    'cross/bitmap_tga.cc',
-    'cross/bitmap_png.cc',
-    'cross/bitmap_jpg.cc',
-#   'cross/bitmap_gif.cc',
-    'cross/bitmap_dds.cc',
-]
-
-env.Append(CPPPATH=['$SKIA_DIR/include/core',
-                    '$SKIA_DIR/include/effects'],
-           CPPDEFINES = [('O3D_PLUGIN_VERSION', '\\"$O3D_PLUGIN_VERSION\\"')])
-
-# Renderer and platform specific inputs.
-platform_inputs = []
-
-
-# Add a precompiled header declaration to the Windows environment.
-if env['TARGET_PLATFORM'] == 'WINDOWS':
-  env.Append(
-      CCFLAGS = [
-          '/Ylcore',
-          '/FIcore/cross/precompile.h'
-      ],
-  )
-  pch, pch_obj = env.PCH('cross/precompile.cc')
-  env['PCH'] = pch
-  env['PCHSTOP'] = 'core/cross/precompile.h'
-  platform_inputs += [pch_obj]
-else:
-  platform_inputs += ['cross/precompile.cc']
-  env.Append(CCFLAGS = [['-include', 'core/cross/precompile.h']])
-
-# Based on the renderer requested, append the platform-specific source
-if 'RENDERER_D3D9' in env['CPPDEFINES'] :
-  platform_inputs += [
-    'win/d3d9/buffer_d3d9.cc',
-    'win/d3d9/draw_element_d3d9.cc',
-    'win/d3d9/effect_d3d9.cc',
-    'win/d3d9/install_check.cc',
-    'win/d3d9/param_cache_d3d9.cc',
-    'win/d3d9/sampler_d3d9.cc',
-    'win/d3d9/stream_bank_d3d9.cc',
-    'win/d3d9/primitive_d3d9.cc',
-    'win/d3d9/renderer_d3d9.cc',
-    'win/d3d9/render_surface_d3d9.cc',
-    'win/d3d9/texture_d3d9.cc',
-    'win/d3d9/utils_d3d9.cc',
-  ]
-elif 'RENDERER_GL' in env['CPPDEFINES'] :
-  platform_inputs += [
-    'cross/gl/buffer_gl.cc',
-    'cross/gl/draw_element_gl.cc',
-    'cross/gl/effect_gl.cc',
-    'cross/gl/install_check.cc',
-    'cross/gl/param_cache_gl.cc',
-    'cross/gl/primitive_gl.cc',
-    'cross/gl/renderer_gl.cc',
-    'cross/gl/stream_bank_gl.cc',
-    'cross/gl/render_surface_gl.cc',
-    'cross/gl/texture_gl.cc',
-    'cross/gl/utils_gl.cc',
-    "cross/gl/sampler_gl.cc",
-  ]
-elif 'RENDERER_MOCK' in env['CPPDEFINES'] :
-  platform_inputs += [ ]
-else :
-  print 'No renderer defined, exiting.\n'
-  print """Add 'RENDERER=gl' or 'RENDERER=d3d' to the command line."""
-  Exit(1)
-
-if env['TARGET_PLATFORM'] == 'MAC':
-  platform_inputs += [
-    "mac/performance_timer.cc",
-  ]
-
-if env['TARGET_PLATFORM'] == 'WINDOWS':
-  platform_inputs += [
-      "win/performance_timer.cc",
-  ]
-
-if env['TARGET_PLATFORM'] == 'LINUX':
-  platform_inputs += [
-      "linux/performance_timer.cc",
-  ]
-
-env.Append(CPPPATH = env['RENDERER_INCLUDE_PATH'])
-
-# Create a platform independent library from the cross sources
-# called "o3dCore"
-o3dcore_lib = env.ComponentLibrary('o3dCore', cross_inputs)
-
-
-# Create a platform-specific target library from the sources
-# called "o3dCorePlatform"
-o3dcorerender_lib = env.ComponentLibrary('o3dCorePlatform', platform_inputs)
diff --git a/o3d/documentation/build.scons b/o3d/documentation/build.scons
deleted file mode 100644
index df0597e..0000000
--- a/o3d/documentation/build.scons
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.
-
-
-import os.path
-import subprocess
-Import('env')
-env.SConscript('$SCONSTRUCT_DIR/plugin/idl_list.scons')
-env.SConscript('$SCONSTRUCT_DIR/samples/o3djs/js_list.scons')
-Import('O3D_IDL_SOURCES')
-Import('O3D_JS_SOURCES')
-
-env.Replace(
-    JSDOC_DIR = '$SCONSTRUCT_DIR/documentation',
-    JSDOC_EZT_TEMPLATE_DIR = '$JSDOC_DIR/jsdoc-toolkit-templates/',
-    JSDOC_EXTERNS_DIR = '$JSDOC_DIR/externs/',
-    PYTHONPATH = ['$NIXYSA_DIR',
-                  '$GFLAGS_DIR/python',
-                  '$PLY_DIR']
-)
-
-# Build documentation
-IDL_DIR = "$SCONSTRUCT_DIR/plugin/"
-LOCAL_IDL_SOURCES = [IDL_DIR + i for i in O3D_IDL_SOURCES]
-JS_DIR = '$SCONSTRUCT_DIR/samples/o3djs/'
-LOCAL_JS_SOURCES = [JS_DIR + i for i in O3D_JS_SOURCES]
-
-DOCSGEN_ARGS = ['$JSDOC_DIR/build_docs.py $JAVA_EXE '
-                '$THIRD_PARTY $TARGET_ROOT/obj']
-
-env["BUILDERS"]["JSDocs"] = Builder(action=env.Python(DOCSGEN_ARGS))
-
-JSCOMP_PATH = "$SCONSTRUCT_DIR/../o3d-internal/jscomp/JSCompiler_deploy.jar"
-if os.path.exists(env.subst(JSCOMP_PATH)):
-  env.JSDocs('base.js', LOCAL_JS_SOURCES + LOCAL_IDL_SOURCES +
-             ['$JSDOC_EZT_TEMPLATE_DIR/annotated.tmpl',
-              '$JSDOC_EZT_TEMPLATE_DIR/class.tmpl',
-              '$JSDOC_EZT_TEMPLATE_DIR/classtree.tmpl',
-              '$JSDOC_EZT_TEMPLATE_DIR/dot.tmpl',
-              '$JSDOC_EZT_TEMPLATE_DIR/filelist.tmpl',
-              '$JSDOC_EZT_TEMPLATE_DIR/members.tmpl',
-              '$JSDOC_EZT_TEMPLATE_DIR/namespaces.tmpl',
-              '$JSDOC_EZT_TEMPLATE_DIR/publish.js',
-              '$JSDOC_EZT_TEMPLATE_DIR/static/header.html',
-              '$JSDOC_EZT_TEMPLATE_DIR/static/footer.html',
-              '$JSDOC_EZT_TEMPLATE_DIR/static/stylesheet.css',
-              '$JSDOC_EZT_TEMPLATE_DIR/static/tabs.css',
-              '$JSDOC_EZT_TEMPLATE_DIR/static/tab_l.gif',
-              '$JSDOC_EZT_TEMPLATE_DIR/static/tab_r.gif',
-              '$JSDOC_EZT_TEMPLATE_DIR/static/tab_b.gif',
-              '$JSDOC_EXTERNS_DIR/externs.js',
-              '$JSDOC_EXTERNS_DIR/o3d-extra-externs.js',
-              '$JSDOC_DIR/build_docs.py'])
diff --git a/o3d/event/build.scons b/o3d/event/build.scons
deleted file mode 100644
index 63ef0ad..0000000
--- a/o3d/event/build.scons
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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.
-
-# This SConscript is currently only suitable for Linux.
-
-Import('env')
-
-env.Prepend(
-    CPPPATH = [
-      '$LIBEVENT_DIR',
-    ],
-)
-
-env.Append(
-    CPPDEFINES = [
-      'HAVE_CONFIG_H',
-    ],
-)
-
-if env.Bit('mac'):
-  env.Prepend(
-      CPPPATH = [
-        '$LIBEVENT_DIR/mac',
-      ],
-  )
-
-if env.Bit('linux'):
-  env.Prepend(
-      CPPPATH = [
-        '$LIBEVENT_DIR/linux',
-      ],
-  )
-
-inputs = [
-    'buffer',
-    'evbuffer',
-    'evdns',
-    'event',
-    'event_tagging',
-    'evrpc',
-    'evutil',
-    'http',
-    'log',
-    'poll',
-    'select',
-    'signal',
-    'strlcpy',
-]
-
-if env.Bit('mac'):
-  inputs.extend([
-      'kqueue',
-  ])
-
-if env.Bit('linux'):
-  inputs.extend([
-      'epoll',
-      'epoll_sub',
-  ])
-
-objects = env.MakeObjects(inputs, '$LIBEVENT_DIR', 'c')
-env.ComponentLibrary('event', inputs)
diff --git a/o3d/google_update/build.scons b/o3d/google_update/build.scons
deleted file mode 100644
index 1573a14..0000000
--- a/o3d/google_update/build.scons
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.
-
-Import('env')
-
-idl_stuff = env.TypeLibrary('google_update_idl.idl')
-env.Append(CPPPATH=env.Dir('.'))
-
-INPUTS = [
-    'performondemand.cc',
-]
-
-exe = env.ComponentProgram('getextras', INPUTS)
-
-env.Requires(exe, idl_stuff)
-
-env.Replicate('$ARTIFACTS_DIR', exe)
diff --git a/o3d/import/build.scons b/o3d/import/build.scons
deleted file mode 100644
index 8aa5a88..0000000
--- a/o3d/import/build.scons
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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.
-
-
-Import('env')
-env.SConscript('fcollada.scons', exports=['env'])
-
-env.Append(
-  CPPPATH=[
-    env.Dir('$CG_DIR/include'),
-    env.Dir('$COLLADA_DIR'),
-    env.Dir('$COLLADA_DIR/LibXML/include'),
-    env.Dir('$ZLIB_DIR'),
-    # Include path for generated headers.
-    env.Dir('$OBJ_ROOT/compiler/technique'),
-    # Include path for Antlr C runtime headers.
-    env.Dir('$ANTLRLIBC_DIR/include'),
-  ],
-)
-
-# Add renderer-specific includes to the environment.
-env.Append(CPPPATH = env['RENDERER_INCLUDE_PATH'])
-
-if env.Bit('windows'):
-  env.Append(
-      CCFLAGS = [
-          '/Ylo3dImport',
-          '/FIimport/cross/precompile.h',
-      ],
-  )
-  pch, pch_obj = env.PCH('cross/precompile.cc')
-  env['PCH'] = pch
-  env['PCHSTOP'] = 'import/cross/precompile.h'
-else:
-  pch_obj = 'cross/precompile.cc'
-  env.Append(CCFLAGS = [['-include', 'import/cross/precompile.h']])
-
-collada_inputs = [
-  'cross/collada.cc',
-  'cross/collada_zip_archive.cc',
-  'cross/zip_archive.cc',
-  'cross/gz_compressor.cc',
-  'cross/file_output_stream_processor.cc',
-  'cross/tar_generator.cc',
-  'cross/targz_generator.cc',
-]
-
-serialization_objects_inputs = [
-  'cross/camera_info.cc',
-  'cross/destination_buffer.cc',
-  'cross/json_object.cc',
-]
-
-archive_inputs = [
-  pch_obj,
-
-  'cross/archive_processor.cc',
-  'cross/archive_request.cc',
-  'cross/gz_decompressor.cc',
-  'cross/memory_stream.cc',
-  'cross/main_thread_archive_callback_client.cc',
-  'cross/raw_data.cc',
-  'cross/tar_processor.cc',
-  'cross/targz_processor.cc',
-  'cross/threaded_stream_processor.cc',
-]
-
-conditioner_inputs = ['cross/collada_conditioner.cc']
-
-if env.Bit('mac'):
-  conditioner_inputs += [
-    'mac/collada_conditioner_mac.mm',
-  ]
-  FRAMEWORKS = [
-   'Foundation'
-  ]
-
-if env.Bit('windows'):
-  conditioner_inputs += [
-    'win/collada_conditioner_win.cc',
-  ]
-
-if env.Bit('linux'):
-  conditioner_inputs += [
-    'linux/collada_conditioner_linux.cc',
-  ]
-
-# Build a library called 'o3dImport' from the input sources.
-env.ComponentLibrary('o3dImport', collada_inputs)
-env.ComponentLibrary('o3dSerializationObjects', serialization_objects_inputs)
-env.ComponentLibrary('o3dArchive', archive_inputs)
-
-# Build a library that ONLY includes the stubbed-out conditioner code
-# TODO: merge this back into o3dImport as soon as the import
-# lib is no longer needed by the plugin.
-env.ComponentLibrary('o3dImportNoConditioner',
-                     ['cross/collada_conditioner_stub.cc'])
-
-# Build a library that ONLY includes the active conditioner code
-# TODO: merge this back into o3dImport as soon as the import
-# lib is no longer needed by the plugin.
-conditioner_lib = env.ComponentLibrary('o3dImportConditioner',
-                                       conditioner_inputs)
-
-# The conditioner needs these regardless of what renderer we're
-# building for.
-if env.Bit('windows'):
-  env.Requires(conditioner_lib,
-               env.Replicate('$ARTIFACTS_DIR',
-                             ['$CG_DIR/bin/cgc.exe',
-                              '$CG_DIR/bin/cg.dll',
-                              '$CG_DIR/bin/cgGL.dll',
-                              '$GLEW_DIR/bin/glew32.dll',
-                              ]))
-
-if env.Bit('linux'):
-  env.Requires(conditioner_lib,
-               env.Replicate('$ARTIFACTS_DIR', ['$CG_DIR/bin/cgc',
-                                                '$CG_DIR/lib/libCg.so',
-                                                '$CG_DIR/lib/libCgGL.so',
-                                                '$GLEW_DIR/lib/libGLEW.so.1.5',
-                                                ]))
-
-if env.Bit('mac'):
-  env.Requires(conditioner_lib,
-               env.Replicate('$ARTIFACTS_DIR', ['$CG_DIR/bin/cgc']))
diff --git a/o3d/import/fcollada.scons b/o3d/import/fcollada.scons
deleted file mode 100644
index 0849f9f..0000000
--- a/o3d/import/fcollada.scons
+++ /dev/null
@@ -1,267 +0,0 @@
-# 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.
-
-
-Import('env')
-
-c_sources = [
-  'LibXML/DOCBparser',
-  'LibXML/HTMLparser',
-  'LibXML/HTMLtree',
-  'LibXML/SAX',
-  'LibXML/SAX2',
-  'LibXML/c14n',
-  'LibXML/catalog',
-  'LibXML/chvalid',
-  'LibXML/debugXML',
-  'LibXML/dict',
-  'LibXML/encoding',
-  'LibXML/entities',
-  'LibXML/error',
-  'LibXML/globals',
-  'LibXML/hash',
-  'LibXML/legacy',
-  'LibXML/list',
-  'LibXML/nanoftp',
-  'LibXML/nanohttp',
-  'LibXML/parser',
-  'LibXML/parserInternals',
-  'LibXML/pattern',
-  'LibXML/relaxng',
-  'LibXML/threads',
-  'LibXML/tree',
-  'LibXML/uri',
-  'LibXML/valid',
-  'LibXML/xinclude',
-  'LibXML/xlink',
-  'LibXML/xmlIO',
-  'LibXML/xmlcatalog',
-  'LibXML/xmlmemory',
-  'LibXML/xmlmodule',
-  'LibXML/xmlreader',
-  'LibXML/xmlregexp',
-  'LibXML/xmlsave',
-  'LibXML/xmlstring',
-  'LibXML/xmlunicode',
-  'LibXML/xmlwriter',
-]
-
-cpp_sources = [
-  'DLLEntry',
-  'FCollada',
-  'FColladaPlugin',
-  'StdAfx',
-
-  'FArchiveXML/FAXAnimationExport',
-  'FArchiveXML/FAXAnimationImport',
-  'FArchiveXML/FAXCameraExport',
-  'FArchiveXML/FAXCameraImport',
-  'FArchiveXML/FAXColladaParser',
-  'FArchiveXML/FAXColladaWriter',
-  'FArchiveXML/FAXControllerExport',
-  'FArchiveXML/FAXControllerImport',
-  'FArchiveXML/FAXEmitterExport',
-  'FArchiveXML/FAXEmitterImport',
-  'FArchiveXML/FAXEntityExport',
-  'FArchiveXML/FAXEntityImport',
-  'FArchiveXML/FAXForceFieldExport',
-  'FArchiveXML/FAXForceFieldImport',
-  'FArchiveXML/FAXGeometryExport',
-  'FArchiveXML/FAXGeometryImport',
-  'FArchiveXML/FAXImportLinking',
-  'FArchiveXML/FAXInstanceExport',
-  'FArchiveXML/FAXInstanceImport',
-  'FArchiveXML/FAXLightExport',
-  'FArchiveXML/FAXLightImport',
-  'FArchiveXML/FAXMaterialExport',
-  'FArchiveXML/FAXMaterialImport',
-  'FArchiveXML/FAXPhysicsExport',
-  'FArchiveXML/FAXPhysicsImport',
-  'FArchiveXML/FAXSceneExport',
-  'FArchiveXML/FAXSceneImport',
-  'FArchiveXML/FArchiveXML',
-  'FArchiveXML/StdAfx',
-
-  'FCDocument/FCDAnimated',
-  'FCDocument/FCDAnimation',
-  'FCDocument/FCDAnimationChannel',
-  'FCDocument/FCDAnimationClip',
-  'FCDocument/FCDAnimationClipTools',
-  'FCDocument/FCDAnimationCurve',
-  'FCDocument/FCDAnimationCurveTools',
-  'FCDocument/FCDAnimationKey',
-  'FCDocument/FCDAnimationMultiCurve',
-  'FCDocument/FCDAsset',
-  'FCDocument/FCDCamera',
-  'FCDocument/FCDController',
-  'FCDocument/FCDControllerInstance',
-  'FCDocument/FCDControllerTools',
-  'FCDocument/FCDEffect',
-  'FCDocument/FCDEffectCode',
-  'FCDocument/FCDEffectParameter',
-  'FCDocument/FCDEffectParameterFactory',
-  'FCDocument/FCDEffectParameterSampler',
-  'FCDocument/FCDEffectParameterSurface',
-  'FCDocument/FCDEffectPass',
-  'FCDocument/FCDEffectPassShader',
-  'FCDocument/FCDEffectPassState',
-  'FCDocument/FCDEffectProfile',
-  'FCDocument/FCDEffectProfileFX',
-  'FCDocument/FCDEffectStandard',
-  'FCDocument/FCDEffectTechnique',
-  'FCDocument/FCDEffectTools',
-  'FCDocument/FCDEmitter',
-  'FCDocument/FCDEmitterInstance',
-  'FCDocument/FCDEmitterObject',
-  'FCDocument/FCDEmitterParticle',
-  'FCDocument/FCDEntity',
-  'FCDocument/FCDEntityInstance',
-  'FCDocument/FCDEntityReference',
-  'FCDocument/FCDExternalReferenceManager',
-  'FCDocument/FCDExtra',
-  'FCDocument/FCDForceDeflector',
-  'FCDocument/FCDForceDrag',
-  'FCDocument/FCDForceField',
-  'FCDocument/FCDForceGravity',
-  'FCDocument/FCDForcePBomb',
-  'FCDocument/FCDForceWind',
-  'FCDocument/FCDGeometry',
-  'FCDocument/FCDGeometryInstance',
-  'FCDocument/FCDGeometryMesh',
-  'FCDocument/FCDGeometryNURBSSurface',
-  'FCDocument/FCDGeometryPolygons',
-  'FCDocument/FCDGeometryPolygonsInput',
-  'FCDocument/FCDGeometryPolygonsTools',
-  'FCDocument/FCDGeometrySource',
-  'FCDocument/FCDGeometrySpline',
-  'FCDocument/FCDImage',
-  'FCDocument/FCDLibrary',
-  'FCDocument/FCDLight',
-  'FCDocument/FCDLightTools',
-  'FCDocument/FCDMaterial',
-  'FCDocument/FCDMaterialInstance',
-  'FCDocument/FCDMorphController',
-  'FCDocument/FCDObject',
-  'FCDocument/FCDObjectWithId',
-  'FCDocument/FCDParameterAnimatable',
-  'FCDocument/FCDParticleModifier',
-  'FCDocument/FCDPhysicsAnalyticalGeometry',
-  'FCDocument/FCDPhysicsForceFieldInstance',
-  'FCDocument/FCDPhysicsMaterial',
-  'FCDocument/FCDPhysicsModel',
-  'FCDocument/FCDPhysicsModelInstance',
-  'FCDocument/FCDPhysicsRigidBody',
-  'FCDocument/FCDPhysicsRigidBodyInstance',
-  'FCDocument/FCDPhysicsRigidBodyParameters',
-  'FCDocument/FCDPhysicsRigidConstraint',
-  'FCDocument/FCDPhysicsRigidConstraintInstance',
-  'FCDocument/FCDPhysicsScene',
-  'FCDocument/FCDPhysicsShape',
-  'FCDocument/FCDPlaceHolder',
-  'FCDocument/FCDSceneNode',
-  'FCDocument/FCDSceneNodeIterator',
-  'FCDocument/FCDSceneNodeTools',
-  'FCDocument/FCDSkinController',
-  'FCDocument/FCDTargetedEntity',
-  'FCDocument/FCDTexture',
-  'FCDocument/FCDTransform',
-  'FCDocument/FCDVersion',
-  'FCDocument/FCDocument',
-  'FCDocument/FCDocumentTools',
-
-  'FMath/FMAllocator',
-  'FMath/FMAngleAxis',
-  'FMath/FMColor',
-  'FMath/FMInterpolation',
-  'FMath/FMLookAt',
-  'FMath/FMMatrix33',
-  'FMath/FMMatrix44',
-  'FMath/FMQuaternion',
-  'FMath/FMRandom',
-  'FMath/FMSkew',
-  'FMath/FMVector3',
-  'FMath/FMVolume',
-  'FMath/StdAfx',
-
-  'FUtils/FUAssert',
-  'FUtils/FUBase64',
-  'FUtils/FUBoundingBox',
-  'FUtils/FUBoundingSphere',
-  'FUtils/FUCrc32',
-  'FUtils/FUCriticalSection',
-  'FUtils/FUDaeEnum',
-  'FUtils/FUDateTime',
-  'FUtils/FUDebug',
-  'FUtils/FUError',
-  'FUtils/FUErrorLog',
-  'FUtils/FUFile',
-  'FUtils/FUFileManager',
-  'FUtils/FULogFile',
-  'FUtils/FUObject',
-  'FUtils/FUObjectType',
-  'FUtils/FUParameter',
-  'FUtils/FUParameterizable',
-  'FUtils/FUPluginManager',
-  'FUtils/FUSemaphore',
-  'FUtils/FUStringBuilder',
-  'FUtils/FUStringConversion',
-  'FUtils/FUSynchronizableObject',
-  'FUtils/FUThread',
-  'FUtils/FUTracker',
-  'FUtils/FUUniqueStringMap',
-  'FUtils/FUUniqueStringMapTest',
-  'FUtils/FUUri',
-  'FUtils/FUXmlDocument',
-  'FUtils/FUXmlParser',
-  'FUtils/FUXmlWriter',
-  'FUtils/StdAfx',
-]
-
-env.Append(CPPPATH=['$COLLADA_DIR/LibXML/include', '$COLLADA_DIR'],
-           # Always set RETAIL so that we don't link in tests.
-           CPPDEFINES=['RETAIL'])
-
-# TESTING is added on our test- targets but messes up fcollada
-env.FilterOut(CPPDEFINES=['TESTING'])
-
-if env.Bit('mac'):
-  # LibXML needs this define on Mac.
-  env.Append(CPPDEFINES = ['OS_MACINTOSH'])
-
-if env.Bit('linux'):
-  # On linux, -O3 seems to cause problems with template instantiation, -O2 is
-  # fine.
-  if not env['DEBUG']:
-    env.FilterOut(CCFLAGS=['-O3'])
-    env.Append(CCFLAGS=['-O2'])
-
-inputs = env.MakeObjects(c_sources, '$COLLADA_DIR', 'c')
-inputs += env.MakeObjects(cpp_sources, '$COLLADA_DIR', 'cpp')
-
-env.ComponentLibrary('FColladaU', inputs)
diff --git a/o3d/installer/linux/build.scons b/o3d/installer/linux/build.scons
deleted file mode 100644
index 85e08c2..0000000
--- a/o3d/installer/linux/build.scons
+++ /dev/null
@@ -1,208 +0,0 @@
-# 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.
-
-import os
-import subprocess
-import SCons
-
-Import('env')
-
-# Check if Debian packaging tools are installed. If so, make a .deb package.
-if subprocess.Popen(["which", "dpkg-buildpackage"],
-    stdout=open(os.devnull, "w")).wait() == 0:
-
-  print('Found dpkg-buildpackage in PATH; will create Debian packages.');
-
-  current_source_dir = os.path.join(env['SCONSTRUCT_DIR'], 'installer/linux')
-
-  def OutputFromShellCommand(command):
-    process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
-    return process.communicate()[0].strip()
-
-  def _InternalBuildDebianPackage(env, src_dir, obj_dir, debian_files,
-      package_files, output_dir=None, force_version=None):
-    """Creates build rules to build a Debian package from the specified sources.
-
-    Args:
-      env: SCons Environment.
-      src_dir: Current source path, to which the debian_files are
-          relative.
-      obj_dir: Directory to place object files in.
-      debian_files: Array of the Debian control file sources that should be
-          copied into the package source tree, e.g., changelog, control, rules,
-          etc. Must be relative to current source dir.
-      package_files: An array of 2-tuples listing the files that should be
-          copied into the package source tree.
-          The first element is the path where the file should be placed for the
-              .install control file to find it, relative to the generated debian
-              package source directory.
-          The second element is the file source.
-      output_dir: An optional directory to place the files in. If omitted, the
-          current output directory is used.
-      force_version: Optional. Forces the version of the package to start with
-          this version string if specified. If the last entry in the changelog
-          is not for a version that starts with this then a dummy entry is
-          generated with this version and a ~prerelease suffix (so that the
-          final version will compare as greater).
-
-    Return:
-      A list of the targets (at least two).
-    """
-    # Read the control file and changelog file to determine the package name,
-    # version, and arch that the Debian build tools will use to name the
-    # generated files.
-    control_file = None
-    changelog_file = None
-    for file in debian_files:
-      if os.path.basename(file) == "control":
-        control_file = os.path.join(src_dir, file)
-      elif os.path.basename(file) == "changelog":
-        changelog_file = os.path.join(src_dir, file)
-    if control_file == None:
-      raise Exception("Need to have a control file")
-    if changelog_file == None:
-      raise Exception("Need to have a changelog file")
-    source = OutputFromShellCommand(
-        "awk '/^Source:/ { print $2; }' " + control_file)
-    packages = OutputFromShellCommand(
-        "awk '/^Package:/ { print $2; }' " + control_file).split("\n")
-    version = OutputFromShellCommand(
-        "sed -nr '1 { s/.*\\((.*)\\).*/\\1/; p }' " + changelog_file)
-    arch = OutputFromShellCommand(
-        "awk '/^Architecture:/ { print $2; }' %s | head -n 1" % control_file)
-    add_dummy_changelog_entry = False
-    if force_version != None and not version.startswith(force_version):
-      print('Warning: no entry in ' + changelog_file + ' for version ' +
-          force_version + ' (last is ' + version +'). A dummy entry will be ' +
-          'generated. Remember to add the real changelog entry before ' +
-          'releasing.');
-      version = force_version + '~prerelease'
-      add_dummy_changelog_entry = True
-    source_dir_name = source + "_" + version + "_" + arch
-    target_file_names = [ source_dir_name + ".changes" ]
-    for package in packages:
-      package_file_name = package + "_" + version + "_" + arch + ".deb"
-      target_file_names.append(package_file_name)
-    # The targets
-    if output_dir != None:
-      targets = [os.path.join(output_dir, s) for s in target_file_names]
-    else:
-      targets = target_file_names
-    # Path to where we will construct the debian build tree.
-    deb_build_tree = os.path.join(obj_dir, source_dir_name, "deb_build_tree")
-    # First copy the files.
-    for file in package_files:
-      env.Command(os.path.join(deb_build_tree, file[0]), file[1],
-          SCons.Defaults.Copy('$TARGET', '$SOURCE'))
-      env.Depends(targets, os.path.join(deb_build_tree, file[0]))
-    # Now copy the Debian metadata sources. We have to do this all at once so
-    # that we can remove the target directory before copying, because there
-    # can't be any other stale files there or else dpkg-buildpackage may use
-    # them and give incorrect build output.
-    copied_debian_files_paths = []
-    for file in debian_files:
-      copied_debian_files_paths.append(os.path.join(deb_build_tree, "debian",
-          os.path.basename(file)))
-    copy_commands = [
-        """dir=$$(dirname $TARGET) && \
-            rm -Rf $$dir && \
-            mkdir -p $$dir && \
-            cp $SOURCES $$dir && \
-            chmod -R u+w $$dir"""
-    ]
-    if add_dummy_changelog_entry:
-      copy_commands += [
-          """debchange -c $$(dirname $TARGET)/changelog --newversion %s \
-              --distribution UNRELEASED \
-              'Developer preview build. (This entry was auto-generated.)'""" %
-          version
-      ]
-    env.Command(copied_debian_files_paths, debian_files, copy_commands)
-    env.Depends(targets, copied_debian_files_paths)
-    # TODO(tschmelcher): Change this to sign the package for Google builds once
-    # we start putting out Linux releases.
-    # Must explicitly specify -a because otherwise cross-builds won't work.
-    # Must explicitly specify -D because -a disables it.
-    # Must explicitly specify fakeroot because old dpkg tools don't assume that.
-    env.Command(targets, None,
-        """dir=%(dir)s && \
-            cd $$dir && \
-            dpkg-buildpackage -b -uc -a%(arch)s -D -rfakeroot && \
-            cd $$OLDPWD && \
-            for file in %(targets)s; do \
-              mv $$dir/../$$file $$(dirname $TARGET); \
-            done""" %
-        {'dir':env.Dir(deb_build_tree).path,
-         'arch':arch,
-         'targets':" ".join(target_file_names)})
-    return targets
-
-  def BuildDebianPackage(debian_files, package_files, output_dir=None,
-      force_version=None):
-    return _InternalBuildDebianPackage(env, current_source_dir, ".",
-        debian_files, package_files, output_dir, force_version)
-
-  # Build amd64 package.
-  BuildDebianPackage(["debian_common/changelog",
-                      "debian_amd64/control",
-                      "debian_amd64/google-o3d.install",
-                      "debian_common/links",
-                      "debian_amd64/postinst",
-                      "debian_amd64/prerm",
-                      "debian_amd64/rules"
-                     ],
-                     [("libnpo3dautoplugin.so",
-                           '$ARTIFACTS_DIR/libnpo3dautoplugin.so'),
-                      ("libGLEW.so.1.5", '$ARTIFACTS_DIR/libGLEW.so.1.5'),
-                      ("libCg.so", '$ARTIFACTS_DIR/libCg.so'),
-                      ("libCgGL.so", '$ARTIFACTS_DIR/libCgGL.so')
-                     ],
-                     output_dir='$ARTIFACTS_DIR',
-                     force_version=env.get('O3D_PLUGIN_VERSION'))
-
-  # Build i386 package.
-  BuildDebianPackage(["debian_common/changelog",
-                      "debian_i386/control",
-                      "debian_i386/google-o3d.install",
-                      "debian_common/links",
-                      "debian_i386/rules"
-                     ],
-                     [("libnpo3dautoplugin.so",
-                           '$ARTIFACTS_DIR/libnpo3dautoplugin.so'),
-                      ("libCg.so", '$ARTIFACTS_DIR/libCg.so'),
-                      ("libCgGL.so", '$ARTIFACTS_DIR/libCgGL.so')
-                     ],
-                     output_dir='$ARTIFACTS_DIR',
-                     force_version=env.get('O3D_PLUGIN_VERSION'))
-
-else:
-  print('dpkg-buildpackage not found in PATH; Debian packages will not be '
-      'built.');
-
-# TODO(tschmelcher): Also build an RPM and a tgz.
diff --git a/o3d/installer/win/build.scons b/o3d/installer/win/build.scons
deleted file mode 100644
index 2ec45be..0000000
--- a/o3d/installer/win/build.scons
+++ /dev/null
@@ -1,246 +0,0 @@
-# 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.
-
-
-import os
-Import('env')
-
-INPUTS = [
-    'custom_actions.cc',
-]
-
-CUSTOM_ACTIONS_LIBS = [
-    'advapi32',
-    'dxguid',
-    'msi',
-    'ole32',
-    'oleaut32',
-    'shell32',
-    'shlwapi',
-    'user32',
-]
-
-# Build the dll, provide our own set of libraries to be linked with our dll.
-# It is important to have full control of this since custom actions will run
-# in a 'sandbox' and can't have external dependencies.
-cactions = env.ComponentLibrary('cactions', INPUTS, LIBS=CUSTOM_ACTIONS_LIBS,
-                                COMPONENT_STATIC=False)
-
-# copy to artifacts
-env.Replicate('$ARTIFACTS_DIR', cactions[0])
-
-# Unique guid for o3d namespace generated by www.guidgen.com
-o3d_namespace_guid = 'B445DBAE-F5F9-435A-9A9B-088261CDF00A'
-
-# Pull out version numbers.
-nppversion = env.get('O3D_PLUGIN_VERSION_COMMAS')
-dotnppversion = env.get('O3D_PLUGIN_VERSION')
-# We don't actually want the extras version to update by itself; it should
-# change only when we actually add something to the installer or change the
-# d3dx9 version.  This version is therefore independent of the o3d plugin and
-# sdk versions.
-extrasversion ='0,1,1,0'
-dotextrasversion = '0.1.1.0'
-
-# TODO: this should be a tool!!
-
-# Utility function for generating GUID's in the o3d namespace.
-def gen_named_guid(namespace_guid, name, version):
-  nbguidgen_exe = env.File('$SCONSTRUCT_DIR/nbguidgen/win/nbguidgen.exe')
-  guid = os.popen('%s %s %s' %
-                  (nbguidgen_exe.abspath, namespace_guid,
-                  '%s-%s' % (name, version))).read()
-  return guid
-
-def get_guid_generator(namespace_guid, version):
-  return lambda name: gen_named_guid(namespace_guid, name, version)
-
-# TODO: These all return the same generator if their versions match.
-# Is that a problem?  Do we really need more than one of them?
-plugin_guid_generator = \
-    get_guid_generator(o3d_namespace_guid, nppversion)
-extras_guid_generator = \
-    get_guid_generator(o3d_namespace_guid, extrasversion)
-
-google_update_reg_path = 'Software\\Google\\Update\\Clients\\'
-google_update_state_reg_path = 'Software\\Google\\Update\\ClientState\\'
-
-# Guids and other variables for the plugin installer:
-o3d_npp_product_guid = plugin_guid_generator('o3d_product')
-o3d_npp_package_guid = plugin_guid_generator('o3d_package')
-dx_redist_guid = plugin_guid_generator('dx_redist')
-d3dx_guid = plugin_guid_generator('d3dx')
-
-# Changing the following values would break upgrade paths, so we hard-code the
-# values instead of generating them. The commands used to generate them are
-# kept, so that we can avoid creating collisions accidentally.
-
-# bad_old_o3d_upgrade_code = gen_named_guid(o3d_namespace_guid,
-#                                           'magicflute_upgrade', '')
-# o3d_npp_upgrade_code = gen_named_guid(o3d_namespace_guid,
-#                                      'plugin_upgrade', '')
-# o3d_extras_upgrade_code = gen_named_guid(o3d_namespace_guid,
-#                                          'extras_upgrade', '')
-bad_old_o3d_upgrade_code = 'dc819ed6-4155-3cff-b580-45626aed5848'
-o3d_npp_upgrade_code = '0f098121-2876-3c23-bd4c-501220ecbb42'
-o3d_extras_upgrade_code = 'c271f2f0-c7ad-3bc9-8216-211436aa2244'
-
-# Keep these around for historical reasons; if we ever want to bring the SDK
-# back, we might want to use the same GUIDs and Google Update project for
-# simplicity.
-#o3d_sdk_upgrade_code = 'd6b024ab-1784-348b-80c5-96ab43799d0a'
-#o3d_sdk_google_update_guid = '{00764f6f-9998-4520-9c41-94a30e36565a}'
-
-o3d_npp_component_guid = plugin_guid_generator(
-    'o3d_npplugin_component')
-o3d_iep_component_guid = plugin_guid_generator(
-    'o3d_ieplugin_component')
-o3d_npp_google_update_reg_component_guid = plugin_guid_generator(
-    'o3d_user_google_update_reg_component')
-o3d_reporter_guid = plugin_guid_generator('o3d_reporter')
-o3d_driver_blacklist_guid = plugin_guid_generator(
-    'o3d_driver_blacklist')
-o3d_software_renderer_guid = plugin_guid_generator(
-    'o3d_software_renderer')
-o3d_npp_google_update_guid = '{70308795-045C-42da-8F4E-D452381A7459}'
-o3d_npp_reg_key = '%s%s' % (google_update_reg_path, o3d_npp_google_update_guid)
-o3d_npp_state_reg_key = '%s%s' % (
-    google_update_state_reg_path, o3d_npp_google_update_guid)
-
-# Guids and other variables for the extras installer:
-o3d_extras_d3dx_component_guid = plugin_guid_generator(
-    'o3d_extras_d3dx_component')
-o3d_extras_product_guid = extras_guid_generator('o3d_extras_product')
-o3d_extras_package_guid = extras_guid_generator('o3d_extras_package')
-o3d_get_extras_guid = gen_named_guid(o3d_namespace_guid,
-                                     'extras_installer', '')
-
-o3d_extras_google_update_guid = '{34B2805D-C72C-4f81-AED5-5A22D1E092F1}'
-o3d_extras_reg_key = '%s%s' % (google_update_reg_path, o3d_extras_google_update_guid)
-
-# Wix tool needs to be in the PATH.
-# TODO: the wix tool should not need this dance!
-wix_path = env.Dir('$WIX_DIR')
-path = os.environ['PATH']
-path += os.pathsep + wix_path.abspath
-os.environ['PATH'] = path
-
-# Add the wix tool to the SCons environment.
-env.Tool('wix')
-
-# Lookup the plugin to be installed
-npplugin_path = env.File('$ARTIFACTS_DIR/npo3dautoplugin.dll')
-ieplugin_path = env.File('$ARTIFACTS_DIR/o3d_host.dll')
-conditioner_path = env.File('$ARTIFACTS_DIR/o3dConditioner.exe')
-cglib1_path = env.File('$ARTIFACTS_DIR/cg.dll')
-cglib2_path = env.File('$ARTIFACTS_DIR/cgGL.dll')
-cgc_path = env.File('$ARTIFACTS_DIR/cgc.exe')
-docs_path = env.File('$SCONSTRUCT_DIR/installer/win/docs.url')
-rep_path = env.File('$ARTIFACTS_DIR/reporter.exe')
-dbl_path = env.File('$SCONSTRUCT_DIR/installer/win/driver_blacklist.txt')
-get_extras_path = env.File('$ARTIFACTS_DIR/getextras.exe')
-custom_actions_path = env.File('$ARTIFACTS_DIR/cactions.dll')
-
-# Tell wix to include the software renderer IFF it's there.
-software_renderer_path = \
-    env.File('$SWIFTSHADER_DIR/swiftshader_d3d9.dll').abspath
-include_software_renderer = os.path.exists(software_renderer_path)
-
-# Path to custom actions dll.
-cactions_dll_path = env.File('$ARTIFACTS_DIR/cactions.dll')
-
-# Pass flags to the wix compiler.
-env.Append(WIXCANDLEFLAGS = [
-  '-dCustomActionsPath=' + custom_actions_path.abspath,
-  '-dD3DXGuid=' + d3dx_guid,
-  '-dDBLGuid=' + o3d_driver_blacklist_guid,
-  '-dDBLPath=' + dbl_path.abspath,
-  '-dDeprecatedUpgradeCode=' + bad_old_o3d_upgrade_code,
-  '-dGetExtrasGuid=' + o3d_get_extras_guid,
-  '-dGetExtrasPath=' + get_extras_path.abspath,
-  '-dIEPluginPath=' + ieplugin_path.abspath,
-  '-dIepComponentGuid=' + o3d_iep_component_guid,
-  '-dIncludeSoftwareRenderer=%s' % include_software_renderer,
-  '-dNPPluginPath=' + npplugin_path.abspath,
-  '-dNppComponentGuid=' + o3d_npp_component_guid,
-  '-dNppGoogleUpdateRegGuid=' + o3d_npp_google_update_reg_component_guid,
-  '-dNppGoogleUpdateRegKey=' + o3d_npp_reg_key,
-  '-dNppGoogleUpdateStateRegKey=' + o3d_npp_state_reg_key,
-  '-dNppPackageGuid=' + o3d_npp_package_guid,
-  '-dNppProductGuid=' + o3d_npp_product_guid,
-  '-dNppUpgradeCode=' + o3d_npp_upgrade_code,
-  '-dNppVersion=' + dotnppversion,
-  '-dRepGuid=' + o3d_reporter_guid,
-  '-dRepPath=' + rep_path.abspath,
-  '-dSoftwareRendererGuid=' + o3d_software_renderer_guid,
-  '-dSoftwareRendererPath=' + software_renderer_path,
-])
-
-# Build installer
-installer_msi = env.WiX('o3d.msi', ['o3d.wxs'])
-
-# Make sure that the plugin dll has been built before building the installer.
-# Make sure that the custom action dll has been built before building the
-# installer.
-# Relies on reporter.exe being built prior to installer.
-env.Depends(installer_msi,
-            [npplugin_path, ieplugin_path, cactions_dll_path, rep_path,
-            get_extras_path])
-
-# Copy to artifacts.
-env.Replicate('$ARTIFACTS_DIR', installer_msi)
-
-
-
-# Path to DirectX redistribution files.
-dx_redist_path = env.Dir('$DIRECTX_REDIST_DIR')
-
-# Only build o3dextras if we have the dx redistributables.
-if os.path.exists(dx_redist_path.abspath):
-  # New WiX flags for the Extras package [currently just the d3dx9 dll].  Note
-  # that this DOESN'T make the above flags go away; it just adds new ones or
-  # overwrites name clashes.  So we use distinctive names so as to avoid
-  # surprises.  The only flag from above that's used in the extras installer is
-  # DxRedistPath.
-  env.Append(WIXCANDLEFLAGS = [
-    '-dDxRedistPath=' + dx_redist_path.abspath,
-    '-dExtrasD3DXComponentGuid=' + o3d_extras_d3dx_component_guid,
-    '-dExtrasProductGuid=' + o3d_extras_product_guid,
-    '-dExtrasUpgradeCode=' + o3d_extras_upgrade_code,
-    '-dExtrasPackageGuid=' + o3d_extras_package_guid,
-    '-dExtrasVersion=' + dotextrasversion,
-    '-dExtrasGoogleUpdateRegGuid=' + o3d_extras_google_update_guid,
-    '-dExtrasGoogleUpdateRegKey=' + o3d_extras_reg_key,
-  ])
-
-  # Build the installer
-  extras_msi = env.WiX('o3dextras.msi', ['o3dextras.wxs'])
-
-  # copy to artifacts
-  env.Replicate('$ARTIFACTS_DIR', extras_msi)
diff --git a/o3d/ipc/build.scons b/o3d/ipc/build.scons
deleted file mode 100644
index 2474cc0..0000000
--- a/o3d/ipc/build.scons
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (c) 2006-2008 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.
-
-__doc__ = """
-Master configuration for building ipc component.
-"""
-
-Import('env')
-
-inputs = [
-    'ipc_channel_proxy',
-    'ipc_logging',
-    'ipc_message',
-    'ipc_message_utils',
-    'ipc_switches',
-    'ipc_sync_channel',
-    'ipc_sync_message',
-]
-
-if env.Bit('windows'):
-  inputs += [
-      'ipc_channel_win',
-  ]
-
-if env.Bit('mac') or env.Bit('linux'):
-  inputs += [
-      'file_descriptor_set_posix',
-      'ipc_channel_posix',
-  ]
-
-input_files = env.MakeObjects(inputs, '$CHROME_SRC_DIR/ipc', 'cc')
-env.ComponentLibrary('o3d_ipc', input_files)
diff --git a/o3d/main.scons b/o3d/main.scons
deleted file mode 100644
index 10976da..0000000
--- a/o3d/main.scons
+++ /dev/null
@@ -1,721 +0,0 @@
-# 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.
-
-
-
-import os
-import sys
-
-
-# Underlay everything from the o3d directory.
-Dir('tests').addRepository(Dir('#/'))
-
-def GetDotVersion(version):
-  return '%d.%d.%d.%d' % version
-
-def GetCommaVersion(version):
-  return '%d,%d,%d,%d' % version
-
-# This name is used by Javascript to find the plugin therefore it must
-# not change. If you change this you must change the name in
-# samples/o3djs/util.js but be aware, changing the name
-# will break all apps that use o3d on the web.
-plugin_name = 'O3D Plugin'
-
-# Get version string from o3d_version.py
-o3d_version_vars = {}
-if int(ARGUMENTS.get('MAC_KILLSWITCH', 0)):
-  execfile(str(File('installer/win/o3d_kill_version.py')), o3d_version_vars)
-else:
-  execfile(str(File('installer/win/o3d_version.py')), o3d_version_vars)
-plugin_version = o3d_version_vars['plugin_version']
-sdk_version = o3d_version_vars['sdk_version']
-
-# --------------------------------------------------------------------
-
-
-# List of environment leaves
-environment_list = []
-
-base_env = Environment(
-    tools = ['component_setup'],
-    O3D_PLUGIN_NAME = plugin_name,
-    O3D_PLUGIN_VERSION = GetDotVersion(plugin_version),
-    O3D_PLUGIN_VERSION_COMMAS = GetCommaVersion(plugin_version),
-    O3D_SDK_VERSION = GetDotVersion(sdk_version),
-    O3D_SDK_VERSION_COMMAS = GetCommaVersion(sdk_version),
-
-    # TODO: this will be the default, but is set for now
-    COMPONENT_STATIC = True,
-
-    COVERAGE_TARGETS = ['unit_tests', 'system_tests'],
-    MSVS_USE_MFC_DIRS=1,
-)
-base_env.ApplySConscript(['svn_paths.scons'])
-
-base_env.Append(
-    # Some derived paths
-    NACL_NRD_XFER_SOURCE_DIR = '$NACL_DIR/src/trusted/desc',
-    NACL_PLUGIN_SOURCE_DIR = '$NACL_DIR/npapi_plugin',
-    DOCS_DIR = '$DESTINATION_ROOT/docs',
-
-    CPPPATH = [
-        # The internal dir is first so that headers in internal can replace
-
-        # those in external.
-
-        '$INTERNAL_DIR',
-        '$SCONSTRUCT_DIR/..',
-        '$SCONSTRUCT_DIR',
-        '$CHROME_SRC_DIR',
-        '$GTEST_DIR/include',
-        '$EXPERIMENTAL_O3D_DIR',
-        '$NACL_DIR/..',
-    ],
-    LIBPATH = '$LIBS_DIR',
-    RENDERER_INCLUDE_PATH = [
-        '$ZLIB_DIR',
-        '$JPEG_DIR',
-        '$PNG_DIR',
-      ],
-    RENDERER_LIB_PATH = [
-    ],
-    RENDERER_LIBS = [
-        'libjpeg',
-        'libpng',
-        'zlib',
-        ],
-
-    CPPDEFINES = [
-        ['O3D_VERSION_NUMBER', '$O3D_PLUGIN_VERSION'],
-        'UNICODE',
-    ],
-    ICU_LIBS = ['icu'],
-)
-
-
-# If you change this argument, you'll need to clean the whole project before
-# rebuilding.
-if ARGUMENTS.get('PROFILE_GLUE', ''):
-  base_env.Append(
-      CPPDEFINES = [
-        'PROFILE_GLUE',
-        'PROFILE_CLIENT',
-      ])
-
-# Define O3D_ENABLE_BREAKPAD if Pulse passes in:
-# O3D_ENABLE_BREAKPAD=1
-if int(ARGUMENTS.get('O3D_ENABLE_BREAKPAD', 0)):
-  base_env.Append(CPPDEFINES = 'O3D_ENABLE_BREAKPAD')
-
-# Returns a list of objects built from a third-party directory.
-def MakeObjects(env, stems, dir, extension):
-  return [env.ComponentObject(stem, '%s/%s.%s' % (dir, stem, extension))
-          for stem in stems]
-base_env.AddMethod(MakeObjects)
-
-def Python(env, args):
-  """Returns an action that executes python with the given args, specifying
-  PYTHONPATH from the scons environment"""
-  sep = ':'
-  if env.Bit('host_windows'):
-    sep = ';'
-  # Add PYTHONPATH from the scons environment to the OS environment.
-  # NOTE: Ideally that would be delay-evaluated, but I can't figure out
-  # how to do that in scons.
-  env['ENV']['PYTHONPATH'] = env.subst(sep.join(env['PYTHONPATH']))
-  return Action(' '.join(['$PYTHON'] + args))
-
-base_env.AddMethod(Python)
-
-# The base NaCl IMC lib.
-nacl_imc_lib = 'google_nacl_imc'
-
-# All the libs required for IMC layer on the host.
-nacl_imc_all_libs = [
-  nacl_imc_lib,
-  'google_nacl_imc_c',
-  ]
-
-# All the libs required for HTP layer on the host.
-nacl_htp_all_libs = [
-  nacl_imc_lib,
-  'google_nacl_imc_c',
-  'nrd_xfer',
-  'gio',
-  'naclthread',
-  ]
-
-binaries_env = base_env.Clone()
-binaries_env.Append(
-    BUILD_COMPONENTS = [
-        'base',
-        'bitmap',
-        'compiler/antlr',
-        'compiler/technique',
-        'converter',
-#       'converter_edge',
-        'core',
-        'import',
-        'ipc',
-        'plugin',
-        'samples',
-        'serializer',
-        'skia',
-        'tests',
-        'tests/common',
-        'utils',
-        'v8',
-    ],
-    # TODO: this is ugly, should all be rolling into builder.
-    NACL_OBJ_ROOT = '$NACL_DIR/scons-out/$NACL_VARIANT/obj',
-    NACL_LIB_DIR = '$NACL_DIR/scons-out/$NACL_VARIANT/lib',
-    NACL_HTP_LIBS = nacl_htp_all_libs,
-)
-
-# This function adds a path to a windows environment variable like PATH,
-# INCLUDE, or LIB.
-def AddPathToWindowsEnv(env_dict, var, path):
-  try:
-    src = env_dict[var]
-  except KeyError:
-    src = ''
-  if not src:
-    env_dict[var] = path
-  else:
-    env_dict[var] = '%s;%s' % (src, path)
-
-# This function builds the native client IMC or HTP libraries by
-# calling scons to do a NaCl build.  It should handle dependencies
-# correctly and will not rebuild unless necessary.
-def AddNaclBuildCommand(env, variant, platforms):
-  if sys.platform not in platforms: return
-
-  nacl_os_env = dict(os.environ)
-  if sys.platform in ['win32', 'cygwin']:
-    script_suffix = '.bat'
-    # We want native client to use the same Platform SDK as ours. Pass it
-    # through INCLUDE and LIB.
-    AddPathToWindowsEnv(nacl_os_env, 'INCLUDE',
-                        env.subst('$PLATFORM_SDK_VISTA_6_0_DIR/Include'))
-    AddPathToWindowsEnv(nacl_os_env, 'LIB',
-                        env.subst('$PLATFORM_SDK_VISTA_6_0_DIR/Lib'))
-  else:
-    script_suffix = '.sh'
-
-  build_libs = nacl_htp_all_libs
-
-  targets = ['$NACL_LIB_DIR/${LIBPREFIX}' + f + '${LIBSUFFIX}'
-             for f in build_libs]
-  nacl_build_tool = '$PYTHON $SCONS_DIR/scons.py'
-  env.Command(targets,
-              ['$NACL_NRD_XFER_SOURCE_DIR', '$NACL_PLUGIN_SOURCE_DIR'],
-              nacl_build_tool + ' '
-              'MODE=$NACL_VARIANT '
-              'naclsdk_validate=0 '
-              'sdl=none '
-              '--verbose '
-              '--file=SConstruct '
-              '$DEBUG_OPTS '
-              '-C $NACL_DIR '
-              '$NACL_TARGETS',
-              source_scanner = DirScanner,
-              ENV = nacl_os_env,
-              # TODO: figure out why these can't be absolute paths
-              # when run on some flavors of linux. For now we can pass in the
-              # library name, which at least works everywhere.
-              NACL_TARGETS = build_libs,
-              NACL_VARIANT = variant,
-              DEBUG_OPTS = ['--debug=%s' % item for item in GetOption('debug')],
-  )
-
-# TODO: This is really not the ideal way to do this -- for
-# instance, the output goes into the NaCl scons-out directory instead
-# of ours.
-
-# Add in the two variants of NACL.
-win_platforms = ['win32', 'cygwin']
-mac_platforms = ['darwin']
-linux_platforms = ['linux', 'linux2']
-all_platforms = win_platforms + mac_platforms + linux_platforms
-AddNaclBuildCommand(binaries_env, 'dbg-win', win_platforms)
-AddNaclBuildCommand(binaries_env, 'opt-win', win_platforms)
-AddNaclBuildCommand(binaries_env, 'dbg-mac', mac_platforms)
-AddNaclBuildCommand(binaries_env, 'opt-mac', mac_platforms)
-AddNaclBuildCommand(binaries_env, 'dbg-linux', linux_platforms)
-AddNaclBuildCommand(binaries_env, 'opt-linux', linux_platforms)
-AddNaclBuildCommand(binaries_env, 'nacl', all_platforms)
-
-def AddTestingFlags(env):
-  env.Append(
-      CPPDEFINES = ['TESTING'],
-      SELENIUM_EXTRA_FLAGS = [
-          '--screenshots']
-  )
-
-# Windows ------------------------------------------------------------------
-
-app_data_dir = ""
-try:
-  app_data_dir = os.environ["APPDATA"]
-except KeyError:
-  pass  # This fails messily on mac + linux, so just ignore it.
-
-windows_env = binaries_env.Clone(
-    tools = [
-        'target_platform_windows',
-        'directx_9_18_944_0_partial',
-        'atlmfc_vc80',
-        'midl',
-    ],
-    CG_DIR = '$CG_BASE_DIR/win',
-    FIREFOX_PLUGIN_DIR = os.path.join(
-      app_data_dir, 'Mozilla', 'plugins'),
-    IE_PLUGIN_DIR = os.path.join(
-      app_data_dir, 'Google', 'O3D'),
-
-    # Turn off manifest generation, since we don't use that.
-    MANIFEST_FILE=False,
-
-    # Use MIDL compiler from the platform sdk, since
-    # we're including headers from there.
-    MIDL = '"$PLATFORM_SDK_VISTA_6_0_DIR/Bin/Midl.exe"',
-    MIDLFLAGS=['"/I$PLATFORM_SDK_VISTA_6_0_DIR/Include"'],
-)
-
-windows_env.Append(
-    CPPPATH = [
-        '$PLATFORM_SDK_VISTA_6_0_DIR/Include',
-        '$SWIFTSHADER_DIR',
-    ],
-    LIBPATH = [
-        '$PLATFORM_SDK_VISTA_6_0_DIR/Lib',
-    ],
-    CPPDEFINES = [
-        '_UNICODE', # turn on unicode
-        'WIN32',
-        '_WINDOWS',
-        'WIN32_LEAN_AND_MEAN',
-        'NOMINMAX',
-        '_WIN32_WINNT=0x0600',
-        '_CRT_SECURE_NO_WARNINGS',
-        'NACL_WINDOWS=1',
-        'SK_BUILD_FOR_WIN32',
-    ],
-    CCFLAGS = [
-        '/Z7', # put debug info in obj files
-        '/EHsc',
-        '/wd4018',  # comparison between signed and unsigned
-        '/wd4355',  # using this in a constructor
-        '/wd4305',  # truncating double to float
-    ],
-    LINKFLAGS = [
-        '/DEBUG'  # Always generate PDBs.
-    ],
-    LIBS = [
-        'user32',
-        'gdi32',
-        'shell32',
-        'ws2_32',
-        'rpcrt4',
-        'kernel32',
-        'advapi32',
-        'psapi',
-        'winmm',  # For V8
-        'ws2_32', # For V8
-        'Dbghelp', # For Chrome base
-    ],
-    BUILD_COMPONENTS = [
-        'breakpad',
-        'installer/win',
-        'google_update',
-        'plugin/npapi_host_control',
-        'statsreport',
-        'statsreport/common',
-        'nbguidgen',
-    ],
-    COVERAGE_TARGETS = ['selenium'],
-)
-windows_env.FilterOut(CPPDEFINES=['OS_WINDOWS=OS_WINDOWS'])
-
-windows_d3d_env = windows_env.Clone()
-windows_d3d_env.Append(
-    CPPDEFINES = ['RENDERER_D3D9'],
-    RENDERER_INCLUDE_PATH = [],
-    RENDERER_LIB_PATH = [],
-    RENDERER_LIBS = ['d3d9', 'dxerr'],
-)
-
-windows_gl_env = windows_env.Clone()
-windows_gl_env.Append(
-    RENDERER_INCLUDE_PATH = [
-        '$GLEW_DIR/include',
-        '$CG_DIR/include',
-    ],
-    RENDERER_LIB_PATH = [
-        '$CG_DIR/lib',
-        '$GLEW_DIR/lib',
-    ],
-    RENDERER_LIBS = [
-        'OpenGL32',
-        'glew32',
-        'cg',
-        'cgGL',
-    ],
-    CPPDEFINES = [
-        'RENDERER_GL'
-    ]
-)
-
-
-def AddWindowsDebugSettings(env):
-   env.Append(
-       CCFLAGS = [
-           '/Od',       # no optimizations at all
-           '/MTd',      # multi-threaded, staticly linked crt, with debugging
-           '/RTCsu',    # complain about using un-inited (u),
-                        # do more stack checks (s)
-       ],
-       CPPDEFINES = [
-           '_DEBUG',    # we are in debug mode
-       ],
-       LINKFLAGS = [
-           '/FIXED:no'  # Put in .reloc sections, to make Purify happy.
-       ],
-   )
-   env.Replace(
-       DEBUG = True,
-       NACL_VARIANT = 'dbg-win',
-   )
-
-
-def AddWindowsOptimizedSettings(env):
-   env.Append(
-       CCFLAGS = [
-           '/O1', # optimize for size
-           '/MT', # multi-threaded, staticly linked crt, release
-       ],
-       CPPDEFINES = [
-           'NDEBUG',  # we are in release mode
-           'ANTLR3_NODEBUGGER',  # turn off remote ANTLR debugging
-       ],
-   )
-   env.Replace(
-       DEBUG = False,
-       NACL_VARIANT = 'opt-win',
-   )
-
-
-windows_d3d_debug_env = windows_d3d_env.Clone(
-    BUILD_TYPE = 'dbg-d3d',
-    BUILD_TYPE_DESCRIPTION = 'Windows DirectX debug build',
-)
-windows_d3d_debug_env.Append(BUILD_GROUPS = ['default', 'most'])
-windows_d3d_debug_env.Append(CPPDEFINES = ['D3D_DEBUG_INFO'])
-AddWindowsDebugSettings(windows_d3d_debug_env)
-environment_list.append(windows_d3d_debug_env)
-
-
-windows_d3d_optimized_env = windows_d3d_env.Clone(
-    BUILD_TYPE = 'opt-d3d',
-    BUILD_TYPE_DESCRIPTION = 'Windows DirectX optimized build',
-)
-windows_d3d_optimized_env.Append(BUILD_GROUPS = ['most'])
-AddWindowsOptimizedSettings(windows_d3d_optimized_env)
-environment_list.append(windows_d3d_optimized_env)
-
-windows_d3d_test_debug_env = windows_d3d_env.Clone(
-    BUILD_TYPE = 'test-dbg-d3d',
-    BUILD_TYPE_DESCRIPTION = 'Windows DirectX debug build for testing',
-)
-AddWindowsDebugSettings(windows_d3d_test_debug_env)
-AddTestingFlags(windows_d3d_test_debug_env)
-environment_list.append(windows_d3d_test_debug_env)
-
-windows_d3d_test_optimized_env = windows_d3d_env.Clone(
-    BUILD_TYPE = 'test-opt-d3d',
-    BUILD_TYPE_DESCRIPTION = 'Windows DirectX optimized build for testing',
-)
-AddWindowsOptimizedSettings(windows_d3d_test_optimized_env)
-AddTestingFlags(windows_d3d_test_optimized_env)
-environment_list.append(windows_d3d_test_optimized_env)
-
-windows_gl_debug_env = windows_gl_env.Clone(
-    BUILD_TYPE = 'dbg-gl',
-    BUILD_TYPE_DESCRIPTION = 'Windows OpenGL debug build',
-)
-windows_gl_debug_env.Append(BUILD_GROUPS = ['most'])
-AddWindowsDebugSettings(windows_gl_debug_env)
-environment_list.append(windows_gl_debug_env)
-
-windows_gl_optimized_env = windows_gl_env.Clone(
-    BUILD_TYPE = 'opt-gl',
-    BUILD_TYPE_DESCRIPTION = 'Windows OpenGL optimized build',
-)
-windows_gl_optimized_env.Append(BUILD_GROUPS = ['most'])
-AddWindowsOptimizedSettings(windows_gl_optimized_env)
-environment_list.append(windows_gl_optimized_env)
-
-# MacOS ------------------------------------------------------------------
-
-mac_env = binaries_env.Clone(
-    tools = ['target_platform_mac'],
-    FIREFOX_PLUGIN_DIR = '/Library/Internet Plug-Ins',
-    GL_DIR = '/System/Library/Frameworks/OpenGL.framework/Versions/A',
-    CG_DIR = '$CG_BASE_DIR/mac',
-    CCFLAGS = [
-      '-Wstrict-aliasing',
-      '-gstabs+',
-      '-fno-eliminate-unused-debug-symbols',
-    ],
-)
-mac_env.FilterOut(CPPDEFINES = ['OS_MACOSX=OS_MACOSX'])
-
-mac_env.Append(CPPDEFINES = ['RENDERER_GL',
-                             'GTEST_NOT_MAC_FRAMEWORK_MODE',
-                             ['NACL_OSX', '1'],
-                             ['MAC_OS_X_VERSION_MIN_REQUIRED',
-                              'MAC_OS_X_VERSION_10_4'],
-                             'SK_BUILD_FOR_MAC'
-                            ],
-               RENDERER_INCLUDE_PATH = [
-                 '$CG_DIR/include',
-                 '$GLEW_DIR/include',
-                 ],
-               RENDERER_LIB_PATH =  [
-                 '$GLEW_DIR/lib',
-                 ],
-               RENDERER_LIBS = [
-                 'MacStaticGLEW',
-                 ],
-               CXXFLAGS = [
-                 '-Wno-deprecated',
-                 ],
-               CCFLAGS = [
-                 '-mmacosx-version-min=10.4'
-                 ],
-               BUILD_COMPONENTS = [
-                 'event',
-                 'statsreport',
-                 'statsreport/common',
-                 ],
-)
-
-def AddMacDebugSettings(env):
-  env.Append(
-      CCFLAGS = ['-g'],
-      CPPDEFINES = ['_DEBUG']
-  )
-  env.Replace(
-      DEBUG = True,
-      NACL_VARIANT = 'dbg-mac',
-  )
-
-def AddMacOptimizedSettings(env):
-  env.Append(
-      BUILD_GROUPS = ['most'],
-      CCFLAGS = ['-O3'],
-      CPPDEFINES = ['NDEBUG', 'ANTLR3_NO_DEBUGGER']
-  )
-  env.Replace(
-      DEBUG = False,
-      NACL_VARIANT = 'opt-mac',
-  )
-
-
-mac_debug_env = mac_env.Clone(
-    BUILD_TYPE = 'dbg-mac',
-    BUILD_TYPE_DESCRIPTION = 'MacOS debug build',
-    DEBUG = True,
-    NACL_VARIANT = 'dbg-mac',
-)
-
-AddMacDebugSettings(mac_debug_env)
-environment_list.append(mac_debug_env)
-
-mac_optimized_env = mac_env.Clone(
-    BUILD_TYPE = 'opt-mac',
-    BUILD_TYPE_DESCRIPTION = 'MacOS optimized build',
-)
-
-AddMacOptimizedSettings(mac_optimized_env)
-environment_list.append(mac_optimized_env)
-
-mac_test_optimized_env = mac_optimized_env.Clone(
-    BUILD_TYPE = 'test-opt-mac',
-    BUILD_TYPE_DESCRIPTION = 'MacOS optimized build for testing',
-)
-AddTestingFlags(mac_test_optimized_env)
-environment_list.append(mac_test_optimized_env)
-
-mac_debug_env.Append(
-  BUILD_GROUPS = ['default', 'most'],
-)
-
-
-# Linux ------------------------------------------------------------------
-
-linux_env = binaries_env.Clone(
-    tools = ['target_platform_linux'],
-    FIREFOX_PLUGIN_DIR = '/home/$USER/.mozilla/plugins',
-    CG_DIR = '$CG_BASE_DIR/linux',
-)
-linux_env.FilterOut(CPPDEFINES = ['OS_LINUX=OS_LINUX'])
-if base_env.Bit('host_linux'):
-  linux_env.ParseConfig('pkg-config --cflags --libs gtk+-2.0')
-
-linux_env.Append(
-    RENDERER_INCLUDE_PATH = [
-        '$GLEW_DIR/include',
-        '$CG_DIR/include',
-    ],
-    RENDERER_LIB_PATH = [
-        '$CG_DIR/lib',
-        '$GLEW_DIR/lib',
-    ],
-    RENDERER_LIBS = [
-        'GL',
-        'GLEW',
-        'Cg',
-        'CgGL',
-    ],
-    CPPDEFINES = [
-        'RENDERER_GL',
-        'LINUX',
-        ['NACL_LINUX', '1'],
-        'SK_BUILD_FOR_UNIX'
-    ],
-    CCFLAGS = ['-Wstrict-aliasing', '-fvisibility=hidden', '-m32'],
-    LINKFLAGS = ['-m32'],
-    LIBS = ['pthread', 'rt', 'dl'],
-    NACL_HTP_LIBS = ['ssl', 'crypto'],
-    BUILD_COMPONENTS = [
-        'installer/linux',
-        'event',
-    ],
-)
-
-linux_cg_dir = ARGUMENTS.get('linux-cg-dir', 'hermetic')
-if linux_cg_dir != 'hermetic':
-  linux_cg_dir = linux_cg_dir or '/usr'
-  linux_env['CG_DIR'] = linux_cg_dir
-linux_glew_dir = ARGUMENTS.get('linux-glew-dir', 'hermetic')
-if linux_glew_dir != 'hermetic':
-  linux_glew_dir = linux_glew_dir or '/usr'
-  linux_env['GLEW_DIR'] = linux_glew_dir
-
-
-linux_debug_env = linux_env.Clone(
-    BUILD_TYPE = 'dbg-linux',
-    BUILD_TYPE_DESCRIPTION = 'Linux debug build',
-    DEBUG = True,
-    NACL_VARIANT = 'dbg-linux',
-)
-linux_debug_env.Append(
-    CCFLAGS = ['-g'],
-    BUILD_GROUPS = ['default']
-)
-environment_list.append(linux_debug_env)
-
-
-linux_optimized_env = linux_env.Clone(
-    BUILD_TYPE = 'opt-linux',
-    BUILD_TYPE_DESCRIPTION = 'Linux optimized build',
-    DEBUG = False,
-    NACL_VARIANT = 'opt-linux',
-)
-linux_optimized_env.Append(
-    CCFLAGS = ['-O3'],
-    CPPDEFINES = ['-DNDEBUG', '-DANTLR3_NO_DEBUGGER'],
-)
-environment_list.append(linux_optimized_env)
-
-# Documentation -------------------------------------------------------------
-
-docs_env = base_env.Clone(
-    BUILD_TYPE = 'docs',
-    BUILD_TYPE_DESCRIPTION = 'Documentation for all platforms',
-    HOST_PLATFORMS = ['WINDOWS', 'LINUX', 'MAC'],
-    BUILD_COMPONENTS = ['documentation'],
-)
-docs_env.Append(BUILD_GROUPS = ['default', 'most'])
-environment_list.append(docs_env)
-
-# Code Coverage -------------------------------------------------------------
-
-windows_d3d_coverage_env = windows_d3d_debug_env.Clone(
-    BUILD_TYPE = 'coverage-d3d',
-    BUILD_TYPE_DESCRIPTION = 'Windows DirectX code coverage build',
-    tools = ['code_coverage'],
-)
-windows_d3d_coverage_env.FilterOut(BUILD_GROUPS = ['default', 'most'])
-environment_list.append(windows_d3d_coverage_env)
-
-windows_gl_coverage_env = windows_gl_debug_env.Clone(
-    BUILD_TYPE = 'coverage-gl',
-    BUILD_TYPE_DESCRIPTION = 'Windows OpenGL code coverage build',
-    tools = ['code_coverage'],
-)
-windows_gl_coverage_env.FilterOut(BUILD_GROUPS = ['default', 'most'])
-environment_list.append(windows_gl_coverage_env)
-
-linux_coverage_env = linux_debug_env.Clone(
-    BUILD_TYPE = 'coverage-linux',
-    BUILD_TYPE_DESCRIPTION = 'Linux code coverage build',
-    tools = ['code_coverage'],
-)
-linux_coverage_env.FilterOut(BUILD_GROUPS = ['default', 'most'])
-environment_list.append(linux_coverage_env)
-
-mac_coverage_env = mac_debug_env.Clone(
-    BUILD_TYPE = 'coverage-mac',
-    BUILD_TYPE_DESCRIPTION = 'Mac code coverage build',
-    tools = ['code_coverage'],
-)
-mac_coverage_env.FilterOut(BUILD_GROUPS = ['default', 'most'])
-environment_list.append(mac_coverage_env)
-
-
-# Build the world.
-BuildComponents(environment_list)
-
-
-# Generate a solution, defer to the end.
-solution_env = base_env.Clone(tools = ['visual_studio_solution'])
-solution = solution_env.Solution(
-    'o3d', environment_list,
-    exclude_pattern = '.*third_party.*',
-    extra_build_targets = {
-        'Firefox': 'c:/Program Files/Mozilla FireFox/firefox.exe',
-        'unit_tests': '$ARTIFACTS_DIR/unit_tests.exe',
-        'system_tests': '$ARTIFACTS_DIR/system_tests.exe',
-        'converter': '$ARTIFACTS_DIR/o3dConverter.exe',
-    },
-)
-solution_env.Alias('solution', solution)
diff --git a/o3d/nbguidgen/build.scons b/o3d/nbguidgen/build.scons
deleted file mode 100644
index 8dbd45f..0000000
--- a/o3d/nbguidgen/build.scons
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.
-
-
-Import('env')
-
-if env.Bit('windows'):
-  env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'],
-             LIBS=['ole32'])
-
-inputs = [
-  'win/md5.cc',
-  'win/nbguidgen.cc',
-  ]
-
-exe = env.ComponentProgram('nbguidgen', inputs)
-# Copy the resulting executable to the Artifacts directory.
-exe_install = env.Replicate('$ARTIFACTS_DIR', [exe])
diff --git a/o3d/plugin/build.scons b/o3d/plugin/build.scons
deleted file mode 100644
index ba3425f..0000000
--- a/o3d/plugin/build.scons
+++ /dev/null
@@ -1,452 +0,0 @@
-# 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.
-
-
-import os.path
-import sys
-Import('env')
-env.SConscript('$SCONSTRUCT_DIR/plugin/idl_list.scons')
-Import('O3D_IDL_SOURCES')
-
-env.Tool('replace_strings')
-env.Append(O3D_PLUGIN_DESCRIPTION=
-           '$O3D_PLUGIN_NAME version:$O3D_PLUGIN_VERSION',
-           O3D_PLUGIN_MIME_TYPE='application/vnd.o3d.auto')
-
-plugin_replace_strings = [
-    ('@@@PluginName@@@', env.subst('$O3D_PLUGIN_NAME')),
-    ('@@@ProductVersionCommas@@@',
-     env.subst('$O3D_PLUGIN_VERSION_COMMAS')),
-    ('@@@ProductVersion@@@', env.subst('$O3D_PLUGIN_VERSION')),
-    ('@@@PluginDescription@@@', env.subst('$O3D_PLUGIN_DESCRIPTION')),
-    ('@@@PluginMimeType@@@', env.subst('$O3D_PLUGIN_MIME_TYPE')),
-]
-
-# TODO: collapse these if possible.
-env.Append(GLUE_DIR = env.Dir('glue'),
-           NIXYSA_STATIC_GLUE = '$NIXYSA_DIR/static_glue/npapi')
-
-if env.Bit('windows'):
-  testing_inputs = [
-    'win/plugin_metrics-win32.cc',
-    'win/plugin_logging-win32.cc',
-  ]
-elif env.Bit('mac'):
-  testing_inputs = [
-    'mac/plugin_metrics-mac.cc',
-    'mac/plugin_logging-mac.mm',
-  ]
-
-# Add Skia include paths
-env.Append(CPPPATH=['$SKIA_DIR/include/core',
-                    '$SKIA_DIR/include/effects'])
-
-# Build a library for testing.
-# Currently windows and mac.
-if env.Bit('windows') or env.Bit('mac'):
-  logging_lib = env.ComponentLibrary('o3dPlugin_logging', testing_inputs)
-
-# vista SDK provides an incompatible version of npapi.h, so make sure we
-# prepend our blessed version.
-env.Prepend(CPPPATH = ['$NPAPI_DIR/include'])
-env.Append(
-    CPPPATH = [
-        'cross',
-        '$GLUE_DIR',
-        '$NIXYSA_STATIC_GLUE',
-        '$SCONSTRUCT_DIR/plugin/win',  # for RES resource.h
-        '$WTL_71_DIR/include',
-        '$THIRD_PARTY',
-        ],
-    LIBPATH = [
-        '$NACL_LIB_DIR',
-    ],
-    LIBS = [
-#       'o3dBreakpad',
-        'o3dArchive',
-        'o3dCore',
-        'o3dArchive',
-        'o3dCorePlatform',
-        'o3dUtils',
-        'google_nacl_imc',
-        'o3d_base',
-        'v8',
-        'skia',
-    ],
-)
-
-
-if env.Bit('windows'):
-  env.Append(
-    LIBS = [
-      'advapi32',
-      'o3dBreakpad',
-      'o3dStatsreport_Common',
-      'o3dStatsreport',
-      'shell32',
-      'shlwapi',
-      ],
-    CPPDEFINES = ['XP_WIN']
-  )
-
-
-
-if env.Bit('mac'):
-  if env['DEBUG']:
-    env['MAC_BREAKPAD_CONFIG'] = 'Debug'
-  else:
-    env['MAC_BREAKPAD_CONFIG'] = 'Release'
-  env.Append(
-    MAC_BREAKPAD_SRC_DIR = '$BREAKPAD_DIR/client/mac',
-    # TODO: is there a way to tell xcodebuild to output the build in
-    # scons-out instead of the source tree ?
-    MAC_BREAKPAD_DIR = '$MAC_BREAKPAD_SRC_DIR/build/$MAC_BREAKPAD_CONFIG',
-    LIBS = [
-      'o3dStatsreport_Common',
-      'o3dStatsreport',
-      'event',
-      logging_lib,
-    ],
-    FRAMEWORKS = [
-      'Carbon',
-      'OpenGL',
-      'Cg',
-      'AGL',
-      'Foundation',
-      'Breakpad',
-      'Cocoa',
-      'IOKit',
-      'QuickTime',
-     ],
-     CCFLAGS = ['-F$MAC_BREAKPAD_DIR',
-                '-F$CG_DIR'],
-     CPPPATH = ['mac', '$MAC_BREAKPAD_SRC_DIR/Framework'],
-     CPPDEFINES = ['XP_MACOSX']
-  )
-
-if env.Bit('linux'):
-  env.Append(
-      CPPDEFINES = ['XP_UNIX', 'MOZ_X11'],
-      LIBS = [
-        'event',
-      ],
-  );
-
-# Add libraries based on the requested renderer
-env.Append(CPPPATH = env['RENDERER_INCLUDE_PATH'],
-           LIBPATH = env['RENDERER_LIB_PATH'],
-           LIBS = env['RENDERER_LIBS'] + env['ICU_LIBS'])
-
-
-def NixysaEmitter(target, source, env):
-  bases = [os.path.splitext(s.name)[0] for s in source] + ['globals']
-  targets = ['glue/%s_glue.cc' % b for b in bases]
-  targets += ['glue/%s_glue.h' % b for b in bases]
-  return targets, source
-
-AUTOGEN_ARGS = ['$NIXYSA_DIR/codegen.py',
-                '--binding-module=o3d:plugin/o3d_binding.py',
-                '--generate=npapi',
-                '--output-dir=$GLUE_DIR',
-                '$SOURCES']
-
-env['PYTHONPATH'] = ['$NIXYSA_DIR',
-                     '$GFLAGS_DIR/python',
-                     '$PLY_DIR']
-env['BUILDERS']['Nixysa'] = Builder(action=env.Python(AUTOGEN_ARGS),
-                                    emitter=NixysaEmitter)
-AUTOGEN_OUTPUT = env.Nixysa(O3D_IDL_SOURCES)
-env.SideEffect('glue/hash', AUTOGEN_OUTPUT)
-AUTOGEN_CC_FILES = [f for f in AUTOGEN_OUTPUT if f.suffix == '.cc']
-
-inputs = AUTOGEN_CC_FILES + [
-  'cross/async_loading.cc',
-  'cross/archive_request_static_glue.cc',
-  'cross/blacklist.cc',
-  'cross/main_thread_task_poster.cc',
-  'cross/o3d_glue.cc',
-  'cross/np_v8_bridge.cc',
-  'cross/out_of_memory.cc',
-  'cross/stream_manager.cc',
-  'cross/texture_static_glue.cc',
-  'cross/config_common.cc',
-]
-
-env_version = env.Clone()
-env_version.Append(
-    CPPDEFINES = [
-        ('O3D_PLUGIN_NAME', '\\"$O3D_PLUGIN_NAME\\"'),
-        ('O3D_PLUGIN_DESCRIPTION', '\\"$O3D_PLUGIN_DESCRIPTION\\"'),
-        ('O3D_PLUGIN_MIME_TYPE', '\\"$O3D_PLUGIN_MIME_TYPE\\"')
-    ])
-
-idlglue_static_sources = [
-    'common',
-    'static_object',
-    'npn_api',
-]
-env_idlglue = env.Clone()
-
-# TODO: figure out resources on the mac.
-if env.Bit('windows'):
-  env.ReplaceStrings(
-      'win/o3dPlugin.rc', 'win/o3dPlugin.rc_template',
-      REPLACE_STRINGS = plugin_replace_strings
-  )
-  if env['DEBUG']:
-    # release v8 brings libcmt that conflicts with libcmtd
-    env.Append(LINKFLAGS=['/NODEFAULTLIB:LIBCMT'])
-  env_idlglue.Append(CPPDEFINES=['OS_WINDOWS'])
-  inputs += [env_idlglue.ComponentObject(s, '$NIXYSA_STATIC_GLUE/%s.cc' % s)
-             for s in idlglue_static_sources]
-  inputs += env_version.ComponentObject('cross/main', 'cross/main.cc')
-  inputs += [
-    logging_lib,
-    'win/main_win.cc',
-    'win/config.cc',
-    'win/o3dPlugin.def',
-    'win/update_lock.cc',
-    env.RES('win/o3dPlugin.rc'),
-  ]
-
-
-if env.Bit('linux'):
-  env_idlglue.Append(CPPDEFINES=['OS_LINUX'])
-  inputs += [env_idlglue.SharedObject(s, '$NIXYSA_STATIC_GLUE/%s.cc' % s)
-             for s in idlglue_static_sources]
-  inputs += env_version.SharedObject('cross/main', 'cross/main.cc')
-  inputs += [
-    'linux/main_linux.cc',
-    'linux/config.cc',
-  ]
-  # This sets the rpath property on the generated shared object, which specifies
-  # additional paths that the run-time linker/loader will search for its
-  # dependent shared libraries. We install libGLEW, libCg, and libCgGL to here.
-  env.Append(RPATH=['/opt/google/o3d/lib'])
-
-
-# SCons doesn't really know about MacOSX bundles, so we need to override a
-# lot of its behavior to make one, ie -bundle flag, no lib prefix, no .dylib suffix.
-if env.Bit('mac'):
-  breakpad_framework = env.Command(
-      env.Dir('$MAC_BREAKPAD_DIR/Breakpad.framework'),
-      env.Dir('$MAC_BREAKPAD_SRC_DIR/Breakpad.xcodeproj'),
-      ' '.join(['cd $MAC_BREAKPAD_SRC_DIR &&',
-                'xcodebuild',
-                '-project Breakpad.xcodeproj',
-                '-target Breakpad',
-                '-configuration $MAC_BREAKPAD_CONFIG']))
-  plugin_mac_object = env.SharedObject('mac/plugin_mac', 'mac/plugin_mac.mm')
-  env.Requires(plugin_mac_object, breakpad_framework)
-
-  env_idlglue.Append(CPPDEFINES=['OS_MACOSX'])
-  inputs += [env_idlglue.SharedObject(s, '$NIXYSA_STATIC_GLUE/%s.cc' % s)
-             for s in idlglue_static_sources]
-  inputs += env_version.SharedObject('cross/main', 'cross/main.cc')
-  inputs += [
-    'mac/main_mac.mm',
-    'mac/config_mac.mm',
-    'mac/graphics_utils_mac.mm',
-    plugin_mac_object
-  ]
-
-  env['SHLINKFLAGS'] = ['-bundle',
-                        '-F$MAC_BREAKPAD_DIR',
-                        '-F$CG_DIR',
-                        ]
-  env['SHLIBPREFIX'] = ['']
-  env['SHLIBSUFFIX'] = ['']
-  plugin_dll = env.SharedLibrary('O3D', inputs)
-  plugin_artifacts = env.Replicate('$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/', plugin_dll)
-
-  # insert version number into Info.plist
-  env.ReplaceStrings(
-      'mac/processed/Info.plist', '$SCONSTRUCT_DIR/plugin/mac/Info.plist',
-      REPLACE_STRINGS = plugin_replace_strings
-  )
-
-  # copy mac resource data
-  env.Replicate('$ARTIFACTS_DIR/O3D.plugin/Contents/',
-      '$SCONSTRUCT_DIR/plugin/mac/Resources')
-  env.Replicate('$ARTIFACTS_DIR/O3D.plugin/Contents',
-      'mac/processed/Info.plist')
-
- # Make a string substituted version of o3d_plugin.r in the artifacts
- # directory.
-  env.ReplaceStrings(
-    '$ARTIFACTS_DIR/o3d_plugin.r', 'mac/o3d_plugin.r',
-    REPLACE_STRINGS = plugin_replace_strings
-  )
-  # Compile the string substituted o3d_plugin.r to make O3D.rsrc
-  env.Command('$ARTIFACTS_DIR/O3D.plugin/Contents/Resources/O3D.rsrc',
-             ['$ARTIFACTS_DIR/o3d_plugin.r'],
-             [
-             'Rez -useDF "$ARTIFACTS_DIR/o3d_plugin.r" -o "$ARTIFACTS_DIR/O3D.plugin/Contents/Resources/O3D.rsrc"'
-             ])
-
-  if env['DEBUG']:
-    stripCmd = 'echo debug build, no strip'
-  else:
-    stripCmd = 'strip -S "$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/O3D"'
-
-  # Cleanup end result
-  created_installer = env.Command('$ARTIFACTS_DIR/plugin_done',
-              [env.Dir('$ARTIFACTS_DIR/O3D.plugin')],
-              [
-              'xcodebuild -project installer/mac/O3D_Stats/O3D_Stats.xcodeproj -configuration Release',
-              'ditto "$SCONSTRUCT_DIR/installer/mac/O3D_Stats/build/Release/O3D_Stats.bundle" "$ARTIFACTS_DIR/O3D_Stats.bundle"',
-              # Because the frameworks are inside a plugin bundle (not application bundle) the plugin executable needs to be
-              # tweaked to reference their paths via @loader_path instead of @executable_path.
-              '$SCONSTRUCT_DIR/plugin/mac/Tools/fix_install_names.sh $ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/O3D',
-
-              # make a copy of the executable, before we strip all the symbols
-              'rm -f "$ARTIFACTS_DIR/O3D"',
-              'cp -f "$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/O3D" "$ARTIFACTS_DIR/O3D"',
-              stripCmd,
-              # Delete frameworks so we start fresh, and ditto can't get confused
-              Delete("$ARTIFACTS_DIR/O3D.plugin/Contents/Frameworks/"),
-              # Use ditto, not Replicate() as Replicate mangles the symlinks.
-              # The use of ditto also lets us strip the frameworks down to just i386, which saves a lot of space.
-              'ditto --arch i386 "$MAC_BREAKPAD_DIR/Breakpad.framework" "$ARTIFACTS_DIR/O3D.plugin/Contents/Frameworks/Breakpad.framework"',
-              '/usr/bin/install_name_tool -change '
-              '@executable_path/../Frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib '
-              '@loader_path/Resources/breakpadUtilities.dylib '
-              '"$ARTIFACTS_DIR/O3D.plugin/Contents/Frameworks/Breakpad.framework/Breakpad"',
-              'ditto --arch i386 "$CG_DIR/Cg.framework" "$ARTIFACTS_DIR/O3D.plugin/Contents/Frameworks/Cg.framework"',
-              # Delete private frameworks headers.
-              'find "$ARTIFACTS_DIR/O3D.plugin/Contents/Frameworks" -iname "*.h" -delete',
-              'find "$ARTIFACTS_DIR/O3D.plugin/Contents/Frameworks" -iname "Headers" -type l -delete',
-              'find "$ARTIFACTS_DIR/O3D.plugin/Contents/Frameworks" -iname "Headers" -type d -prune -delete',
-              Touch("$ARTIFACTS_DIR/O3D.plugin/"),
-              Touch('$ARTIFACTS_DIR/plugin_done')
-              ])
-
-  # Upload crash symbols to crash server.
-  if int(ARGUMENTS.get('O3D_ENABLE_BREAKPAD', 0)):
-       env.Command('$ARTIFACTS_DIR/O3D.sym.breakpad',
-                   created_installer,
-                   ['echo "UPLOADING SYMBOLS TO go/crash"',
-                    ' '.join(['"$MAC_BREAKPAD_PREBUILT_DIR/dump_syms"',
-                              '"$ARTIFACTS_DIR/O3D"',
-                              '> $ARTIFACTS_DIR/O3D.sym.breakpad']),
-                    ' '.join(['"$MAC_BREAKPAD_PREBUILT_DIR/symupload"',
-                              '"$ARTIFACTS_DIR/O3D.sym.breakpad"',
-                              'http://crash-symbols:3842/upload'])
-                              ])
-
-  env['MAC_INSTALLER_DIR'] = env['SCONSTRUCT_DIR'] + '/../o3d-internal/mac_installer'
-  env['MAC_INSTALLER_PROJECT'] = 'o3d.packproj'
-  # Default is to make the installer.
-  make_installer = int(ARGUMENTS.get('MAKE_INSTALLER', 1)) and os.path.exists(env['MAC_INSTALLER_DIR'] + '/' + env['MAC_INSTALLER_PROJECT'])
-
-
-  if make_installer:
-    env.ReplaceStrings(
-      "$ARTIFACTS_DIR/postflight.sh", '$MAC_INSTALLER_DIR/postflight.sh',
-      REPLACE_STRINGS = plugin_replace_strings
-    )
-    if int(ARGUMENTS.get('MAC_KILLSWITCH', 0)):
-      kill_command = 'rm "$ARTIFACTS_DIR/O3D.plugin/Contents/MacOS/O3D"'
-    else:
-      kill_command = 'echo normal binary'
-    # Cleanup end result and build the installer
-    env.Command(env.Dir('$ARTIFACTS_DIR/O3D.mpkg'),
-                [
-                  "$ARTIFACTS_DIR/plugin_done",
-                  "$ARTIFACTS_DIR/postflight.sh",
-                ],
-                [
-                # Delete first as Copy can fail to overwrite if the packproj is locked
-                Delete("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT"),
-                # Copy installer project file into artifacts so it can operate on files local to own directory
-                # and so work on debug or release builds without change.
-                Copy("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT",
-                     '$MAC_INSTALLER_DIR/$MAC_INSTALLER_PROJECT'),
-                'ditto  "$MAC_INSTALLER_DIR/GoogleSoftwareUpdate.pkg" "$ARTIFACTS_DIR/GoogleSoftwareUpdate.pkg"',
-                # Make the installer.
-                kill_command,
-                'freeze "$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT"',
-                # Delete temp files in artifacts now we are done.
-                Delete("$ARTIFACTS_DIR/$MAC_INSTALLER_PROJECT")
-                ])
-
-    env.Command('$ARTIFACTS_DIR/o3d.dmg',
-              [
-                env.Dir('$ARTIFACTS_DIR/O3D.mpkg'),
-              ],
-              [
-              Delete("$ARTIFACTS_DIR/DMG_SRC"),
-              'mkdir "$ARTIFACTS_DIR/DMG_SRC"',
-              'cp "$MAC_INSTALLER_DIR/.keystone_install" "$ARTIFACTS_DIR/DMG_SRC"',
-              'ditto "$ARTIFACTS_DIR/O3D.mpkg" "$ARTIFACTS_DIR/DMG_SRC/O3D.mpkg"',
-              'hdiutil create -srcfolder "$ARTIFACTS_DIR/DMG_SRC" -size 30mb -ov -fs HFS+ -imagekey zlib-level=9 -volname "O3D $O3D_PLUGIN_VERSION" "$ARTIFACTS_DIR/o3d.dmg"',
-              Delete("$ARTIFACTS_DIR/DMG_SRC"),
-              ])
-
-
-# else build the shared library in a platform independent way
-else:
-  plugin_dll = env.SharedLibrary('npo3dautoplugin', inputs)
-# copy to artifacts
-  plugin_artifacts = env.Replicate('$ARTIFACTS_DIR', plugin_dll)
-
-if env.Bit('linux'):
-  env.Requires(plugin_artifacts, env.Replicate(
-      '$ARTIFACTS_DIR', [
-           '$CG_DIR/lib/libCg.so',
-           '$CG_DIR/lib/libCgGL.so',
-           '$GLEW_DIR/lib/libGLEW.so.1.5',
-      ]
-  ))
-
-
-# alias 'plugin' to build the plug-in in artifacts
-env.Alias('plugin', plugin_artifacts)
-
-# TODO: have a common way to do colliding installs like this.
-# Do the install step only if this variant is the first target.
-if (env['BUILD_TYPE'] == ARGUMENTS.get('MODE') or
-    (ARGUMENTS.get('MODE', 'default') == 'default' and
-     env['BUILD_TYPE'] == 'dbg-d3d')):
-  plugin_install = env.Replicate('$FIREFOX_PLUGIN_DIR', plugin_dll[0])
-  env.Alias('install', plugin_install)
-
-  if env.Bit('windows'):
-    # Copy SwiftShader to plugin dir.
-    swiftshader_path = env.subst('$SWIFTSHADER_DIR/swiftshader_d3d9.dll')
-    if os.path.exists(swiftshader_path):
-      env.Requires(plugin_install,
-          env.Replicate('$FIREFOX_PLUGIN_DIR/O3DExtras', swiftshader_path))
-
-if env.Bit('windows'):
-  # Make the logging program
-  exe = env.ComponentProgram('statsLogger',
-                             logging_lib + ['win/logger_main.cc'])
-  # Copy the resulting executable to the Artifacts directory.
-  env.Replicate('$ARTIFACTS_DIR', [exe])
diff --git a/o3d/plugin/idl_list.scons b/o3d/plugin/idl_list.scons
deleted file mode 100644
index 579778e..0000000
--- a/o3d/plugin/idl_list.scons
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.
-
-
-O3D_IDL_SOURCES = [
-  'idl/bitmap.idl',
-  'idl/bounding_box.idl',
-  'idl/buffer.idl',
-  'idl/canvas.idl',
-  'idl/canvas_paint.idl',
-  'idl/canvas_shader.idl',
-  'idl/clear_buffer.idl',
-  'idl/client.idl',
-  'idl/counter.idl',
-  'idl/cursor.idl',
-  'idl/curve.idl',
-  'idl/display_mode.idl',
-  'idl/draw_context.idl',
-  'idl/draw_element.idl',
-  'idl/draw_list.idl',
-  'idl/draw_pass.idl',
-  'idl/effect.idl',
-  'idl/element.idl',
-  'idl/event.idl',
-  'idl/field.idl',
-  'idl/file_request.idl',
-  'idl/function.idl',
-  'idl/material.idl',
-  'idl/matrix4_axis_rotation.idl',
-  'idl/matrix4_composition.idl',
-  'idl/matrix4_scale.idl',
-  'idl/matrix4_translation.idl',
-  'idl/named.idl',
-  'idl/pack.idl',
-  'idl/param_array.idl',
-  'idl/param.idl',
-  'idl/param_object.idl',
-  'idl/param_operation.idl',
-  'idl/plugin.idl',
-  'idl/primitive.idl',
-  'idl/ray_intersection_info.idl',
-  'idl/render_event.idl',
-  'idl/render_node.idl',
-  'idl/render_surface.idl',
-  'idl/render_surface_set.idl',
-  'idl/sampler.idl',
-  'idl/shape.idl',
-  'idl/skin.idl',
-  'idl/standard_param.idl',
-  'idl/state.idl',
-  'idl/state_set.idl',
-  'idl/stream.idl',
-  'idl/stream_bank.idl',
-  'idl/texture.idl',
-  'idl/tick_event.idl',
-  'idl/transform.idl',
-  'idl/tree_traversal.idl',
-  'idl/types.idl',
-  'idl/vector.idl',
-  'idl/vertex_source.idl',
-  'idl/viewport.idl',
-  'idl/archive_request.idl',
-  'idl/raw_data.idl',
-]
-
-Export('O3D_IDL_SOURCES')
diff --git a/o3d/plugin/npapi_host_control/build.scons b/o3d/plugin/npapi_host_control/build.scons
deleted file mode 100644
index 5852d58..0000000
--- a/o3d/plugin/npapi_host_control/build.scons
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.
-
-
-Import('env')
-
-env.Append(
-  CPPDEFINES = [
-    '_MIDL_USE_GUIDDEF_',
-    'DLL_NPAPI_HOST_CONTROL_EXPORT'
-  ],
-  CCFLAGS = [
-    '/Wp64',
-    '/TP',
-    '/FIplugin/npapi_host_control/win/precompile.h'
-  ],
-  CPPPATH = [
-    'win',
-    '$SCONSTRUCT_DIR/plugin/npapi_host_control/win',
-    '$NPAPI_DIR',
-  ],
-  LIBS = [
-    'wininet',
-  ],
-  LINKFLAGS = [
-    '/DEF:$SCONSTRUCT_DIR/plugin/npapi_host_control/win/npapi_host_control.def'
-  ],
-)
-
-env.Append(
-    CPPDEFINES = [
-        ('O3D_PLUGIN_NAME', '\\"$O3D_PLUGIN_NAME\\"'),
-        ('O3D_PLUGIN_DESCRIPTION', '\\"$O3D_PLUGIN_DESCRIPTION\\"'),
-        ('O3D_PLUGIN_VERSION', '\\"$O3D_PLUGIN_VERSION\\"')
-    ])
-
-resource_files = env.RES('win/npapi_host_control.rc'),
-
-inputs = [
-  'win/npapi_host_control_i.c',
-  'win/npapi_host_control.cc',
-  'win/host_control.cc',
-  'win/np_browser_proxy.cc',
-  'win/np_object_proxy.cc',
-  'win/np_plugin_proxy.cc',
-  'win/dispatch_proxy.cc',
-  'win/stream_operation.cc',
-  'win/variant_utils.cc',
-  resource_files,
-]
-
-if env['TARGET_PLATFORM'] == 'WINDOWS':
-  env['PCH'], obj  = env.PCH('win/precompile.cc')
-  env['PCHSTOP'] = 'plugin/npapi_host_control/win/precompile.h'
-  inputs += [obj]
-else:
-  inputs += ['precompile.cc']
-
-
-type_lib = env.TypeLibrary(source=['win/npapi_host_control.idl'])
-
-# Must not register the plugin while building. Only installing should
-# register the plugin.
-o3d_host_control = env.SharedLibrary('o3d_host', inputs)
-env.Requires(o3d_host_control, type_lib)
-env.Requires(resource_files, type_lib)
-
-env.Replicate('$ARTIFACTS_DIR', o3d_host_control)
-
-# TODO: have a common way to do colliding installs like this.
-# Do the install step only if this variant is the first target.
-if env.Bit('windows'):
-  if (env['BUILD_TYPE'] == ARGUMENTS.get('MODE') or
-      (ARGUMENTS.get('MODE', 'default') == 'default' and
-       env['BUILD_TYPE'] == 'dbg-d3d')):
-    i = env.Replicate('$IE_PLUGIN_DIR', o3d_host_control[0])
-    c = env.AddPostAction(i, '$REGSVR $REGSVRFLAGS $TARGET')
-    env.Alias('install', c)
diff --git a/o3d/samples/build.scons b/o3d/samples/build.scons
deleted file mode 100644
index 8ca4018..0000000
--- a/o3d/samples/build.scons
+++ /dev/null
@@ -1,352 +0,0 @@
-# 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.
-
-
-import __builtin__
-import os.path
-import re
-Import('env')
-
-class Error(Exception):
-  pass
-
-samples_output_dir = env.Dir('$OBJ_ROOT/samples').abspath
-samples_artifact_dir = env.Dir('$ARTIFACTS_DIR/samples').abspath
-
-copyright_header = """/*
- * 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.
- */
-"""
-
-def sample_emitter(env, target, source):
-  target.append(env.subst('${TARGET.base}.js', target=target, source=source))
-  return (target, source)
-
-def sample_action(target, source, env):
-  content = source[0].get_contents()
-  regexp = re.compile(r'(.*)<script(\s+type="text/javascript")' +
-                      r'(\s+charset="utf-8")?\s*>(.*)</script>(.*)', re.DOTALL)
-  m = regexp.match(content)
-  if not m:
-    raise Error('Regexp failed on input file %s' % source.abspath)
-  (html_start, type, charset, script, html_end) = m.groups()
-  if not type:
-    raise Error('Found a script that lacked the javascript tag!');
-  if not charset:
-    charset = ''
-
-  html_content = (
-      '%(html_start)s<script %(type)s%(charset)s '
-      'src="%(js_path)s"></script>%(html_end)s' %
-      {
-        'html_start' : html_start,
-        'type' : type,
-        'charset' : charset,
-        'js_path' : target[1].name,
-        'html_end' : html_end
-      })
-
-  print "Writing sample HTML to %s" % target[0].abspath
-  file(target[0].abspath, 'wb').write(html_content)
-  print "Writing sample JS to %s" % target[1].abspath
-  file(target[1].abspath, 'wb').write(copyright_header + script)
-  return None
-
-sample_builder = Builder(action = sample_action, emitter = sample_emitter)
-
-env.Append(BUILDERS = {'SplitSampleHTML' : sample_builder})
-
-# These are the files we process for the interactive sampler.
-# TODO: We don't currently verify that these samples are included in
-# interactive_samples.js, which constructs the sampler, or that all the files
-# in there are mentioned here.  The build script should parse the 
-# interactive_samples.js file instead of using this list.
-samples = [
-  '2d.html',
-  'animated-scene.html',
-  'animation.html',
-  'bitmap-draw-image.html',
-  'billboards.html',
-  'canvas-texturedraw.html',
-  'canvas.html',
-  'convolution.html',
-  'culling.html',
-  'customcamera.html',
-  'displayfps.html',
-  'error-texture.html',
-  'generate-texture.html',
-  'hellocube-colors.html',
-  'hellocube-textures.html',
-  'hellocube.html',
-  'helloworld.html',
-  'hud-2d-overlay.html',
-  'instance-override.html',
-  'instancing.html',
-  'juggler.html',
-  'julia.html',
-  'multiple-clients.html',
-  'multiple-views.html',
-  'old-school-shadows.html',
-  'particles.html',
-  'phongshading.html',
-  'picking.html',
-  'primitives.html',
-  'procedural-texture.html',
-  'render-mode.html',
-  'render-targets.html',
-  'rotatemodel.html',
-  'scatter-chart.html',
-  'shader-test.html',
-  'simple.html',
-  'simpletexture.html',
-  'skinning.html',
-  'sobel.html',
-  'stencil_example.html',
-  'texturesamplers.html',
-  'tutorial-primitive.html',
-  'vertex-shader.html',
-  'vertex-shader-animation.html',
-  'zsorting.html'
-]
-
-# Split the samples into separate HTML and JS files
-for input_file in samples:
-  destdir = os.path.join(samples_artifact_dir, os.path.dirname(input_file))
-#   env.SplitSampleHTML(os.path.join(destdir, 'sampler_' + input_file),
-#                       input_file)
-
-  # We want all the samples unprocessed, as well.
-  env.Replicate(destdir, input_file)
-
-env.Alias('samples_export', samples_artifact_dir)
-
-######################################################################
-#
-#  PLEASE NOTE: If you add samples you MUST add their files to the
-#  MANIFEST file in this directory for them to be included in the docs.
-#
-######################################################################
-
-# Here we load up the manifest so that we only include the files that
-# are part of the samples, and not any spurious test files or images
-# that might be left around.
-manifest = env.File("MANIFEST").get_contents().strip().split('\n')
-manifest = [x.strip() for x in manifest]
-
-def DeferManifestInstall(env):
-  # Only do this if we tried to convert at least some samples (which
-  # means that at least some existed when we declared their build steps).
-  if len(env.GetPublished('samples', 'asset_files')) > 0:
-    for manifest_item in manifest:
-      # TODO: Why doesn't replicate hookup things correctly?
-      env.Command('$ARTIFACTS_DIR/samples/' + manifest_item,
-                  '$MAIN_DIR/samples/' + manifest_item,
-                  [Delete('$TARGET'),
-                   Copy('$TARGET', '$SOURCE'),
-                   Chmod('$TARGET', 0777)])
-
-env.Defer(DeferManifestInstall)
-
-#######
-# Build JSON sample assets from zipped Collada files. Put them in the assets
-# directory in the source tree (so that we can run the samples from the source
-# tree).  If one is needed in the scons-out artifacts directory, that's handled
-# by the MANIFEST file.
-
-if env.Bit('mac'):
-  converter_path = env.subst('$ARTIFACTS_DIR/converter/o3dConverter$PROGSUFFIX')
-else:
-  converter_path = env.subst('$ARTIFACTS_DIR/o3dConverter$PROGSUFFIX')
-serializer_version_path = env.subst(
-    '$SCONSTRUCT_DIR/serializer/cross/version.h')
-
-def model_emitter(env, target, source):
-  # Massage the target a little bit.
-  sample_file = env.subst('${TARGET.srcdir}/${TARGET.filebase}.o3dtgz',
-                          target=target, source=source)
-  sample_file = sample_file.replace('convert_','')
-  target = [env.File(sample_file)]
-  source.append(serializer_version_path)
-  source.append(converter_path)
-  return (target, source)
-
-def model_action(target, source, env):
-  import shutil
-  import subprocess
-  import stat
-
-  # Invoke converter to generate target.
-  error = subprocess.call([
-      converter_path,
-      '--no-condition',
-      '--up-axis=%s' % env['UP_AXIS'],
-      source[0].abspath,
-      target[0].abspath,
-      ], env={'LD_LIBRARY_PATH': env.Dir('$ARTIFACTS_DIR').abspath})
-  if error != 0:
-    raise Exception('Failed to run o3dConverter on %s to produce %s' %
-        (source[0].abspath, target[0].abspath))
-
-  # Copy generated target to remaining targets. This should be faster than
-  # running the converter several times.
-  for item in target[1:]:
-    shutil.copy(target[0].abspath, item.abspath)
-    os.chmod(item.abspath, stat.S_IWRITE | stat.S_IREAD)
-
-model_builder = Builder(action = model_action, emitter = model_emitter)
-
-env.Append(BUILDERS = {'ConvertJsonSampleAssets' : model_builder})
-
-x_up_env = env.Clone(UP_AXIS='1,0,0')
-y_up_env = env.Clone(UP_AXIS='0,1,0')
-z_up_env = env.Clone(UP_AXIS='0,0,1')
-
-models = [
-  {'path': 'beachdemo/convert_assets/beachdemo.zip', 'env': z_up_env},
-  {'path': 'beachdemo/convert_assets/beach-low-poly.dae', 'env': z_up_env},
-  {'path': 'GoogleIO-2009/convert_assets/background.zip', 'env': y_up_env},
-  {'path': 'GoogleIO-2009/convert_assets/character.zip', 'env': y_up_env},
-
-  {'path': 'home-configurators/convert_cbassets/House_Roofless.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Agra_Rug.kmz', 'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Asimi_Rug.kmz', 'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Camden_Chair.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Elements_Bookshelf.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Ferrara_Rug.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Lounge_Chair.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Lounge_Chaise.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Lounge_Sofa.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Lounge_Storage_Ottoman.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Madison_Dining_Table.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Miles_Side_Chair.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Pullman_Bar_Stool.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Puzzle_TV_Stand.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Stow_Leather_Ottoman.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Tivoli_Dining_Table.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Tivoli_Miles_Dining_Set.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Troy_Chair.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Troy_Ottoman.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Troy_Sofa.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Troy_Storage_Ottoman.kmz',
-      'env': z_up_env},
-  {'path': 'home-configurators/convert_cbassets/Troy_Twin_Sleeper.kmz',
-      'env': z_up_env},
-
-
-  {'path': 'io/convert_levels/all_actors.kmz', 'env': y_up_env},
-  {'path': 'io/convert_levels/map1.kmz', 'env': y_up_env},
-
-  {'path': 'simpleviewer/convert_assets/cube.zip', 'env': y_up_env},
-
-  {'path': 'convert_assets/dome1.zip', 'env': y_up_env},
-  {'path': 'convert_assets/dome2.zip', 'env': y_up_env},
-  {'path': 'convert_assets/dome3.zip', 'env': y_up_env},
-  {'path': 'convert_assets/dome4.zip', 'env': y_up_env},
-  {'path': 'convert_assets/kitty_151_idle_stand05_cff1.zip', 'env': y_up_env},
-  {'path': 'convert_assets/part1.zip', 'env': y_up_env},
-  {'path': 'convert_assets/part2.zip', 'env': y_up_env},
-  {'path': 'convert_assets/part3.zip', 'env': y_up_env},
-  {'path': 'convert_assets/seven_shapes.zip', 'env': y_up_env},
-  {'path': 'convert_assets/stencil_frame.zip', 'env': y_up_env},
-  {'path': 'convert_assets/teapot.zip', 'env': y_up_env},
-  {'path': 'convert_assets/yard.zip', 'env': y_up_env},
-
-  {'path': 'waterdemo/convert_assets/bamboo.zip', 'env': y_up_env},
-  {'path': 'waterdemo/convert_assets/coconuts.zip', 'env': y_up_env},
-  {'path': 'waterdemo/convert_assets/driftwood.zip', 'env': y_up_env},
-  {'path': 'waterdemo/convert_assets/island.zip', 'env': y_up_env},
-  {'path': 'waterdemo/convert_assets/lazy_bridge.zip', 'env': y_up_env},
-  {'path': 'waterdemo/convert_assets/palm_leaves.zip', 'env': y_up_env},
-  {'path': 'waterdemo/convert_assets/palm_trees.zip', 'env': y_up_env},
-  {'path': 'waterdemo/convert_assets/rocks.9.zip', 'env': y_up_env},
-  {'path': 'waterdemo/convert_assets/rocks.zip', 'env': y_up_env},
-  ]
-
-# Little dance to do this only once so MODE=all works.
-try:
-  _ = __builtin__.done_json_assets
-except AttributeError:
-  __builtin__.done_json_assets = True
-  for model in models:
-    # We generate the sample assets into the samples directory directly,
-    # and the artifacts directory in the name of sanity -- so we don't
-    # have to do a build whenever we change a .js file in order to test
-    # the change.  We only generate them if the sources exist because we
-    # might not map them in all the time.
-    if os.path.exists(
-      model['env'].File("$SAMPLE_ASSETS/" + model['path']).abspath):
-      converted = model['env'].ConvertJsonSampleAssets(
-          source = "$SAMPLE_ASSETS/" + model['path'],
-          target = model['path'])
-      model['env'].Publish('samples', 'asset_files', converted);
diff --git a/o3d/samples/o3djs/js_list.scons b/o3d/samples/o3djs/js_list.scons
deleted file mode 100644
index c5fad39..0000000
--- a/o3d/samples/o3djs/js_list.scons
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.
-
-O3D_JS_SOURCES = [
-  'arcball.js',
-  'base.js',
-  'camera.js',
-  'canvas.js',
-  'debug.js',
-  'dump.js',
-  'effect.js',
-  'element.js',
-  'error.js',
-  'event.js',
-  'fps.js',
-  'io.js',
-  'loader.js',
-  'material.js',
-  'math.js',
-  'pack.js',
-  'particles.js',
-  'performance.js',
-  'picking.js',
-  'primitives.js',
-  'quaternions.js',
-  'rendergraph.js',
-  'scene.js',
-  'serialization.js',
-  'shape.js',
-  'simple.js',
-  'test.js',
-  'texture.js',
-  'util.js',
-]
-
-Export('O3D_JS_SOURCES');
-
diff --git a/o3d/serializer/build.scons b/o3d/serializer/build.scons
deleted file mode 100644
index 7cf98db..0000000
--- a/o3d/serializer/build.scons
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.
-
-
-Import('env')
-
-env.Append(
-  LIBS = [
-    'o3dSerializationObjects',
-    'o3dCore',
-    'o3dUtils',
-    'o3d_base',
-  ] + env['ICU_LIBS'],
-)
-
-# add renderer specific libraries and includes to the linker environment
-env.Append(CPPPATH = env['RENDERER_INCLUDE_PATH'],
-           LIBPATH = env['RENDERER_LIB_PATH'],
-           LIBS = env['RENDERER_LIBS'])
-
-if env.Bit('windows'):
-  env.Append(
-    CCFLAGS=['/Wp64', '/D_CRT_SECURE_NO_WARNINGS'],
-    LINKFLAGS=['/SUBSYSTEM:CONSOLE'],
-  )
-
-if env.Bit('mac'):
-  env.Append(
-    FRAMEWORKS = [
-      'Foundation',
-     ],
-  )
-
-inputs = [
-  'cross/serializer.cc',
-  'cross/serializer_binary.cc',
-]
-
-# Create library.
-lib = env.ComponentLibrary('o3dSerializer', inputs)
diff --git a/o3d/skia/build.scons b/o3d/skia/build.scons
deleted file mode 100644
index 4607003..0000000
--- a/o3d/skia/build.scons
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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.
-
-
-Import('env')
-
-env.Prepend(
-  CPPPATH = [
-    '$SKIA_DIR/include/core',
-    '$SKIA_DIR/include/ports',
-    '$SKIA_DIR/include/effects',
-  ],
-)
-
-inputs = [
-    'core/Sk64',
-    'core/SkAlphaRuns',
-    'core/SkBitmap',
-    'core/SkBitmapProcShader',
-    'core/SkBitmapProcState',
-    'core/SkBitmapProcState_matrixProcs',
-    'core/SkBitmapSampler',
-    'core/SkBitmapShader',
-    'core/SkBitmap_scroll',
-    'core/SkBlitRow_D16',
-    'core/SkBlitRow_D4444',
-    'core/SkBlitter',
-    'core/SkBlitter_4444',
-    'core/SkBlitter_A1',
-    'core/SkBlitter_A8',
-    'core/SkBlitter_ARGB32',
-    'core/SkBlitter_RGB16',
-    'core/SkBlitter_Sprite',
-    'core/SkBuffer',
-    'core/SkCanvas',
-    'core/SkChunkAlloc',
-    'core/SkColor',
-    'core/SkColorFilter',
-    'core/SkColorTable',
-    'core/SkComposeShader',
-    'core/SkCordic',
-    'core/SkDebug',
-    'core/SkDebug_stdio',
-    'core/SkDeque',
-    'core/SkDevice',
-    'core/SkDither',
-    'core/SkDraw',
-    'core/SkEdge',
-    'core/SkFilterProc',
-    'core/SkFlattenable',
-    'core/SkFloat',
-    'core/SkFloatBits',
-    'core/SkGeometry',
-    'core/SkGlobals',
-    'core/SkGlyphCache',
-    'core/SkGraphics',
-    'core/SkMask',
-    'core/SkMaskFilter',
-    'core/SkMath',
-    'core/SkMatrix',
-    'core/SkMemory_stdlib',
-#    'core/SkMMapStream',
-    'core/SkPackBits',
-    'core/SkPaint',
-    'core/SkPath',
-    'core/SkPathEffect',
-    'core/SkPathHeap',
-    'core/SkPathMeasure',
-    'core/SkPicture',
-    'core/SkPictureFlat',
-    'core/SkPicturePlayback',
-    'core/SkPictureRecord',
-    'core/SkPixelRef',
-    'core/SkPoint',
-    'core/SkProcSpriteBlitter',
-    'core/SkPtrRecorder',
-    'core/SkQuadClipper',
-    'core/SkRasterizer',
-    'core/SkRect',
-    'core/SkRefCnt',
-    'core/SkRegion',
-    'core/SkRegion_path',
-    'core/SkScalerContext',
-    'core/SkScan',
-    'core/SkScan_Antihair',
-    'core/SkScan_AntiPath',
-    'core/SkScan_Hairline',
-    'core/SkScan_Path',
-    'core/SkShader',
-    'core/SkSpriteBlitter_ARGB32',
-    'core/SkSpriteBlitter_RGB16',
-    'core/SkStream',
-    'core/SkString',
-    'core/SkStroke',
-    'core/SkStrokerPriv',
-    'core/SkTSearch',
-    'core/SkTypeface',
-    'core/SkUnPreMultiply',
-    'core/SkUtils',
-    'core/SkWriter32',
-    'core/SkXfermode',
-
-    'effects/SkBlurDrawLooper',
-    'effects/SkBlurMask',
-    'effects/SkBlurMaskFilter',
-    'effects/SkGradientShader',
-    'effects/SkLayerDrawLooper',
-    'effects/SkStrokeDrawLooper',
-
-    'ports/SkOSFile_stdio',
-    'ports/SkGlobals_global',
- ]
-
-if env.Bit('windows'):
-  inputs += [
-    'ports/SkFontHost_win',
-    'ports/SkThread_win',
-  ]
-
-if env.Bit('mac'):
-  inputs += [
-    'ports/SkFontHost_mac',
-    'ports/SkThread_pthread'
-  ]
-
-# TODO: Until the appropriate SkFontHost file is substituted here,
-#                 we won't have font support on linux.
-if env.Bit('linux'):
-  inputs += [
-    'ports/SkFontHost_none',
-    'ports/SkThread_pthread'
-  ]
-
-# gcc crashes on SkDraw.cpp when run with the -O3 flag so
-# we compile Skia with -O2 instead.
-if env.Bit('mac') or env.Bit('linux'):
-  if not env['DEBUG']:
-    env.FilterOut(CCFLAGS=['-O3'])
-    env.Append(CCFLAGS=['-O2'])
-
-objects = env.MakeObjects(inputs, '$SKIA_DIR/src', 'cpp')
-env.ComponentLibrary('skia', inputs)
diff --git a/o3d/statsreport/build.scons b/o3d/statsreport/build.scons
deleted file mode 100644
index 8a844c5..0000000
--- a/o3d/statsreport/build.scons
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.
-
-
-Import('env')
-
-env.Append(
-    LIBPATH = [ '$LIBS_DIR'
-    ],
-    LIBS = [
-        'o3d_base',
-        'o3dStatsreport_Common',
-    ],
-)
-
-INPUTS = [
-  'aggregator.cc',
-  'formatter.cc',
-  'metrics.cc',
-]
-
-if env['TARGET_PLATFORM'] == 'WINDOWS':
-  INPUTS += [
-    'aggregator-win32.cc',
-    'const-win32.cc',
-    'persistent_iterator-win32.cc',
-    'uploader_aggregation-win32.cc',
-    'uploader-win32.cc',
-  ]
-
-if env['TARGET_PLATFORM'] == 'MAC':
-  INPUTS += [
-    'aggregator-mac.mm',
-    'const-mac.mm',
-    'uploader_aggregation-mac.mm',
-    'uploader-mac.mm',
-  ]
-
-if env['TARGET_PLATFORM'] == 'POSIX':
-  INPUTS += [
-    'uploader-posix.cc',
-  ]
-
-# Build a library called 'o3dStatsreport' from the input sources.
-lib = env.ComponentLibrary('o3dStatsreport', INPUTS)
diff --git a/o3d/statsreport/common/build.scons b/o3d/statsreport/common/build.scons
deleted file mode 100644
index 489e911..0000000
--- a/o3d/statsreport/common/build.scons
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.
-
-
-Import('env')
-
-env.Append(
-  LIBPATH=[
-    '$LIBS_DIR'
-  ],
-  LIBS = ['o3d_base']
-)
-
-INPUTS = []
-
-if env['TARGET_PLATFORM'] == 'WINDOWS':
-  INPUTS += [
-    'highres_timer-win32.cc',
-  ]
-
-if env['TARGET_PLATFORM'] == 'MAC':
-  INPUTS += [
-    'highres_timer-mac.cc',
-  ]
-
-# Build a library called 'o3dStatsreport_Common' from the input sources.
-env.ComponentLibrary('o3dStatsreport_Common', INPUTS)
diff --git a/o3d/svn_paths.scons b/o3d/svn_paths.scons
deleted file mode 100644
index 99ec5de..0000000
--- a/o3d/svn_paths.scons
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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.
-
-
-import os
-import sys
-
-Import('env')
-env.Replace(
-    GOOGLECLIENT = '$SCONSTRUCT_DIR',
-    THIRD_PARTY = '$GOOGLECLIENT/third_party',
-
-    # A whole bunch of third-party and internal dependencies
-    ANTLRLIBC_DIR = '$THIRD_PARTY/antlr3/runtime/C',
-    ANTLR_DIR = '$THIRD_PARTY/antlr3/lib',
-    BREAKPAD_DIR = '$THIRD_PARTY/breakpad',
-    CG_BASE_DIR = '$THIRD_PARTY/cg/files',
-    # TODO: pull from Chrome's SVN with gclient ?
-    CHROME_SRC_DIR = '$THIRD_PARTY/chrome/files',
-    COLLADA_DIR = '$THIRD_PARTY/fcollada/files',
-    DOXYGEN_DIR = '$THIRD_PARTY/doxygen',
-    GFLAGS_DIR = '$THIRD_PARTY/gflags',
-    GLEW_DIR = '$THIRD_PARTY/glew/files',
-    GMOCK_DIR = '$THIRD_PARTY/gmock/files',
-    GTEST_DIR = '$THIRD_PARTY/gtest/files',
-    # TODO: pull from Chrome's SVN with gclient ?
-    ICU38_DIR = '$THIRD_PARTY/icu38/files',
-    INTERNAL_DIR = '$SCONSTRUCT_DIR/../o3d-internal',
-    JPEG_DIR = '$THIRD_PARTY/jpeg/src',
-    JSDOCTOOLKIT_DIR = '$THIRD_PARTY/jsdoctoolkit/files',
-    MAC_BREAKPAD_PREBUILT_DIR = '$INTERNAL_DIR/GoogleBreakpad',
-    LIBEVENT_DIR = '$THIRD_PARTY/libevent',
-    # To run selenium tests you will need a tgz'ed copy of firefox.
-    # Specify the path to it below.
-    # See tests/build.scons
-    MAC_HERMETIC_FIREFOX_DIR = (
-        '$INTERNAL_DIR/third_party/firefox'),
-    # If we have directx redistributables present,
-    # then build o3dextras.
-    DIRECTX_REDIST_DIR=(
-        '$INTERNAL_DIR/third_party/dx_nov_2007_redist'),
-    # 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',
-    NPAPI_DIR = '$THIRD_PARTY/npapi',
-    PDIFF_DIR = '$THIRD_PARTY/pdiff/files',
-    PLY_DIR = '$THIRD_PARTY/ply',
-    PNG_DIR = '$THIRD_PARTY/png/src',
-    SCONS_DIR = '$THIRD_PARTY/scons',
-    SELENIUM_JAVA_DIR = '$THIRD_PARTY/selenium_rc/files/selenium-server',
-    SELENIUM_PYTHON_DIR = (
-        '$THIRD_PARTY/selenium_rc/files/selenium-python-client-driver'),
-    # TODO: pull from SVN with gclient ?
-    SKIA_DIR = '$THIRD_PARTY/skia',
-    SWIFTSHADER_DIR = '$INTERNAL_DIR/third_party/swiftshader/files',
-    # TODO: pull from SVN with gclient ?
-    V8_SRC_DIR = '$THIRD_PARTY/v8',
-    WIX_DIR = '$THIRD_PARTY/wix_2_0_4221/files',
-    ZIP_UTILS_DIR = '$THIRD_PARTY/zip_utils/files',
-    ZLIB_DIR = '$THIRD_PARTY/zlib/files',
-    # Big stuff that we don't want to be part of the chrome tree.
-    SAMPLE_ASSETS = '$GOOGLECLIENT/o3d_assets/samples',
-    TEST_REFERENCE_IMAGES = '$GOOGLECLIENT/o3d_assets/tests/screenshots',
-)
-if env.Bit('host_windows'):
-  import _winreg
-  try:
-    dxsdk_dir = os.environ['DXSDK_DIR']
-  except KeyError:
-    print 'The DirectX SDK needs to be installed, and the DXSDK_DIR environment'
-    print 'variable must point to the installation directory.'
-    sys.exit(1)
-  try:
-    winsdk_key = _winreg.OpenKey(
-        _winreg.HKEY_LOCAL_MACHINE,
-        'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0\\WinSDKBuild')
-  except WindowsError:
-    try:
-      winsdk_key = _winreg.OpenKey(
-          _winreg.HKEY_LOCAL_MACHINE,
-          'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.0A\\VistaClientHeadersLibs')
-    except WindowsError:
-      try:
-        winsdk_key = _winreg.OpenKey(
-            _winreg.HKEY_LOCAL_MACHINE,
-            'SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v6.1\\WinSDKBuild')
-      except WindowsError:
-        print 'The Windows SDK version 6.0 or later needs to be installed'
-        sys.exit(1)
-  try:
-    winsdk_dir, value_type = _winreg.QueryValueEx(winsdk_key,
-                                                  'InstallationFolder')
-  except WindowsError:
-    print 'The Windows SDK version 6.0 or later needs to be installed'
-    sys.exit(1)
-  _winreg.CloseKey(winsdk_key)
-  # Strip off trailing slashes
-  winsdk_dir = winsdk_dir.rstrip('\\/')
-  dxsdk_dir = dxsdk_dir.rstrip('\\/')
-  env.Replace(JAVA_EXE = '%SystemRoot%\\system32\\java.exe',
-              PLATFORM_SDK_VISTA_6_0_DIR = winsdk_dir,
-              DIRECTX9_18_944_0_PARTIAL_DIR = dxsdk_dir,
-              DOXYGEN = '$DOXYGEN_DIR/win/doxygen.exe')
-  try:
-    env['ENV']['PATH'] = "%s%s%s" % (env['ENV']['PATH'], os.pathsep,
-                                     os.path.join(winsdk_dir, 'Bin'))
-  except KeyError:
-    env['ENV']['PATH'] = os.path.join(winsdk_dir, 'Bin')
-else:
-  env.Replace(JAVA_EXE = 'java')
-  if env.Bit('host_linux'):
-    env.Replace(DOXYGEN = '$DOXYGEN_DIR/linux/doxygen')
-  else:
-    env.Replace(DOXYGEN = '$DOXYGEN_DIR/osx/doxygen')
diff --git a/o3d/tests/common/build.scons b/o3d/tests/common/build.scons
deleted file mode 100644
index 69db65f..0000000
--- a/o3d/tests/common/build.scons
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.
-
-
-Import('env')
-
-env.Append(CPPPATH = ['$RENDERER_INCLUDE_PATH'])
-
-inputs = [
-  "cross/main.cc",
-]
-
-if env.Bit('windows'):
-  inputs += [
-      "win/dxcapture.cc",
-      "win/testing_common.cc",
-  ]
-
-if env.Bit('linux'):
-  inputs += [
-      "linux/testing_common.cc",
-  ]
-
-if env.Bit('mac'):
-  inputs += [
-      "mac/testing_common.mm",
-  ]
-
-o3dcore_lib = env.ComponentLibrary("testing_common", inputs)
diff --git a/o3d/v8/build.scons b/o3d/v8/build.scons
deleted file mode 100644
index 43e332f..0000000
--- a/o3d/v8/build.scons
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.
-
-import __builtin__
-import os
-import sys
-import SCons.Script.SConsOptions
-
-Import('env')
-
-try:
-  _ = __builtin__.v8_built
-  Return()
-except AttributeError:
-  __builtin__.v8_built = True
-
-
-if env.Bit('windows'):
-  script_suffix = '.bat'
-else:
-  script_suffix = '.sh'
-
-env = env.Clone(
-    V8_MODE = 'release',
-    V8_MODE_DIR = '$V8_SRC_DIR/obj/$V8_MODE',
-    V8_SCONS_COM = '$PYTHON $SCONS -C $V8_SRC_DIR -f SConstruct '
-                   '$DEBUG_OPTS mode=$V8_MODE importenv=INCLUDE,LIB,CCFLAGS',
-    SCONS = '$SCONS_DIR/scons.py',
-    DEBUG_OPTS = ['--debug=%s' % item for item in GetOption('debug')]
-)
-
-# Rather than build v8 with our own commands, we just shell out to v8's
-# own SCons-based build, since their build system is complicated.
-# This SConscript just declares dependencies on the outputs of that build.
-
-mksnapshot_exe = env.File('$V8_MODE_DIR/mksnapshot${PROGSUFFIX}')
-libraries_obj = env.File('$V8_MODE_DIR/libraries${OBJSUFFIX}')
-libraries_empty_obj = env.File('$V8_MODE_DIR/libraries-empty${OBJSUFFIX}')
-snapshot_obj = env.File('$V8_MODE_DIR/snapshot${OBJSUFFIX}')
-snapshot_empty_obj = env.File('$V8_MODE_DIR/snapshot-empty${OBJSUFFIX}')
-v8_bin = env.File('$V8_SRC_DIR/shell${PROGSUFFIX}')
-v8_lib = env.File('$V8_SRC_DIR/${LIBPREFIX}v8${LIBSUFFIX}'),
-
-v8_scons_targets_snapshot = [
-    libraries_empty_obj,
-    snapshot_obj,
-]
-
-v8_scons_targets_no_snapshot = [
-    mksnapshot_exe,
-    libraries_obj,
-    snapshot_empty_obj,
-    v8_bin,
-    v8_lib,
-]
-
-v8_env = env.Clone()
-
-if v8_env.Bit('windows'):
-  v8_env['ENV']['VSCOMNTOOLS'] = env.subst('$VC80_DIR/Common7/Tools')
-
-  # SCons crashes if USERPROFILE isn't defined, and it's not defined
-  # on Vista for some reason, so this is to make the Vista build work.
-  try:
-    v8_env['ENV']['USERPROFILE'] = os.environ['USERPROFILE']
-  except KeyError:
-    v8_env['ENV']['USERPROFILE'] = ""
-
-  include_path = ";".join(
-    [v8_env.subst("$PLATFORM_SDK_VISTA_6_0_DIR/Include"),
-     v8_env.subst("$INCLUDE")])
-
-  try:
-    v8_env['ENV']['INCLUDE'] = include_path + ";" + v8_env['ENV']['INCLUDE']
-  except KeyError:
-    v8_env['ENV']['INCLUDE'] = include_path
-
-  lib_path = ";".join(
-    [v8_env.subst("$PLATFORM_SDK_VISTA_6_0_DIR/Lib"),
-     v8_env.subst("$LIB")])
-
-  try:
-    v8_env['ENV']['LIB'] =  lib_path  + ";" + v8_env['ENV']['LIB']
-  except KeyError:
-    v8_env['ENV']['LIB'] = lib_path
-elif v8_env.Bit('linux'):
-  v8_env['ENV']['CCFLAGS'] = '-fvisibility=hidden'
-
-v8_no_snapshot = v8_env.Command(
-    v8_scons_targets_no_snapshot,
-    [],
-    ['$V8_SCONS_COM msvcltcg=off snapshot=off sample=shell'])
-
-v8_snapshot = v8_env.Command(
-    v8_scons_targets_snapshot,
-    [],
-    ['$V8_SCONS_COM msvcltcg=off snapshot=on'])
-
-v8_env.AlwaysBuild(v8_no_snapshot)
-v8_env.AlwaysBuild(v8_snapshot)
-
-# Tell our SCons invocation to *not* delete v8.lib and the other targets
-# before building them, so the subsidiary v8 SCons call doesn't always
-# rebuild them (thereby causing us to always rebuild their dependents).
-v8_env.Precious(v8_no_snapshot)
-v8_env.Precious(v8_snapshot)
-
-v8_env.Install('$LIB_DIR', v8_lib)
author	gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>	2009-11-02 19:00:07 +0000
committer	gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>	2009-11-02 19:00:07 +0000
commit	7937c84250348ba25af03cfdc6d8d9d0a7098128 (patch)
tree	9bf54cfa70cde313d00040d252c3105a2ecfb293 /o3d
parent	83aec62c726e56e6c5c0499c872aab03ff031a3c (diff)
download	chromium_src-7937c84250348ba25af03cfdc6d8d9d0a7098128.zip chromium_src-7937c84250348ba25af03cfdc6d8d9d0a7098128.tar.gz chromium_src-7937c84250348ba25af03cfdc6d8d9d0a7098128.tar.bz2