diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:52:16 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:52:16 +0000 |
| commit | af627192b768216371bda06476940d7290b94a31 (patch) | |
| tree | 4574e55a2c35b8c3cfcc84d6a6f81fa47aeb8de3 /version.h | |
| parent | 9b425aed7af824e030cb2ad83d85d3d586d13559 (diff) | |
merges r20920, r20936, r20939 and r20966 from trunk into ruby_1_9_1.
* common.mk (revision.h): uses tool/file2lastrev.rb to support
git-svn.
* version.h: changed version string as
`ruby 1.9.1 (2008-12-22 patchlevel-5000 trunk 20912)
[i386-darwin9.6.0]'.
* tool/file2lastrev.rb: wrapper script that abstracts subversion
and git-svn.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
| -rw-r--r-- | version.h | 18 |
1 files changed, 7 insertions, 11 deletions
@@ -30,19 +30,15 @@ RUBY_EXTERN const char ruby_copyright[]; #define RUBY_REVISION 0 #endif -#if RUBY_PATCHLEVEL -#define RUBY_PATCHLEVEL_STR " patchlevel "STRINGIZE(RUBY_PATCHLEVEL) -#else -#define RUBY_PATCHLEVEL_STR "" -#endif +#define RUBY_PATCHLEVEL_STR " patchlevel-"STRINGIZE(RUBY_PATCHLEVEL) #if RUBY_REVISION -#ifdef RUBY_BRANCH_NAME -#define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION) -#else -#define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION) -#endif +# ifdef RUBY_BRANCH_NAME +# define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "STRINGIZE(RUBY_REVISION) +# else +# define RUBY_REVISION_STR " revision "STRINGIZE(RUBY_REVISION) +# endif #else -#define RUBY_REVISION_STR "" +# define RUBY_REVISION_STR "" #endif # define RUBY_DESCRIPTION \ |