diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-22 20:58:40 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-22 20:58:40 +0000 |
commit | 4dadadeeb1fe02e2e2d52054fcea09e72ac77c65 (patch) | |
tree | 6120d5a0d73fef6aa0a865e7e2058cb51b50bd3f | |
parent | e0afcb07befee4fcbbd55925313ced99c8680527 (diff) |
* lib/rdoc/options.rb (Options::check_diagram): dot -V output
changed. [ ruby-Bugs-11978 ], Thanks Florian Frank.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@13486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/rdoc/options.rb | 4 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Sun Sep 23 05:42:35 2007 URABE Shyouhei <shyouhei@ruby-lang.org> + + * lib/rdoc/options.rb (Options::check_diagram): dot -V output + changed. [ ruby-Bugs-11978 ], Thanks Florian Frank. + Mon Sep 17 04:47:02 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * ruby.c (proc_options): -W should be allowed in RUBYOPT diff --git a/lib/rdoc/options.rb b/lib/rdoc/options.rb index 53eee992e2..31441793c4 100644 --- a/lib/rdoc/options.rb +++ b/lib/rdoc/options.rb @@ -539,12 +539,12 @@ class Options ver = nil IO.popen("dot -V 2>&1") do |io| ver = io.read - if ver =~ /dot\s+version(?:\s+gviz)?\s+(\d+)\.(\d+)/ + if ver =~ /dot.+version(?:\s+gviz)?\s+(\d+)\.(\d+)/ ok = ($1.to_i > 1) || ($1.to_i == 1 && $2.to_i >= 8) end end unless ok - if ver =~ /^dot version/ + if ver =~ /^dot.+version/ $stderr.puts "Warning: You may need dot V1.8.6 or later to use\n", "the --diagram option correctly. You have:\n\n ", ver, @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2007-09-17" +#define RUBY_RELEASE_DATE "2007-09-23" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20070917 -#define RUBY_PATCHLEVEL 111 +#define RUBY_RELEASE_CODE 20070923 +#define RUBY_PATCHLEVEL 112 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 23 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |