From 63491598c6870c3097833d2a4666f38098b6b238 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 17 Jan 2015 12:56:10 +0000 Subject: 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 --- version.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'version.h') 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) -- cgit v1.2.3