Permalink
Browse files

sync version number in master with release

Update RELEASING with notes on how to not screw this up again.
  • Loading branch information...
1 parent 76faa25 commit 9f1852fa3c97197e1876f1d47ca45e66b5e6cd28 @evmar evmar committed Apr 8, 2013
Showing with 8 additions and 7 deletions.
  1. +7 −6 RELEASING
  2. +1 −1 src/version.cc
View
@@ -1,9 +1,10 @@
Notes to myself on all the steps to make for a Ninja release.
-1. git checkout release; git merge master
-2. fix version number in source (it will likely conflict in the above)
-3. fix version in doc/manual.asciidoc
-4. rebuild manual, put in place on website
-5. commit, tag, push
-6. construct release notes from prior notes
+1. update src/version.cc with new version (with ".git")
+2. git checkout release; git merge master
+3. fix version number in src/version.cc (it will likely conflict in the above)
+4. fix version in doc/manual.asciidoc
+5. rebuild manual, put in place on website
+6. commit, tag, push
+7. construct release notes from prior notes
credits: git shortlog -s --no-merges REV..
View
@@ -18,7 +18,7 @@
#include "util.h"
-const char* kNinjaVersion = "1.1.0.git";
+const char* kNinjaVersion = "1.2.0.git";
void ParseVersion(const string& version, int* major, int* minor) {
size_t end = version.find('.');

0 comments on commit 9f1852f

Please sign in to comment.