Change deprecated comments that still talk about SCons.
R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/14404012 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14387 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
75605f82b6
commit
d352df8131
@ -30,8 +30,8 @@
|
|||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
// These macros define the version number for the current version.
|
// These macros define the version number for the current version.
|
||||||
// NOTE these macros are used by the SCons build script so their names
|
// NOTE these macros are used by some of the tool scripts and the build
|
||||||
// cannot be changed without changing the SCons build script.
|
// system so their names cannot be changed without changing the scripts.
|
||||||
#define MAJOR_VERSION 3
|
#define MAJOR_VERSION 3
|
||||||
#define MINOR_VERSION 18
|
#define MINOR_VERSION 18
|
||||||
#define BUILD_NUMBER 3
|
#define BUILD_NUMBER 3
|
||||||
@ -40,9 +40,9 @@
|
|||||||
// (Boolean macro values are not supported by all preprocessors.)
|
// (Boolean macro values are not supported by all preprocessors.)
|
||||||
#define IS_CANDIDATE_VERSION 1
|
#define IS_CANDIDATE_VERSION 1
|
||||||
|
|
||||||
// Define SONAME to have the SCons build the put a specific SONAME into the
|
// Define SONAME to have the build system put a specific SONAME into the
|
||||||
// shared library instead the generic SONAME generated from the V8 version
|
// shared library instead the generic SONAME generated from the V8 version
|
||||||
// number. This define is mainly used by the SCons build script.
|
// number. This define is mainly used by the build system script.
|
||||||
#define SONAME ""
|
#define SONAME ""
|
||||||
|
|
||||||
#if IS_CANDIDATE_VERSION
|
#if IS_CANDIDATE_VERSION
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
|
|
||||||
# Checks that the number of compilation units having at least one static
|
# Checks that the number of compilation units having at least one static
|
||||||
# initializer in d8 matches the one defined below.
|
# initializer in d8 matches the one defined below.
|
||||||
# Note that the project must be built with SCons before running this script.
|
|
||||||
|
|
||||||
# Allow:
|
# Allow:
|
||||||
# - _GLOBAL__I__ZN2v810LineEditor6first_E
|
# - _GLOBAL__I__ZN2v810LineEditor6first_E
|
||||||
|
@ -214,9 +214,9 @@ def ReadMacros(lines):
|
|||||||
HEADER_TEMPLATE = """\
|
HEADER_TEMPLATE = """\
|
||||||
// Copyright 2011 Google Inc. All Rights Reserved.
|
// Copyright 2011 Google Inc. All Rights Reserved.
|
||||||
|
|
||||||
// This file was generated from .js source files by SCons. If you
|
// This file was generated from .js source files by GYP. If you
|
||||||
// want to make changes to this file you should either change the
|
// want to make changes to this file you should either change the
|
||||||
// javascript source files or the SConstruct script.
|
// javascript source files or the GYP script.
|
||||||
|
|
||||||
#include "v8.h"
|
#include "v8.h"
|
||||||
#include "natives.h"
|
#include "natives.h"
|
||||||
|
@ -124,15 +124,6 @@ def Update():
|
|||||||
scriptname = os.path.abspath(sys.argv[0])
|
scriptname = os.path.abspath(sys.argv[0])
|
||||||
_Cmd("svn cat %s > %s" % (path, scriptname))
|
_Cmd("svn cat %s > %s" % (path, scriptname))
|
||||||
|
|
||||||
# The testcfg.py files currently need to be able to import the old test.py
|
|
||||||
# script, so we temporarily need to make that available.
|
|
||||||
# TODO(jkummerow): Remove this when removing test.py.
|
|
||||||
for filename in ("test.py", "utils.py"):
|
|
||||||
url = ("http://v8.googlecode.com/svn/branches/bleeding_edge/"
|
|
||||||
"tools/%s" % filename)
|
|
||||||
filepath = os.path.join(os.path.dirname(scriptname), filename)
|
|
||||||
_Cmd("svn cat %s > %s" % (url, filepath))
|
|
||||||
|
|
||||||
# Check out or update V8.
|
# Check out or update V8.
|
||||||
v8_dir = os.path.join(ROOT, "v8")
|
v8_dir = os.path.join(ROOT, "v8")
|
||||||
if os.path.exists(v8_dir):
|
if os.path.exists(v8_dir):
|
||||||
|
@ -1,98 +0,0 @@
|
|||||||
# Copyright 2008 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.
|
|
||||||
|
|
||||||
|
|
||||||
import platform
|
|
||||||
import re
|
|
||||||
|
|
||||||
|
|
||||||
# Reads a .list file into an array of strings
|
|
||||||
def ReadLinesFrom(name):
|
|
||||||
list = []
|
|
||||||
for line in open(name):
|
|
||||||
if '#' in line:
|
|
||||||
line = line[:line.find('#')]
|
|
||||||
line = line.strip()
|
|
||||||
if len(line) == 0:
|
|
||||||
continue
|
|
||||||
list.append(line)
|
|
||||||
return list
|
|
||||||
|
|
||||||
|
|
||||||
def GuessOS():
|
|
||||||
id = platform.system()
|
|
||||||
if id == 'Linux':
|
|
||||||
return 'linux'
|
|
||||||
elif id == 'Darwin':
|
|
||||||
return 'macos'
|
|
||||||
elif id.find('CYGWIN') >= 0:
|
|
||||||
return 'cygwin'
|
|
||||||
elif id == 'Windows' or id == 'Microsoft':
|
|
||||||
# On Windows Vista platform.system() can return 'Microsoft' with some
|
|
||||||
# versions of Python, see http://bugs.python.org/issue1082
|
|
||||||
return 'win32'
|
|
||||||
elif id == 'FreeBSD':
|
|
||||||
return 'freebsd'
|
|
||||||
elif id == 'OpenBSD':
|
|
||||||
return 'openbsd'
|
|
||||||
elif id == 'SunOS':
|
|
||||||
return 'solaris'
|
|
||||||
elif id == 'NetBSD':
|
|
||||||
return 'netbsd'
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
# This will default to building the 32 bit VM even on machines that are capable
|
|
||||||
# of running the 64 bit VM. Use the scons option --arch=x64 to force it to build
|
|
||||||
# the 64 bit VM.
|
|
||||||
def GuessArchitecture():
|
|
||||||
id = platform.machine()
|
|
||||||
id = id.lower() # Windows 7 capitalizes 'AMD64'.
|
|
||||||
if id.startswith('arm'):
|
|
||||||
return 'arm'
|
|
||||||
elif (not id) or (not re.match('(x|i[3-6])86$', id) is None):
|
|
||||||
return 'ia32'
|
|
||||||
elif id == 'i86pc':
|
|
||||||
return 'ia32'
|
|
||||||
elif id == 'x86_64':
|
|
||||||
return 'ia32'
|
|
||||||
elif id == 'amd64':
|
|
||||||
return 'ia32'
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def GuessWordsize():
|
|
||||||
if '64' in platform.machine():
|
|
||||||
return '64'
|
|
||||||
else:
|
|
||||||
return '32'
|
|
||||||
|
|
||||||
|
|
||||||
def IsWindows():
|
|
||||||
return GuessOS() == 'win32'
|
|
Loading…
Reference in New Issue
Block a user