summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-05-07 04:47:46 (GMT)
committerEvan Martin <martine@danga.com>2012-05-08 16:08:31 (GMT)
commit3b0e78ae100f1a6d97358a9bd4a5d65280f42904 (patch)
tree165c4b127fd88e303d07a21cacd406f04661f0dd /src
parentd73af72473a926bf7a90dcf35d902158dc8106c9 (diff)
downloadNinja-3b0e78ae100f1a6d97358a9bd4a5d65280f42904.zip
Ninja-3b0e78ae100f1a6d97358a9bd4a5d65280f42904.tar.gz
Ninja-3b0e78ae100f1a6d97358a9bd4a5d65280f42904.tar.bz2
include version number
Diffstat (limited to 'src')
-rw-r--r--src/ninja.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/ninja.cc b/src/ninja.cc
index 667aaae..6090bdb 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -49,6 +49,10 @@
namespace {
+/// The version number of the current Ninja release. This will always
+/// be "git" on trunk.
+const char* kVersion = "git";
+
/// Global information passed into subtools.
struct Globals {
Globals() : state(new State()) {}
@@ -83,6 +87,7 @@ void Usage(const BuildConfig& config) {
"options:\n"
" -C DIR change to DIR before doing anything else\n"
" -f FILE specify input build file [default=build.ninja]\n"
+" -V print ninja version (\"%s\")\n"
"\n"
" -j N run N jobs in parallel [default=%d]\n"
" -l N do not start new jobs if the load average is greater than N\n"
@@ -94,7 +99,7 @@ void Usage(const BuildConfig& config) {
" -t TOOL run a subtool\n"
" use '-t list' to list subtools.\n"
" terminates toplevel options; further flags are passed to the tool.\n",
- config.parallelism);
+ kVersion, config.parallelism);
}
/// Choose a default value for the -j (parallelism) flag.
@@ -641,7 +646,7 @@ int main(int argc, char** argv) {
int opt;
while (tool.empty() &&
- (opt = getopt_long(argc, argv, "d:f:hj:k:l:nt:vC:", kLongOptions,
+ (opt = getopt_long(argc, argv, "d:f:hj:k:l:nt:vC:V", kLongOptions,
NULL)) != -1) {
switch (opt) {
case 'd':
@@ -686,6 +691,9 @@ int main(int argc, char** argv) {
case 'C':
working_dir = optarg;
break;
+ case 'V':
+ printf("%s\n", kVersion);
+ return 0;
case 'h':
default:
Usage(globals.config);