summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-07 08:40:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-07 08:40:32 +0000
commitfd10a1e5cff2532b8d0a985032dc0d432716b670 (patch)
tree4ae91f3a5dee8eac7504c90e55f6768ea00385d3
parent07e40885722e53c014a39b0c3d9a4d63ad482edb (diff)
* mkconfig.rb, lib/rbconfig/obsolete.rb: warn obsolete and
deprecated Config. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rbconfig/obsolete.rb2
-rwxr-xr-xmkconfig.rb4
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9626f88a13..1f0dcbac00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 7 17:40:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * mkconfig.rb, lib/rbconfig/obsolete.rb: warn obsolete and
+ deprecated Config.
+
Thu Aug 5 11:55:17 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/socket.c: use _() macro instead of __P(), because the
diff --git a/lib/rbconfig/obsolete.rb b/lib/rbconfig/obsolete.rb
new file mode 100644
index 0000000000..fcc7151ad2
--- /dev/null
+++ b/lib/rbconfig/obsolete.rb
@@ -0,0 +1,2 @@
+warn "Use RbConfig instead of obsolete and deprecated Config."
+Config = RbConfig # compatibility for ruby-1.8.4 and older.
diff --git a/mkconfig.rb b/mkconfig.rb
index f829441ade..ebd58ba1e8 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -27,7 +27,7 @@ print %[
# This file was created by #{mkconfig} when ruby was built. Any
# changes made to this file will be lost the next time ruby is built.
-module Config
+module RbConfig
RUBY_VERSION == "#{version}" or
raise "ruby lib version (#{version}) doesn't match executable version (\#{RUBY_VERSION})"
@@ -177,7 +177,7 @@ print <<EOS
Config::expand(val)
end
end
-RbConfig = Config # compatibility for ruby-1.9
+autoload :Config, "rbconfig/obsolete.rb" # compatibility for ruby-1.8.4 and older.
CROSS_COMPILING = nil unless defined? CROSS_COMPILING
EOS