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

Side by Side Diff: tools/merge-to-branch.sh

Issue 23723003: Move version macros to public V8 header. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 3 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 | « tools/common-includes.sh ('k') | tools/push-to-trunk.sh » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # Copyright 2012 the V8 project authors. All rights reserved. 2 # Copyright 2012 the V8 project authors. All rights reserved.
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following 10 # copyright notice, this list of conditions and the following
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 echo ">>> Step $CURRENT_STEP: Prepare $VERSION_FILE." 193 echo ">>> Step $CURRENT_STEP: Prepare $VERSION_FILE."
194 # These version numbers are used again for creating the tag 194 # These version numbers are used again for creating the tag
195 read_and_persist_version 195 read_and_persist_version
196 fi 196 fi
197 197
198 let CURRENT_STEP+=1 198 let CURRENT_STEP+=1
199 if [ $START_STEP -le $CURRENT_STEP ] ; then 199 if [ $START_STEP -le $CURRENT_STEP ] ; then
200 echo ">>> Step $CURRENT_STEP: Increment version number." 200 echo ">>> Step $CURRENT_STEP: Increment version number."
201 restore_if_unset "PATCH" 201 restore_if_unset "PATCH"
202 NEWPATCH=$(($PATCH + 1)) 202 NEWPATCH=$(($PATCH + 1))
203 confirm "Automatically increment PATCH_LEVEL? (Saying 'n' will fire up \ 203 confirm "Automatically increment V8_PATCH_LEVEL? (Saying 'n' will fire up \
204 your EDITOR on $VERSION_FILE so you can make arbitrary changes. When \ 204 your EDITOR on $VERSION_FILE so you can make arbitrary changes. When \
205 you're done, save the file and exit your EDITOR.)" 205 you're done, save the file and exit your EDITOR.)"
206 if [ $? -eq 0 ] ; then 206 if [ $? -eq 0 ] ; then
207 echo $NEWPATCH $VERSION_FILE 207 echo $NEWPATCH $VERSION_FILE
208 sed -e "/#define PATCH_LEVEL/s/[0-9]*$/$NEWPATCH/" \ 208 sed -e "/#define V8_PATCH_LEVEL/s/[0-9]*$/$NEWPATCH/" \
209 -i.bak "$VERSION_FILE" || die "Could not increment patch level" 209 -i.bak "$VERSION_FILE" || die "Could not increment patch level"
210 else 210 else
211 $EDITOR "$VERSION_FILE" 211 $EDITOR "$VERSION_FILE"
212 fi 212 fi
213 read_and_persist_version "NEW" 213 read_and_persist_version "NEW"
214 fi 214 fi
215 215
216 let CURRENT_STEP+=1 216 let CURRENT_STEP+=1
217 if [ $START_STEP -le $CURRENT_STEP ] ; then 217 if [ $START_STEP -le $CURRENT_STEP ] ; then
218 echo ">>> Step $CURRENT_STEP: Commit to local branch." 218 echo ">>> Step $CURRENT_STEP: Commit to local branch."
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 restore_if_unset "TO_URL" 271 restore_if_unset "TO_URL"
272 restore_if_unset "REVISION_LIST" 272 restore_if_unset "REVISION_LIST"
273 restore_version_if_unset "NEW" 273 restore_version_if_unset "NEW"
274 common_cleanup 274 common_cleanup
275 echo "*** SUMMARY ***" 275 echo "*** SUMMARY ***"
276 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH" 276 echo "version: $NEWMAJOR.$NEWMINOR.$NEWBUILD.$NEWPATCH"
277 echo "branch: $TO_URL" 277 echo "branch: $TO_URL"
278 echo "svn revision: $SVN_REVISION" 278 echo "svn revision: $SVN_REVISION"
279 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST" 279 [[ -n "$REVISION_LIST" ]] && echo "patches:$REVISION_LIST"
280 fi 280 fi
OLDNEW
« no previous file with comments | « tools/common-includes.sh ('k') | tools/push-to-trunk.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698