diff options
| -rw-r--r-- | RELEASING | 2 | ||||
| -rwxr-xr-x | configure.py | 3 | ||||
| -rw-r--r-- | src/deps_log_test.cc | 3 | ||||
| -rw-r--r-- | src/version.cc | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -5,6 +5,6 @@ Notes to myself on all the steps to make for a Ninja release. 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 +6. commit, tag, push (don't forget to push --tags) 7. construct release notes from prior notes credits: git shortlog -s --no-merges REV.. diff --git a/configure.py b/configure.py index 1284deb..7c90e66 100755 --- a/configure.py +++ b/configure.py @@ -65,6 +65,9 @@ n.comment('This file is used to build ninja itself.') n.comment('It is generated by ' + os.path.basename(__file__) + '.') n.newline() +n.variable('ninja_required_version', '1.3') +n.newline() + n.comment('The arguments passed to configure.py, for rerunning it.') n.variable('configure_args', ' '.join(sys.argv[1:])) env_keys = set(['CXX', 'AR', 'CFLAGS', 'LDFLAGS']) diff --git a/src/deps_log_test.cc b/src/deps_log_test.cc index 0591736..3b32963 100644 --- a/src/deps_log_test.cc +++ b/src/deps_log_test.cc @@ -340,7 +340,8 @@ TEST_F(DepsLogTest, TruncatedRecovery) { // Shorten the file, corrupting the last record. struct stat st; ASSERT_EQ(0, stat(kTestFilename, &st)); - ASSERT_EQ(0, truncate(kTestFilename, st.st_size - 2)); + string err; + ASSERT_TRUE(Truncate(kTestFilename, st.st_size - 2, &err)); // Load the file again, add an entry. { diff --git a/src/version.cc b/src/version.cc index 07167fe..166e3c5 100644 --- a/src/version.cc +++ b/src/version.cc @@ -18,7 +18,7 @@ #include "util.h" -const char* kNinjaVersion = "1.3.0"; +const char* kNinjaVersion = "1.3.1"; void ParseVersion(const string& version, int* major, int* minor) { size_t end = version.find('.'); |