[前][次][番号順一覧][スレッド一覧]

ruby-changes:25277

From: usa <ko1@a...>
Date: Fri, 26 Oct 2012 09:53:39 +0900 (JST)
Subject: [ruby-changes:25277] usa:r37329 (ruby_1_9_3): merge revision(s) 35488:

usa	2012-10-26 09:52:58 +0900 (Fri, 26 Oct 2012)

  New Revision: 37329

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37329

  Log:
    merge revision(s) 35488:
    
    * ext/-test-/win32/dln/extconf.rb: remove test DLL.

  Modified files:
    branches/ruby_1_9_3/ext/-test-/win32/dln/extconf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ext/-test-/win32/dln/extconf.rb
===================================================================
--- ruby_1_9_3/ext/-test-/win32/dln/extconf.rb	(revision 37328)
+++ ruby_1_9_3/ext/-test-/win32/dln/extconf.rb	(revision 37329)
@@ -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)/" : ''
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37328)
+++ ruby_1_9_3/version.h	(revision 37329)
@@ -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"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]