From aad58dde60038e5bd5f0dc538b2c08625bf31a0a Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 21 Sep 2016 15:07:25 -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. --- README | 20 ++++++++++++++++++++ src/version.cc | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/README b/README index a1535ffac8..c231e1bc25 100644 --- a/README +++ b/README @@ -1,3 +1,23 @@ +Kitware maintains this branch of Ninja in order to provide features needed +to support Fortran builds but that have not yet been integrated upstream. +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/1039 +* https://github.com/ninja-build/ninja/pull/1111 + +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 e2a83bbe5e..7130aa340d 100644 --- a/src/version.cc +++ b/src/version.cc @@ -18,7 +18,7 @@ #include "util.h" -const char* kNinjaVersion = "1.7.2.git"; +const char* kNinjaVersion = "1.7.2.git.kitware.dyndep-1"; void ParseVersion(const string& version, int* major, int* minor) { size_t end = version.find('.');