From ad55855d39b00fc096e72f74eb42b7decefce421 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Fri, 13 Apr 2018 14:30:19 -0400
Subject: [PATCH] Extend version number and README to indicate this Kitware
 feature branch

Pending upstream integration of the features added by this branch,
extend the version number of Ninja to indicate that it has the
'dyndep' feature so that tools can detect availability.

Also extend the version number to report the 'jobserver' feature.
---
 README         | 24 ++++++++++++++++++++++++
 src/version.cc |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/README b/README
index a1535ffac8..713ccacf05 100644
--- a/README
+++ b/README
@@ -1,3 +1,27 @@
+Kitware maintains this branch of Ninja in order to provide features
+that have not yet been integrated upstream:
+
+* Dynamic dependency discovery needed for Fortran builds
+* make-style jobserver support
+
+This branch may be *rebased* without notice for maintenance on top of
+the upstream 'master' branch.  It will be removed once upstream has
+integrated the features.
+
+Parts of this branch are under upstream consideration:
+
+* https://github.com/ninja-build/ninja/pull/1140
+* https://github.com/ninja-build/ninja/pull/1521
+
+As each PR is accepted additional parts of this branch will be submitted
+incrementally.
+
+Binaries built from versions of this branch are available here:
+
+* https://github.com/Kitware/ninja/releases
+
+-----------------------------------------------------------------------------
+
 Ninja is a small build system with a focus on speed.
 https://ninja-build.org/
 
diff --git a/src/version.cc b/src/version.cc
index 1c906aee06..e7efa3fd89 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -18,7 +18,7 @@
 
 #include "util.h"
 
-const char* kNinjaVersion = "1.9.0.git";
+const char* kNinjaVersion = "1.9.0.git.kitware.dyndep-1.jobserver-1";
 
 void ParseVersion(const string& version, int* major, int* minor) {
   size_t end = version.find('.');