aboutsummaryrefslogtreecommitdiffstats
path: root/version.h
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-17 12:56:10 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-17 12:56:10 +0000
commit63491598c6870c3097833d2a4666f38098b6b238 (patch)
tree1d192150ecd73eacda6255dcde096efd15ea5ca8 /version.h
parent8cfce15387f3ff9d922e60b3ff53cf874215fdf5 (diff)
downloadruby-63491598c6870c3097833d2a4666f38098b6b238.tar.gz
version.h: include branch name
* tool/file2lastrev.rb, tool/vcs.rb (get_revisions): define RUBY_BRANCH_NAME from the current branch name. * version.h (RUBY_REVISION_STR): include the current branch name not "trunk" always. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49301 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/version.h b/version.h
index b248842d12..f2aca00e9d 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,6 @@
#define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2015-01-17"
#define RUBY_PATCHLEVEL -1
-#define RUBY_BRANCH_NAME "trunk"
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1
@@ -31,7 +30,10 @@
#endif
#if RUBY_REVISION
-# ifdef RUBY_BRANCH_NAME
+# if RUBY_PATCHLEVEL == -1
+# ifndef RUBY_BRANCH_NAME
+# define RUBY_BRANCH_NAME "trunk"
+# endif
# define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION)
# else
# define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION)