archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

* ext/dl/extconf.rb, ext/iconv/charset_alias.rb: use RbConfig.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-26 23:42:03 +00:00
parent bb88a5a201
commit 52659f509b
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Nov 27 08:42:01 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/dl/extconf.rb, ext/iconv/charset_alias.rb: use RbConfig.
Fri Nov 26 10:09:09 2010 NAKAMURA Usaku <usa@ruby-lang.org> Fri Nov 26 10:09:09 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/Makefile.sub (WARNFLAGS): shut up the meaningless warnings of * win32/Makefile.sub (WARNFLAGS): shut up the meaningless warnings of

2
ext/dl/extconf.rb
View file

@ -22,7 +22,7 @@ end
($CPPFLAGS || $CFLAGS) << " -I." ($CPPFLAGS || $CFLAGS) << " -I."
if (Config::CONFIG['CC'] =~ /gcc/) # from Win32API if (RbConfig::CONFIG['CC'] =~ /gcc/) # from Win32API
$CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer" $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
end end

4
ext/iconv/charset_alias.rb
View file

@ -6,8 +6,8 @@ require 'optparse'
# http://www.ctan.org/get/macros/texinfo/texinfo/gnulib/lib/config.charset # http://www.ctan.org/get/macros/texinfo/texinfo/gnulib/lib/config.charset
# Tue, 25 Dec 2007 00:00:00 GMT # Tue, 25 Dec 2007 00:00:00 GMT
OS = Config::CONFIG["target_os"] OS = RbConfig::CONFIG["target_os"]
SHELL = Config::CONFIG['SHELL'] SHELL = RbConfig::CONFIG['SHELL']
class Hash::Ordered < Hash class Hash::Ordered < Hash
def [](key) def [](key)

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8" #define RUBY_VERSION "1.8.8"
#define RUBY_RELEASE_DATE "2010-11-26" #define RUBY_RELEASE_DATE "2010-11-27"
#define RUBY_VERSION_CODE 188 #define RUBY_VERSION_CODE 188
#define RUBY_RELEASE_CODE 20101126 #define RUBY_RELEASE_CODE 20101127
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8 #define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 11 #define RUBY_RELEASE_MONTH 11
#define RUBY_RELEASE_DAY 26 #define RUBY_RELEASE_DAY 27
#define NO_STRING_LITERAL_CONCATENATION 1 #define NO_STRING_LITERAL_CONCATENATION 1
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN

2
win32/resource.rb
View file

@ -2,7 +2,7 @@
require 'rbconfig' require 'rbconfig'
CONFIG = Config::MAKEFILE_CONFIG CONFIG = RbConfig::MAKEFILE_CONFIG
version = %w'MAJOR MINOR TEENY'.map{|v| CONFIG[v] || '0'} version = %w'MAJOR MINOR TEENY'.map{|v| CONFIG[v] || '0'}
patch = CONFIG['PATCHLEVEL'] patch = CONFIG['PATCHLEVEL']