diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-26 00:52:58 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-26 00:52:58 +0000 |
| commit | c5b7d11e59cf8953d18ed6aba2c4df2b1eb29fd4 (patch) | |
| tree | 248fad4c3fffa76d7d7d5788ad4cfe48188eea41 | |
| parent | bc4be91a553b4b9f16a596d6daca6d70690b4e26 (diff) | |
merge revision(s) 35488:
* ext/-test-/win32/dln/extconf.rb: remove test DLL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/-test-/win32/dln/extconf.rb | 4 | ||||
| -rw-r--r-- | version.h | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb index cc94a67549..0b5089af14 100644 --- a/ext/-test-/win32/dln/extconf.rb +++ b/ext/-test-/win32/dln/extconf.rb @@ -1,12 +1,14 @@ if $mingw or $mswin $objs = ["dlntest.o"] - $cleanfiles << "$(topdir)/dlntest.dll" + testdll = "$(topdir)/dlntest.dll" + $cleanfiles << testdll config_string('cleanobjs') {|t| $cleanfiles.concat(t.gsub(/\$\*/, 'dlntest').split)} create_makefile("-test-/win32/dln") m = File.read("Makefile") dlntestlib = "dlntest.#{$LIBEXT}" m.sub!(/^OBJS =.*/) {"#{$&} #{dlntestlib}"} + FileUtils.rm_f(RbConfig.expand(testdll.dup)) open("Makefile", "wb") do |mf| mf.puts m, "\n" sodir = $extout ? "$(RUBYARCHDIR)/" : '' @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 301 +#define RUBY_PATCHLEVEL 302 -#define RUBY_RELEASE_DATE "2012-10-25" +#define RUBY_RELEASE_DATE "2012-10-26" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 26 #include "ruby/version.h" |