Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2016-03-31 02:13:13 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-04-13 10:45:23 +0300
commited050753ce3fda539ed46ed314019a34b1358486 (patch)
treea3210cec29d2eb2687de5527a2e0217e9c65ea54 /intern/cycles/app/cycles_standalone.cpp
parent84c68dcb3fbd172626e2f58a2b2d8f9390520b48 (diff)
Add a version number to Cycles standalone
Now Cycles has its own versioning, that is mainly interesting for external projects, which integrate the engine. We start with version 1.7.0. Reasons for that: * The engine is too mature for a 1.0 release. * We assume that Cycles inside of Blender 2.61 was version 0.1. We count upwards in 0.1 steps, therefore Cycles inside of Blender 2.77 would be 1.7. We use a common versioning scheme here, with 3 decimals for the major, minor and patch level. At the moment cycles --version can be used to display the version, easy to parse for external projects. The info will be added to the UI later aswell.
Diffstat (limited to 'intern/cycles/app/cycles_standalone.cpp')
-rw-r--r--intern/cycles/app/cycles_standalone.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index b0d49d6ee72..951e8dca677 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -32,6 +32,7 @@
#include "util_string.h"
#include "util_time.h"
#include "util_transform.h"
+#include "util_version.h"
#ifdef WITH_CYCLES_STANDALONE_GUI
#include "util_view.h"
@@ -358,7 +359,7 @@ static void options_parse(int argc, const char **argv)
/* parse options */
ArgParse ap;
- bool help = false, debug = false;
+ bool help = false, debug = false, version = false;
int verbosity = 1;
ap.options ("Usage: cycles [options] file.xml",
@@ -380,6 +381,7 @@ static void options_parse(int argc, const char **argv)
"--verbose %d", &verbosity, "Set verbosity of the logger",
#endif
"--help", &help, "Print help message",
+ "--version", &version, "Print version number",
NULL);
if(ap.parse(argc, argv) < 0) {
@@ -406,6 +408,10 @@ static void options_parse(int argc, const char **argv)
exit(EXIT_SUCCESS);
}
+ else if(version) {
+ printf("%s\n", cycles_version_number().c_str());
+ exit(EXIT_SUCCESS);
+ }
else if(help || options.filepath == "") {
ap.usage();
exit(EXIT_SUCCESS);