From 8308c70801caa8e97657cff08f1b895241f30e96 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 27 Jun 2014 13:29:16 -0700 Subject: expand RELEASING a bit --- RELEASING | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/RELEASING b/RELEASING index c4973b2..c251dd8 100644 --- a/RELEASING +++ b/RELEASING @@ -2,11 +2,17 @@ Notes to myself on all the steps to make for a Ninja release. Push new release branch: 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 +2. update src/version.cc with new version (with ".git"), then + git commit -a -m 'mark this 1.5.0.git' 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) + git commit -a -m v1.5.0 + git tag v1.5.0 + git push --tags + git checkout master + git push origin master # Push the 1.5.0.git change on master too 7. construct release notes from prior notes credits: git shortlog -s --no-merges REV.. -- cgit v0.12 From cfde750a22568d8050f15880ec055ff93b783c32 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 27 Jun 2014 14:11:23 -0700 Subject: also note that branch release needs to be pushed --- RELEASING | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/RELEASING b/RELEASING index c251dd8..fd4affb 100644 --- a/RELEASING +++ b/RELEASING @@ -8,11 +8,10 @@ Push new release branch: 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) - git commit -a -m v1.5.0 - git tag v1.5.0 - git push --tags - git checkout master - git push origin master # Push the 1.5.0.git change on master too + git commit -a -m v1.5.0; git push origin release + git tag v1.5.0; git push --tags + # Push the 1.5.0.git change on master too: + git checkout master; git push origin master 7. construct release notes from prior notes credits: git shortlog -s --no-merges REV.. -- cgit v0.12 From 95c03b40bfe4ea5c8383bba25b4a2f42068e4e9d Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 27 Jun 2014 15:51:56 -0700 Subject: add a test for stat()ing a directory --- src/disk_interface_test.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/disk_interface_test.cc b/src/disk_interface_test.cc index f4e0bb0..18e48a2 100644 --- a/src/disk_interface_test.cc +++ b/src/disk_interface_test.cc @@ -76,6 +76,11 @@ TEST_F(DiskInterfaceTest, StatExistingFile) { EXPECT_GT(disk_.Stat("file"), 1); } +TEST_F(DiskInterfaceTest, StatExistingDir) { + ASSERT_TRUE(disk_.MakeDir("subdir")); + EXPECT_GT(disk_.Stat("subdir"), 1); +} + #ifdef _WIN32 TEST_F(DiskInterfaceTest, StatCache) { disk_.AllowStatCache(true); @@ -90,6 +95,7 @@ TEST_F(DiskInterfaceTest, StatCache) { EXPECT_GT(disk_.Stat("FIle1"), 1); EXPECT_GT(disk_.Stat("file1"), 1); + EXPECT_GT(disk_.Stat("subdir"), 1); EXPECT_GT(disk_.Stat("subdir/subfile2"), 1); EXPECT_GT(disk_.Stat("sUbdir\\suBFile1"), 1); -- cgit v0.12 From 51de49bbdca11ab6c1f7963f77d48e0b08246489 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 27 Jun 2014 15:58:32 -0700 Subject: add more tests for stat()ing a directory --- src/disk_interface_test.cc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/disk_interface_test.cc b/src/disk_interface_test.cc index 18e48a2..b2e8cb5 100644 --- a/src/disk_interface_test.cc +++ b/src/disk_interface_test.cc @@ -78,7 +78,14 @@ TEST_F(DiskInterfaceTest, StatExistingFile) { TEST_F(DiskInterfaceTest, StatExistingDir) { ASSERT_TRUE(disk_.MakeDir("subdir")); + ASSERT_TRUE(disk_.MakeDir("subdir/subsubdir")); + EXPECT_GT(disk_.Stat("."), 1); EXPECT_GT(disk_.Stat("subdir"), 1); + EXPECT_GT(disk_.Stat("subdir/subsubdir"), 1); + + EXPECT_EQ(disk_.Stat("subdir"), disk_.Stat("subdir/.")); + EXPECT_EQ(disk_.Stat("subdir"), disk_.Stat("subdir/subsubdir/..")); + EXPECT_EQ(disk_.Stat("subdir/subsubdir"), disk_.Stat("subdir/subsubdir/.")); } #ifdef _WIN32 @@ -88,6 +95,7 @@ TEST_F(DiskInterfaceTest, StatCache) { ASSERT_TRUE(Touch("file1")); ASSERT_TRUE(Touch("fiLE2")); ASSERT_TRUE(disk_.MakeDir("subdir")); + ASSERT_TRUE(disk_.MakeDir("subdir/subsubdir")); ASSERT_TRUE(Touch("subdir\\subfile1")); ASSERT_TRUE(Touch("subdir\\SUBFILE2")); ASSERT_TRUE(Touch("subdir\\SUBFILE3")); @@ -95,10 +103,17 @@ TEST_F(DiskInterfaceTest, StatCache) { EXPECT_GT(disk_.Stat("FIle1"), 1); EXPECT_GT(disk_.Stat("file1"), 1); - EXPECT_GT(disk_.Stat("subdir"), 1); EXPECT_GT(disk_.Stat("subdir/subfile2"), 1); EXPECT_GT(disk_.Stat("sUbdir\\suBFile1"), 1); + EXPECT_GT(disk_.Stat("."), 1); + EXPECT_GT(disk_.Stat("subdir"), 1); + EXPECT_GT(disk_.Stat("subdir/subsubdir"), 1); + + EXPECT_EQ(disk_.Stat("subdir"), disk_.Stat("subdir/.")); + EXPECT_EQ(disk_.Stat("subdir"), disk_.Stat("subdir/subsubdir/..")); + EXPECT_EQ(disk_.Stat("subdir/subsubdir"), disk_.Stat("subdir/subsubdir/.")); + // Test error cases. disk_.quiet_ = true; string bad_path("cc:\\foo"); -- cgit v0.12 From 72e1ea3b2353b059ea094114203813e6c7d00f16 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 27 Jun 2014 16:11:50 -0700 Subject: try to fix stat()ing directories on windows --- src/disk_interface.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/disk_interface.cc b/src/disk_interface.cc index ae2146e..b170f63 100644 --- a/src/disk_interface.cc +++ b/src/disk_interface.cc @@ -117,8 +117,6 @@ bool StatAllFilesInDir(const string& dir, map* stamps, return false; } do { - if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; string lowername = ffd.cFileName; transform(lowername.begin(), lowername.end(), lowername.begin(), ::tolower); stamps->insert(make_pair(lowername, -- cgit v0.12 From 5011595b8c17a86f91fb248c5fabd87c66600e0b Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 27 Jun 2014 16:36:18 -0700 Subject: mark this 1.5.1.git --- src/version.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.cc b/src/version.cc index 562fce4..fc25676 100644 --- a/src/version.cc +++ b/src/version.cc @@ -18,7 +18,7 @@ #include "util.h" -const char* kNinjaVersion = "1.5.0.git"; +const char* kNinjaVersion = "1.5.1.git"; void ParseVersion(const string& version, int* major, int* minor) { size_t end = version.find('.'); -- cgit v0.12