diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 07:25:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 07:25:50 +0000 |
| commit | 399aed89724ecb3aebd0f46aeb8c98a6bdf5c47d (patch) | |
| tree | 8045778cbad3bc3e41c846074f4a7db239ce5e47 | |
| parent | 64603725aa485e14b0a06fbfc94c11f0b0d42de6 (diff) | |
* ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and
$srcs are always Array or nil now.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/extmk.rb | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 12 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Tue Mar 3 16:25:43 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and + $srcs are always Array or nil now. + Sun Mar 1 19:41:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * util.c (ruby_dtoa): allocates one more byte to get rid of buffer diff --git a/ext/extmk.rb b/ext/extmk.rb index 59b451094b..35a54e814a 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -113,8 +113,8 @@ def extmake(target) $mdir = target $srcdir = File.join($top_srcdir, "ext", $mdir) $preload = nil - $objs = "" - $srcs = "" + $objs = [] + $srcs = [] $compiled[target] = false makefile = "./Makefile" ok = File.exist?(makefile) diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 6a70565dde..10bc40a993 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1466,9 +1466,8 @@ def create_makefile(target, srcprefix = nil) for i in $objs i.sub!(/\.o\z/, ".#{$OBJEXT}") end - $objs = $objs.join(" ") - target = nil if $objs == "" + target = nil if $objs.empty? if target and EXPORT_PREFIX if File.exist?(File.join(srcdir, target + '.def')) @@ -1507,7 +1506,7 @@ target_prefix = #{target_prefix} LOCAL_LIBS = #{$LOCAL_LIBS} LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS} SRCS = #{srcs.collect(&File.method(:basename)).join(' ')} -OBJS = #{$objs} +OBJS = #{$objs.join(" ")} TARGET = #{target} DLLIB = #{dllib} EXTSTATIC = #{$static || ""} @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-03-01" +#define RUBY_RELEASE_DATE "2009-03-03" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090301 +#define RUBY_RELEASE_CODE 20090303 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 3 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |