diff options
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/statsreport | |
parent | 83aec62c726e56e6c5c0499c872aab03ff031a3c (diff) | |
download | chromium_src-7937c84250348ba25af03cfdc6d8d9d0a7098128.zip chromium_src-7937c84250348ba25af03cfdc6d8d9d0a7098128.tar.gz chromium_src-7937c84250348ba25af03cfdc6d8d9d0a7098128.tar.bz2 |
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
Diffstat (limited to 'o3d/statsreport')
-rw-r--r-- | o3d/statsreport/build.scons | 71 | ||||
-rw-r--r-- | o3d/statsreport/common/build.scons | 53 |
2 files changed, 0 insertions, 124 deletions
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) |