Update to 1.7.2

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>

.gitignore

@@ -6,3 +6,4 @@
 /ninja-1.5.3.tar.gz
 /ninja-1.6.0.tar.gz
 /ninja-1.7.1.tar.gz
+/ninja-1.7.2.tar.gz

0001-Rename-mentions-of-the-executable-name-to-be-ninja-b.patch

@@ -0,0 +1,103 @@
+From 277589c0ca3250034edacee159cdf6860d5d7ae2 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Mon, 28 Nov 2016 20:00:03 +0100
+Subject: [PATCH 1/2] Rename mentions of the executable name to be ninja-build
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+---
+ misc/bash-completion          | 4 ++--
+ misc/zsh-completion           | 2 +-
+ src/msvc_helper_main-win32.cc | 2 +-
+ src/ninja.cc                  | 8 ++++----
+ src/version.cc                | 2 +-
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/misc/bash-completion b/misc/bash-completion
+index e604cd4..be2009c 100644
+--- a/misc/bash-completion
++++ b/misc/bash-completion
+@@ -49,9 +49,9 @@ _ninja_target() {
+ 		C) eval dir="$OPTARG" ;;
+ 	    esac
+ 	done;
+-	targets_command="eval ninja -C \"${dir}\" -t targets all 2>/dev/null | cut -d: -f1"
++	targets_command="eval ninja-build -C \"${dir}\" -t targets all 2>/dev/null | cut -d: -f1"
+ 	COMPREPLY=($(compgen -W '`${targets_command}`' -- "$cur"))
+     fi
+     return
+ }
+-complete -F _ninja_target ninja
++complete -F _ninja_target ninja ninja-build
+diff --git a/misc/zsh-completion b/misc/zsh-completion
+index 446e269..eca884a 100644
+--- a/misc/zsh-completion
++++ b/misc/zsh-completion
+@@ -1,4 +1,4 @@
+-#compdef ninja
++#compdef ninja ninja-build
+ # Copyright 2011 Google Inc. All Rights Reserved.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+diff --git a/src/msvc_helper_main-win32.cc b/src/msvc_helper_main-win32.cc
+index e419cd7..6472beb 100644
+--- a/src/msvc_helper_main-win32.cc
++++ b/src/msvc_helper_main-win32.cc
+@@ -28,7 +28,7 @@ namespace {
+ 
+ void Usage() {
+   printf(
+-"usage: ninja -t msvc [options] -- cl.exe /showIncludes /otherArgs\n"
++"usage: ninja-build -t msvc [options] -- cl.exe /showIncludes /otherArgs\n"
+ "options:\n"
+ "  -e ENVFILE load environment block from ENVFILE as environment\n"
+ "  -o FILE    write output dependency information to FILE.d\n"
+diff --git a/src/ninja.cc b/src/ninja.cc
+index 25eafe8..ab6a320 100644
+--- a/src/ninja.cc
++++ b/src/ninja.cc
+@@ -193,7 +193,7 @@ struct Tool {
+ /// Print usage information.
+ void Usage(const BuildConfig& config) {
+   fprintf(stderr,
+-"usage: ninja [options] [targets...]\n"
++"usage: ninja-build [options] [targets...]\n"
+ "\n"
+ "if targets are unspecified, builds the 'default' target (see manual).\n"
+ "\n"
+@@ -285,9 +285,9 @@ Node* NinjaMain::CollectTarget(const char* cpath, string* err) {
+     *err =
+         "unknown target '" + Node::PathDecanonicalized(path, slash_bits) + "'";
+     if (path == "clean") {
+-      *err += ", did you mean 'ninja -t clean'?";
++      *err += ", did you mean 'ninja-build -t clean'?";
+     } else if (path == "help") {
+-      *err += ", did you mean 'ninja -h'?";
++      *err += ", did you mean 'ninja-build -h'?";
+     } else {
+       Node* suggestion = state_.SpellcheckNode(path);
+       if (suggestion) {
+@@ -583,7 +583,7 @@ int NinjaMain::ToolClean(const Options* options, int argc, char* argv[]) {
+       break;
+     case 'h':
+     default:
+-      printf("usage: ninja -t clean [options] [targets]\n"
++      printf("usage: ninja-build -t clean [options] [targets]\n"
+ "\n"
+ "options:\n"
+ "  -g     also clean files marked as ninja generator output\n"
+diff --git a/src/version.cc b/src/version.cc
+index eafa082..a9964d7 100644
+--- a/src/version.cc
++++ b/src/version.cc
+@@ -38,7 +38,7 @@ void CheckNinjaVersion(const string& version) {
+   ParseVersion(version, &file_major, &file_minor);
+ 
+   if (bin_major > file_major) {
+-    Warning("ninja executable version (%s) greater than build file "
++    Warning("ninja-build executable version (%s) greater than build file "
+             "ninja_required_version (%s); versions may be incompatible.",
+             kNinjaVersion, version.c_str());
+     return;
+-- 
+2.10.2
+

0002-Disable-test-which-takes-too-many-resources-for-koji.patch

@@ -0,0 +1,26 @@
+From 0b06a4ddd8da8d7e6d0de78a0fd3facd0739fcba Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+Date: Mon, 28 Nov 2016 20:01:20 +0100
+Subject: [PATCH 2/2] Disable test which takes too many resources for koji
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
+---
+ src/subprocess_test.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
+index 0a8c206..38dfd4a 100644
+--- a/src/subprocess_test.cc
++++ b/src/subprocess_test.cc
+@@ -214,7 +214,7 @@ TEST_F(SubprocessTest, SetWithMulti) {
+   }
+ }
+ 
+-#if defined(USE_PPOLL)
++#if 0 && defined(USE_PPOLL)
+ TEST_F(SubprocessTest, SetWithLots) {
+   // Arbitrary big number; needs to be over 1024 to confirm we're no longer
+   // hostage to pselect.
+-- 
+2.10.2
+

ninja-1.7.1-binary-rename.patch

@@ -1,109 +0,0 @@
-diff -u -r -U5 --no-dereference ninja-1.7.1/misc/bash-completion ninja-1.7.1.binary-rename/misc/bash-completion
---- ninja-1.7.1/misc/bash-completion	2016-04-28 10:56:44.000000000 -0400
-+++ ninja-1.7.1.binary-rename/misc/bash-completion	2016-07-23 22:34:22.679659551 -0400
-@@ -47,11 +47,11 @@
- 	    case $opt in
-                 # eval for tilde expansion
- 		C) eval dir="$OPTARG" ;;
- 	    esac
- 	done;
--	targets_command="eval ninja -C \"${dir}\" -t targets all 2>/dev/null | cut -d: -f1"
-+	targets_command="eval ninja-build -C \"${dir}\" -t targets all 2>/dev/null | cut -d: -f1"
- 	COMPREPLY=($(compgen -W '`${targets_command}`' -- "$cur"))
-     fi
-     return
- }
--complete -F _ninja_target ninja
-+complete -F _ninja_target ninja ninja-build
-diff -u -r -U5 --no-dereference ninja-1.7.1/misc/zsh-completion ninja-1.7.1.binary-rename/misc/zsh-completion
---- ninja-1.7.1/misc/zsh-completion	2016-04-28 10:56:44.000000000 -0400
-+++ ninja-1.7.1.binary-rename/misc/zsh-completion	2016-07-23 22:32:50.157488686 -0400
-@@ -1,6 +1,6 @@
--#compdef ninja
-+#compdef ninja ninja-build
- # Copyright 2011 Google Inc. All Rights Reserved.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
- # You may obtain a copy of the License at
-Only in ninja-1.7.1.binary-rename: ninja-1.7.1-binary-rename.patch
-diff -u -r -U5 --no-dereference ninja-1.7.1/src/msvc_helper_main-win32.cc ninja-1.7.1.binary-rename/src/msvc_helper_main-win32.cc
---- ninja-1.7.1/src/msvc_helper_main-win32.cc	2016-04-28 10:56:44.000000000 -0400
-+++ ninja-1.7.1.binary-rename/src/msvc_helper_main-win32.cc	2016-07-23 22:32:50.158488688 -0400
-@@ -26,11 +26,11 @@
- 
- namespace {
- 
- void Usage() {
-   printf(
--"usage: ninja -t msvc [options] -- cl.exe /showIncludes /otherArgs\n"
-+"usage: ninja-build -t msvc [options] -- cl.exe /showIncludes /otherArgs\n"
- "options:\n"
- "  -e ENVFILE load environment block from ENVFILE as environment\n"
- "  -o FILE    write output dependency information to FILE.d\n"
- "  -p STRING  localized prefix of msvc's /showIncludes output\n"
-          );
-Only in ninja-1.7.1.binary-rename/src: msvc_helper_main-win32.cc.orig
-diff -u -r -U5 --no-dereference ninja-1.7.1/src/ninja.cc ninja-1.7.1.binary-rename/src/ninja.cc
---- ninja-1.7.1/src/ninja.cc	2016-04-28 10:56:44.000000000 -0400
-+++ ninja-1.7.1.binary-rename/src/ninja.cc	2016-07-23 22:33:09.775525262 -0400
-@@ -191,11 +191,11 @@
- };
- 
- /// Print usage information.
- void Usage(const BuildConfig& config) {
-   fprintf(stderr,
--"usage: ninja [options] [targets...]\n"
-+"usage: ninja-build [options] [targets...]\n"
- "\n"
- "if targets are unspecified, builds the 'default' target (see manual).\n"
- "\n"
- "options:\n"
- "  --version  print ninja version (\"%s\")\n"
-@@ -283,13 +283,13 @@
-     return node;
-   } else {
-     *err =
-         "unknown target '" + Node::PathDecanonicalized(path, slash_bits) + "'";
-     if (path == "clean") {
--      *err += ", did you mean 'ninja -t clean'?";
-+      *err += ", did you mean 'ninja-build -t clean'?";
-     } else if (path == "help") {
--      *err += ", did you mean 'ninja -h'?";
-+      *err += ", did you mean 'ninja-build -h'?";
-     } else {
-       Node* suggestion = state_.SpellcheckNode(path);
-       if (suggestion) {
-         *err += ", did you mean '" + suggestion->path() + "'?";
-       }
-@@ -581,11 +581,11 @@
-     case 'r':
-       clean_rules = true;
-       break;
-     case 'h':
-     default:
--      printf("usage: ninja -t clean [options] [targets]\n"
-+      printf("usage: ninja-build -t clean [options] [targets]\n"
- "\n"
- "options:\n"
- "  -g     also clean files marked as ninja generator output\n"
- "  -r     interpret targets as a list of rules to clean instead\n"
-              );
-Only in ninja-1.7.1.binary-rename/src: ninja.cc.orig
-Only in ninja-1.7.1.binary-rename/src: ninja.cc.rej
-diff -u -r -U5 --no-dereference ninja-1.7.1/src/version.cc ninja-1.7.1.binary-rename/src/version.cc
---- ninja-1.7.1/src/version.cc	2016-04-28 10:56:44.000000000 -0400
-+++ ninja-1.7.1.binary-rename/src/version.cc	2016-07-23 22:32:50.159488690 -0400
-@@ -36,11 +36,11 @@
-   ParseVersion(kNinjaVersion, &bin_major, &bin_minor);
-   int file_major, file_minor;
-   ParseVersion(version, &file_major, &file_minor);
- 
-   if (bin_major > file_major) {
--    Warning("ninja executable version (%s) greater than build file "
-+    Warning("ninja-build executable version (%s) greater than build file "
-             "ninja_required_version (%s); versions may be incompatible.",
-             kNinjaVersion, version.c_str());
-     return;
-   }
- 

ninja-1.7.1-resource-intensive-test.patch

@@ -1,16 +0,0 @@
-diff -u -r -U5 --no-dereference ninja-1.7.1/src/subprocess_test.cc ninja-1.7.1.resource-intensive-test/src/subprocess_test.cc
---- ninja-1.7.1/src/subprocess_test.cc	2016-04-28 10:56:44.000000000 -0400
-+++ ninja-1.7.1.resource-intensive-test/src/subprocess_test.cc	2016-07-24 17:29:42.783820341 -0400
-@@ -214,11 +214,11 @@
-   }
- }
- 
- // OS X's process limit is less than 1025 by default
- // (|sysctl kern.maxprocperuid| is 709 on 10.7 and 10.8 and less prior to that).
--#if !defined(__APPLE__) && !defined(_WIN32)
-+#if 0 && !defined(__APPLE__) && !defined(_WIN32)
- TEST_F(SubprocessTest, SetWithLots) {
-   // Arbitrary big number; needs to be over 1024 to confirm we're no longer
-   // hostage to pselect.
-   const unsigned kNumProcs = 1025;
- 

ninja-build.spec

@@ -1,19 +1,19 @@
 Name:           ninja-build
-Version:        1.7.1
+Version:        1.7.2
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        A small build system with a focus on speed
 License:        ASL 2.0
 URL:            http://martine.github.com/ninja/
 Source0:        https://github.com/martine/ninja/archive/v%{version}.tar.gz#/ninja-%{version}.tar.gz
 Source1:        ninja.vim
 Source2:        macros.ninja
-# Rename mentions of the executable name to be ninja-build.
+Patch0001:      0001-Rename-mentions-of-the-executable-name-to-be-ninja-b.patch
-Patch1000:      ninja-1.7.1-binary-rename.patch
+Patch0002:      0002-Disable-test-which-takes-too-many-resources-for-koji.patch
-# Disable a test which takes too many resources for koji.
+BuildRequires:  gcc-c++
-Patch1001:      ninja-1.7.1-resource-intensive-test.patch
+BuildRequires:  python3-devel
 BuildRequires:  asciidoc
 BuildRequires:  gtest-devel
-BuildRequires:  python2-devel
+#BuildRequires:  python2-devel
 BuildRequires:  re2c >= 0.11.3
 Requires:       emacs-filesystem
 Requires:       vim-filesystem
@@ -29,7 +29,7 @@ fast as possible.
 
 %build
 CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" \
-%{__python2} configure.py --bootstrap --verbose
+%{__python3} configure.py --bootstrap --verbose
 ./ninja -v manual
 ./ninja -v ninja_test
 
@@ -59,6 +59,9 @@ install -Dpm0644 %{S:2} %{buildroot}%{rpmmacrodir}/macros.ninja
 %{rpmmacrodir}/macros.ninja
 
 %changelog
+* Mon Nov 28 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.7.2-1
+- Update to 1.7.2
+
 * Mon Oct 10 2016 Igor Gnatenko <ignatenko@redhat.com> - 1.7.1-3
 - Fix install ninja.vim
 

sources

@@ -1 +1 @@
-e45bda009319f9af5385bb79e783da9f  ninja-1.7.1.tar.gz
+7b482218757acbaeac4d4d54a3cd94e1  ninja-1.7.2.tar.gz