Move version macros to public V8 header.

tools/push-to-trunk.sh

Index: tools/push-to-trunk.sh
diff --git a/tools/push-to-trunk.sh b/tools/push-to-trunk.sh
index 8512d128778d4cad7b26d6c5c5b7bc44f70a7341..a8c171cfdb59677d24aac6a1beffbd3353ff74fa 100755
--- a/tools/push-to-trunk.sh
+++ b/tools/push-to-trunk.sh
@@ -171,11 +171,11 @@ if [ $START_STEP -le $CURRENT_STEP ] ; then
   echo ">>> Step $CURRENT_STEP: Increment version number."
   restore_if_unset "BUILD"
   NEWBUILD=$(($BUILD + 1))
-  confirm "Automatically increment BUILD_NUMBER? (Saying 'n' will fire up \
+  confirm "Automatically increment V8_BUILD_NUMBER? (Saying 'n' will fire up \
 your EDITOR on $VERSION_FILE so you can make arbitrary changes. When \
 you're done, save the file and exit your EDITOR.)"
   if [ $? -eq 0 ] ; then
-    sed -e "/#define BUILD_NUMBER/s/[0-9]*$/$NEWBUILD/" \
+    sed -e "/#define V8_BUILD_NUMBER/s/[0-9]*$/$NEWBUILD/" \
         -i "$VERSION_FILE"
   else
     $EDITOR "$VERSION_FILE"
@@ -275,11 +275,11 @@ let CURRENT_STEP+=1
 if [ $START_STEP -le $CURRENT_STEP ] ; then
   echo ">>> Step $CURRENT_STEP: Set correct version for trunk."
   restore_version_if_unset
-  sed -e "/#define MAJOR_VERSION/s/[0-9]*$/$MAJOR/" \
-      -e "/#define MINOR_VERSION/s/[0-9]*$/$MINOR/" \
-      -e "/#define BUILD_NUMBER/s/[0-9]*$/$BUILD/" \
-      -e "/#define PATCH_LEVEL/s/[0-9]*$/0/" \
-      -e "/#define IS_CANDIDATE_VERSION/s/[0-9]*$/0/" \
+  sed -e "/#define V8_MAJOR_VERSION/s/[0-9]*$/$MAJOR/" \
+      -e "/#define V8_MINOR_VERSION/s/[0-9]*$/$MINOR/" \
+      -e "/#define V8_BUILD_NUMBER/s/[0-9]*$/$BUILD/" \
+      -e "/#define V8_PATCH_LEVEL/s/[0-9]*$/0/" \
+      -e "/#define V8_CANDIDATE_VERSION/s/[0-9]*$/0/" \
       -i "$VERSION_FILE" || die "Patching $VERSION_FILE failed."
 fi