| OLD | NEW |
| 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 echo "" >> "$NEWCHANGELOG" | 164 echo "" >> "$NEWCHANGELOG" |
| 165 cat ChangeLog >> "$NEWCHANGELOG" | 165 cat ChangeLog >> "$NEWCHANGELOG" |
| 166 mv "$NEWCHANGELOG" ChangeLog | 166 mv "$NEWCHANGELOG" ChangeLog |
| 167 fi | 167 fi |
| 168 | 168 |
| 169 let CURRENT_STEP+=1 | 169 let CURRENT_STEP+=1 |
| 170 if [ $START_STEP -le $CURRENT_STEP ] ; then | 170 if [ $START_STEP -le $CURRENT_STEP ] ; then |
| 171 echo ">>> Step $CURRENT_STEP: Increment version number." | 171 echo ">>> Step $CURRENT_STEP: Increment version number." |
| 172 restore_if_unset "BUILD" | 172 restore_if_unset "BUILD" |
| 173 NEWBUILD=$(($BUILD + 1)) | 173 NEWBUILD=$(($BUILD + 1)) |
| 174 confirm "Automatically increment BUILD_NUMBER? (Saying 'n' will fire up \ | 174 confirm "Automatically increment V8_BUILD_NUMBER? (Saying 'n' will fire up \ |
| 175 your EDITOR on $VERSION_FILE so you can make arbitrary changes. When \ | 175 your EDITOR on $VERSION_FILE so you can make arbitrary changes. When \ |
| 176 you're done, save the file and exit your EDITOR.)" | 176 you're done, save the file and exit your EDITOR.)" |
| 177 if [ $? -eq 0 ] ; then | 177 if [ $? -eq 0 ] ; then |
| 178 sed -e "/#define BUILD_NUMBER/s/[0-9]*$/$NEWBUILD/" \ | 178 sed -e "/#define V8_BUILD_NUMBER/s/[0-9]*$/$NEWBUILD/" \ |
| 179 -i "$VERSION_FILE" | 179 -i "$VERSION_FILE" |
| 180 else | 180 else |
| 181 $EDITOR "$VERSION_FILE" | 181 $EDITOR "$VERSION_FILE" |
| 182 fi | 182 fi |
| 183 read_and_persist_version "NEW" | 183 read_and_persist_version "NEW" |
| 184 fi | 184 fi |
| 185 | 185 |
| 186 let CURRENT_STEP+=1 | 186 let CURRENT_STEP+=1 |
| 187 if [ $START_STEP -le $CURRENT_STEP ] ; then | 187 if [ $START_STEP -le $CURRENT_STEP ] ; then |
| 188 echo ">>> Step $CURRENT_STEP: Commit to local branch." | 188 echo ">>> Step $CURRENT_STEP: Commit to local branch." |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 echo ">>> Step $CURRENT_STEP: Apply squashed changes." | 268 echo ">>> Step $CURRENT_STEP: Apply squashed changes." |
| 269 rm -f "$TOUCHED_FILES_FILE" | 269 rm -f "$TOUCHED_FILES_FILE" |
| 270 apply_patch "$PATCH_FILE" | 270 apply_patch "$PATCH_FILE" |
| 271 rm -f "$PATCH_FILE" | 271 rm -f "$PATCH_FILE" |
| 272 fi | 272 fi |
| 273 | 273 |
| 274 let CURRENT_STEP+=1 | 274 let CURRENT_STEP+=1 |
| 275 if [ $START_STEP -le $CURRENT_STEP ] ; then | 275 if [ $START_STEP -le $CURRENT_STEP ] ; then |
| 276 echo ">>> Step $CURRENT_STEP: Set correct version for trunk." | 276 echo ">>> Step $CURRENT_STEP: Set correct version for trunk." |
| 277 restore_version_if_unset | 277 restore_version_if_unset |
| 278 sed -e "/#define MAJOR_VERSION/s/[0-9]*$/$MAJOR/" \ | 278 sed -e "/#define V8_MAJOR_VERSION/s/[0-9]*$/$MAJOR/" \ |
| 279 -e "/#define MINOR_VERSION/s/[0-9]*$/$MINOR/" \ | 279 -e "/#define V8_MINOR_VERSION/s/[0-9]*$/$MINOR/" \ |
| 280 -e "/#define BUILD_NUMBER/s/[0-9]*$/$BUILD/" \ | 280 -e "/#define V8_BUILD_NUMBER/s/[0-9]*$/$BUILD/" \ |
| 281 -e "/#define PATCH_LEVEL/s/[0-9]*$/0/" \ | 281 -e "/#define V8_PATCH_LEVEL/s/[0-9]*$/0/" \ |
| 282 -e "/#define IS_CANDIDATE_VERSION/s/[0-9]*$/0/" \ | 282 -e "/#define V8_CANDIDATE_VERSION/s/[0-9]*$/0/" \ |
| 283 -i "$VERSION_FILE" || die "Patching $VERSION_FILE failed." | 283 -i "$VERSION_FILE" || die "Patching $VERSION_FILE failed." |
| 284 fi | 284 fi |
| 285 | 285 |
| 286 let CURRENT_STEP+=1 | 286 let CURRENT_STEP+=1 |
| 287 if [ $START_STEP -le $CURRENT_STEP ] ; then | 287 if [ $START_STEP -le $CURRENT_STEP ] ; then |
| 288 echo ">>> Step $CURRENT_STEP: Commit to local trunk branch." | 288 echo ">>> Step $CURRENT_STEP: Commit to local trunk branch." |
| 289 git add "$VERSION_FILE" | 289 git add "$VERSION_FILE" |
| 290 git commit -F "$COMMITMSG_FILE" || die "'git commit' failed." | 290 git commit -F "$COMMITMSG_FILE" || die "'git commit' failed." |
| 291 rm -f "$COMMITMSG_FILE" | 291 rm -f "$COMMITMSG_FILE" |
| 292 fi | 292 fi |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 update the v8rel spreadsheet:" | 402 update the v8rel spreadsheet:" |
| 403 else | 403 else |
| 404 echo "Congratulations, you have successfully created the trunk revision \ | 404 echo "Congratulations, you have successfully created the trunk revision \ |
| 405 $MAJOR.$MINOR.$BUILD. Please don't forget to roll this new version into \ | 405 $MAJOR.$MINOR.$BUILD. Please don't forget to roll this new version into \ |
| 406 Chromium, and to update the v8rel spreadsheet:" | 406 Chromium, and to update the v8rel spreadsheet:" |
| 407 fi | 407 fi |
| 408 echo -e "$MAJOR.$MINOR.$BUILD\ttrunk\t$TRUNK_REVISION" | 408 echo -e "$MAJOR.$MINOR.$BUILD\ttrunk\t$TRUNK_REVISION" |
| 409 common_cleanup | 409 common_cleanup |
| 410 [[ "$TRUNKBRANCH" != "$CURRENT_BRANCH" ]] && git branch -D $TRUNKBRANCH | 410 [[ "$TRUNKBRANCH" != "$CURRENT_BRANCH" ]] && git branch -D $TRUNKBRANCH |
| 411 fi | 411 fi |
| OLD | NEW |