Revert r19394 - "Revert r18390 - "Roll gyp 1685:1806""
Also include a gyp_v8.py wrapper for new import rules. > Doesn't work with python2.7 - I tested with 2.6 :-/ > > BUG=none > TBR=hpayer@chromium.org > LOG=n BUG=none LOG=n R=bmeurer@chromium.org Review URL: https://codereview.chromium.org/120763003 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18433 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
508c382bc0
commit
e785e60bea
2
DEPS
2
DEPS
@ -5,7 +5,7 @@
|
||||
deps = {
|
||||
# Remember to keep the revision in sync with the Makefile.
|
||||
"v8/build/gyp":
|
||||
"http://gyp.googlecode.com/svn/trunk@1685",
|
||||
"http://gyp.googlecode.com/svn/trunk@1806",
|
||||
|
||||
"v8/third_party/icu":
|
||||
"https://src.chromium.org/chrome/trunk/deps/third_party/icu46@239289",
|
||||
|
2
Makefile
2
Makefile
@ -441,7 +441,7 @@ grokdump: ia32.release
|
||||
# Remember to keep these in sync with the DEPS file.
|
||||
dependencies:
|
||||
svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \
|
||||
--revision 1685
|
||||
--revision 1806
|
||||
svn checkout --force \
|
||||
https://src.chromium.org/chrome/trunk/deps/third_party/icu46 \
|
||||
third_party/icu --revision 239289
|
||||
|
41
build/gyp_v8.py
Normal file
41
build/gyp_v8.py
Normal file
@ -0,0 +1,41 @@
|
||||
# Copyright 2013 the V8 project authors. 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 (possibly, depending on python version) imported by
|
||||
# gyp_v8 when GYP_PARALLEL=1 and it creates sub-processes through the
|
||||
# multiprocessing library.
|
||||
|
||||
# Importing in Python 2.6 (fixed in 2.7) on Windows doesn't search for imports
|
||||
# that don't end in .py (and aren't directories with an __init__.py). This
|
||||
# wrapper makes "import gyp_v8" work with those old versions and makes it
|
||||
# possible to execute gyp_v8.py directly on Windows where the extension is
|
||||
# useful.
|
||||
|
||||
import os
|
||||
|
||||
path = os.path.abspath(os.path.split(__file__)[0])
|
||||
execfile(os.path.join(path, 'gyp_v8'))
|
Loading…
Reference in New Issue
Block a user