diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 00:05:30 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 00:05:30 +0000 |
| commit | 84c63880bf6afc3bc9c6075c807e2206db9ed59b (patch) | |
| tree | 8f931ad2d4c62b420fb0f2b40723e860473dbd4a /o3d/scons | |
| parent | 0df95fd432f9023ce03548c2aba8ca4d774910f7 (diff) | |
| download | chromium_src-84c63880bf6afc3bc9c6075c807e2206db9ed59b.zip chromium_src-84c63880bf6afc3bc9c6075c807e2206db9ed59b.tar.gz chromium_src-84c63880bf6afc3bc9c6075c807e2206db9ed59b.tar.bz2 | |
This adds a DEPS file for o3d that maps in all of its dependencies,
and updates the build files so that it will build.
Review URL: http://codereview.chromium.org/115847
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/scons')
| -rw-r--r-- | o3d/scons | 35 |
1 files changed, 29 insertions, 6 deletions
@@ -1,9 +1,32 @@ #!/bin/bash -# @@REWRITE(insert sh-copyright) -# @@REWRITE(delete-start) -# Copyright 2009 Google Inc. All Rights Reserved. -# Author: piman@google.com (Antoine Labour) -# @@REWRITE(delete-end) +# Copyright 2009, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. readonly SCRIPT_DIR="$(dirname "$0")" readonly SCRIPT_DIR_ABS="$(cd "$SCRIPT_DIR" ; pwd)" @@ -12,6 +35,6 @@ readonly SCRIPT_DIR_ABS="$(cd "$SCRIPT_DIR" ; pwd)" if [ "$OSTYPE" = "cygwin" ]; then "$SCRIPT_DIR_ABS/scons.bat" "$@" else - "$SCRIPT_DIR_ABS/../third_party/scons/scons.py" -f main.scons "$@" + "$SCRIPT_DIR_ABS/third_party/scons/scons.py" -f main.scons "$@" fi |