summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-08 18:21:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-08 18:21:47 +0000
commitdfaf61504c3ae4f7d4a7f8dea2d853faba33fbee (patch)
treeaba512cae595a587b636d079151b7ed5383b421d
parentd64e40aeb0014bf0b46ff3049bb274b12448fae1 (diff)
* mkconfig.rb: fix for continued lines. based on a patch from
Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xmkconfig.rb11
-rw-r--r--version.h6
3 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index b1b9022578..7e0608233a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 9 03:21:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * mkconfig.rb: fix for continued lines. based on a patch from
+ Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
+
Mon Dec 8 23:34:18 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
diff --git a/mkconfig.rb b/mkconfig.rb
index d3602516f9..de37a7e2cb 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -55,14 +55,13 @@ File.foreach "config.status" do |line|
continued_name = name
next
end
- when /^"(.+)"\s*(\\)?$/
+ when /^"(.*)"\s*(\\)?$/
if continued_line
continued_line << $1
- unless $2
- val = continued_line.join("")
- name = continued_name
- continued_line = nil
- end
+ next if $2
+ val = continued_line.join("")
+ name = continued_name
+ continued_line = nil
end
when /^(?:ac_given_)?INSTALL=(.*)/
v_fast << " CONFIG[\"INSTALL\"] = " + $1 + "\n"
diff --git a/version.h b/version.h
index 12ca1720eb..903f7a9516 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-12-08"
+#define RUBY_RELEASE_DATE "2008-12-09"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081208
+#define RUBY_RELEASE_CODE 20081209
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_DAY 9
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];