Reviewers: William Hesse, Description: Merge r5118 to 2.2 branch to make it possible to build d8.
Please review this at http://codereview.chromium.org/3082005/show SVN Base: http://v8.googlecode.com/svn/branches/2.2/ Affected files: M src/version.cc M tools/js2c.py Index: src/version.cc =================================================================== --- src/version.cc (revision 5156) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 2 #define BUILD_NUMBER 24 -#define PATCH_LEVEL 7 +#define PATCH_LEVEL 8 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the Index: tools/js2c.py =================================================================== --- tools/js2c.py (revision 5155) +++ tools/js2c.py (working copy) @@ -275,8 +275,8 @@ debugger_ids = [] modules = [] # Locate the macros file name. - consts = {} - macros = {} + consts = [] + macros = [] for s in source: if 'macros.py' == (os.path.split(str(s))[1]): (consts, macros) = ReadMacros(ReadLines(str(s))) -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
