From 7c231a3d0d800bfc2602da097b34d1edca2f600f Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 27 Jun 2014 13:15:57 -0700 Subject: [PATCH] mark this 1.5.0.git, update RELEASING --- RELEASING | 17 +++++++++-------- src/version.cc | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/RELEASING b/RELEASING index 25926db..c4973b2 100644 --- a/RELEASING +++ b/RELEASING @@ -1,17 +1,18 @@ Notes to myself on all the steps to make for a Ninja release. Push new release branch: -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. commit, tag, push (don't forget to push --tags) -6. construct release notes from prior notes +1. Consider sending a heads-up to the ninja-build mailing list first +2. update src/version.cc with new version (with ".git"), commit to master +3. git checkout release; git merge master +4. fix version number in src/version.cc (it will likely conflict in the above) +5. fix version in doc/manual.asciidoc +6. commit, tag, push (don't forget to push --tags) +7. construct release notes from prior notes credits: git shortlog -s --no-merges REV.. Release on github: -1. (haven't tried this yet) - https://github.com/blog/1547-release-your-software +1. https://github.com/blog/1547-release-your-software + Add binaries to https://github.com/martine/ninja/releases Make announcement on mailing list: 1. copy old mail diff --git a/src/version.cc b/src/version.cc index 1406d91..562fce4 100644 --- a/src/version.cc +++ b/src/version.cc @@ -18,7 +18,7 @@ #include "util.h" -const char* kNinjaVersion = "1.4.0.git"; +const char* kNinjaVersion = "1.5.0.git"; void ParseVersion(const string& version, int* major, int* minor) { size_t end = version.find('.'); -- 2.7.4