kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 44440,44444: [Backport #9306]

Browse source 
* 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
This commit is contained in:
naruse 2014-01-09 05:06:21 +00:00
parent a1d56b18d5
commit f07223228b
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Thu Jan 9 14:05:24 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/{setup.mak,Makefile.sub}: update fake.rb like
template/fake.rb.in.
Thu Jan 9 14:05:24 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* 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.
Thu Jan 9 08:21:00 2014 Aman Gupta <ruby@tmm1.net>
* test/net/imap/cacert.pem: generate new CA cert, since the last one

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.1"
#define RUBY_RELEASE_DATE "2014-01-09"
#define RUBY_PATCHLEVEL 3
#define RUBY_PATCHLEVEL 4
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 1

7
win32/Makefile.sub
View file

@ -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

2
win32/setup.mak
View file

@ -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
<<