diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-09 05:06:21 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-09 05:06:21 +0000 |
| commit | f07223228b0c994655fbc54f50ccedccc62ff4a4 (patch) | |
| tree | fb33db79edf3d898d97e2649bb5a91cc78ca6047 /win32 | |
| parent | a1d56b18d51a8e772243e992407899b26ecae22e (diff) | |
merge revision(s) 44440,44444: [Backport #9306]
* win32/Makefile.sub (fake.rb): should depend on version.h because
if RUBY_VERSION is updated, fake.rb need to say the new version
to avoid install error in rbconfig.rb.
* win32/{setup.mak,Makefile.sub}: update fake.rb like
template/fake.rb.in.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 7 | ||||
| -rw-r--r-- | win32/setup.mak | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 305f37df55..a04e8024be 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1034,14 +1034,17 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb -so_name=$(RUBY_SO_NAME) \ . $(icondirs) $(win_srcdir) -$(arch)-fake.rb: $(MKFILES) +$(arch)-fake.rb: $(MKFILES) $(srcdir)/version.h @echo Creating <<$@ class Object + remove_const :CROSS_COMPILING if defined?(CROSS_COMPILING) CROSS_COMPILING = RUBY_PLATFORM remove_const :RUBY_PLATFORM remove_const :RUBY_VERSION + remove_const :RUBY_DESCRIPTION if defined?(RUBY_DESCRIPTION) RUBY_PLATFORM = "$(arch)" - RUBY_VERSION = "$(MAJOR).$(MINOR).$(TEENY)" + RUBY_VERSION = $(RUBY_PROGRAM_VERSION) + RUBY_DESCRIPTION = "ruby #{RUBY_VERSION} (" + $(RUBY_PROGRAM_RELEASE_DATE) + ") [#{RUBY_PLATFORM}]" end class File remove_const :ALT_SEPARATOR diff --git a/win32/setup.mak b/win32/setup.mak index 458212bb7b..b6358e5dd5 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -117,6 +117,8 @@ int main(void) {return (EnumProcesses(NULL,0,NULL) ? 0 : 1);} MAJOR = RUBY_API_VERSION_MAJOR MINOR = RUBY_API_VERSION_MINOR TEENY = RUBY_API_VERSION_TEENY +RUBY_PROGRAM_VERSION = RUBY_VERSION +RUBY_PROGRAM_RELEASE_DATE = RUBY_RELEASE_DATE MSC_VER = _MSC_VER << |