Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: src/version.cc

Issue 243045: Merge bleeding_edge revisions 2971, 2972 (heap profiler updates) to trunk.... (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/heap-profiler.cc ('k') | test/cctest/test-heap-profiler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2008 the V8 project authors. All rights reserved. 1 // Copyright 2008 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 17 matching lines...) Expand all
28 #include "v8.h" 28 #include "v8.h"
29 29
30 #include "version.h" 30 #include "version.h"
31 31
32 // These macros define the version number for the current version. 32 // These macros define the version number for the current version.
33 // NOTE these macros are used by the SCons build script so their names 33 // NOTE these macros are used by the SCons build script so their names
34 // cannot be changed without changing the SCons build script. 34 // cannot be changed without changing the SCons build script.
35 #define MAJOR_VERSION 1 35 #define MAJOR_VERSION 1
36 #define MINOR_VERSION 3 36 #define MINOR_VERSION 3
37 #define BUILD_NUMBER 13 37 #define BUILD_NUMBER 13
38 #define PATCH_LEVEL 4 38 #define PATCH_LEVEL 5
39 #define CANDIDATE_VERSION false 39 #define CANDIDATE_VERSION false
40 40
41 // Define SONAME to have the SCons build the put a specific SONAME into the 41 // Define SONAME to have the SCons build the put a specific SONAME into the
42 // shared library instead the generic SONAME generated from the V8 version 42 // shared library instead the generic SONAME generated from the V8 version
43 // number. This define is mainly used by the SCons build script. 43 // number. This define is mainly used by the SCons build script.
44 #define SONAME "" 44 #define SONAME ""
45 45
46 namespace v8 { 46 namespace v8 {
47 namespace internal { 47 namespace internal {
48 48
(...skipping 30 matching lines...) Expand all
79 OS::SNPrintF(str, "libv8-%d.%d.%d%s.so", 79 OS::SNPrintF(str, "libv8-%d.%d.%d%s.so",
80 GetMajor(), GetMinor(), GetBuild(), candidate); 80 GetMajor(), GetMinor(), GetBuild(), candidate);
81 } 81 }
82 } else { 82 } else {
83 // Use specific SONAME. 83 // Use specific SONAME.
84 OS::SNPrintF(str, "%s", soname_); 84 OS::SNPrintF(str, "%s", soname_);
85 } 85 }
86 } 86 }
87 87
88 } } // namespace v8::internal 88 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/heap-profiler.cc ('k') | test/cctest/test-heap-profiler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698