diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-20 22:14:58 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-20 22:14:58 +0000 |
| commit | 7439c06ab7d1adc1ffce82ff39ba60ee78dd0996 (patch) | |
| tree | 4f649a8ee19edbfd86a66384a6cc400efa5c1e62 | |
| parent | e22b92dce4dc7723cf95849edf9beb7126c63960 (diff) | |
* configure.in (RUBY_PROGRAM_VERSION, RUBY_RELEASE_DATE): extracts
from version.h for cross-compiling.
* template/fake.rb.in (RUBY_VERSION, RUBY_DESCRIPTION): use above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | template/fake.rb.in | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 1e32b7db9c..005a2e30b0 100644 --- a/configure.in +++ b/configure.in @@ -84,6 +84,10 @@ done AC_SUBST(MAJOR) AC_SUBST(MINOR) AC_SUBST(TEENY) +RUBY_PROGRAM_VERSION=`sed -n 's/^#define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h` +AC_SUBST(RUBY_PROGRAM_VERSION) +RUBY_RELEASE_DATE=`sed -n 's/^#define RUBY_RELEASE_DATE "\(.*\)"/\1/p' $srcdir/version.h` +AC_SUBST(RUBY_RELEASE_DATE) if test "$MAJOR" = "1"; then AC_DEFINE(CANONICALIZATION_FOR_MATHN) fi diff --git a/template/fake.rb.in b/template/fake.rb.in index ed9416a16f..e8eba09289 100644 --- a/template/fake.rb.in +++ b/template/fake.rb.in @@ -4,8 +4,8 @@ class Object remove_const :RUBY_VERSION remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION) RUBY_PLATFORM = "@arch@" - RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@" - RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (#{Time.now.strftime("%Y-%m-%d")}) [#{RUBY_PLATFORM}]" + RUBY_VERSION = "@RUBY_PROGRAM_VERSION@" + RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (@RUBY_RELEASE_DATE@) [#{RUBY_PLATFORM}]" end if RUBY_PLATFORM =~ /mswin|bccwin|mingw/ class File |