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

2 files changed, 0 insertions, 419 deletions

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)