summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-29 00:34:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-29 00:34:35 +0000
commitcd86b29da254a4e3b6aa4dde67e3061f6950e510 (patch)
treedf7abd84ff2fd4c9e400e44cc0ce82d7d3923453
parent5f3f080504a4e35eb5c963cc5af326aaf122e834 (diff)
* test/ruby/envutil.rb: fix for --disable-gems.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--test/ruby/envutil.rb2
-rw-r--r--version.h4
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f10fa9df2..d4bb18d9c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat May 29 09:34:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * test/ruby/envutil.rb: fix for --disable-gems.
+
Fri May 28 18:39:38 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (sym_inspect): escape ASCII-compatible strings.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 65b2f77915..c5215e4bdd 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -216,6 +216,6 @@ else
CONFIG['bindir'] = dir
CONFIG['ruby_install_name'] = name
CONFIG['RUBY_INSTALL_NAME'] = name
- Gem::ConfigMap[:bindir] = dir
+ Gem::ConfigMap[:bindir] = dir if defined?(Gem)
end
end
diff --git a/version.h b/version.h
index 1eb6fcd3c7..6949672900 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2010-05-28"
+#define RUBY_RELEASE_DATE "2010-05-29"
#define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1
@@ -7,7 +7,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
#include "ruby/version.h"