nagachika	2013-08-03 20:47:25 +0900 (Sat, 03 Aug 2013)

  New Revision: 42353

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

  Log:
    merge revision(s) 42322:
    
    nmake doesn't out put targets

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/rubygems/test_gem_ext_builder.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42352)
+++ ruby_2_0_0/version.h	(revision 42353)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-07-28"
-#define RUBY_PATCHLEVEL 283
+#define RUBY_RELEASE_DATE "2013-08-03"
+#define RUBY_PATCHLEVEL 284
 
 #define RUBY_RELEASE_YEAR 2013
-#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 8
+#define RUBY_RELEASE_DAY 3
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/rubygems/test_gem_ext_builder.rb
===================================================================
--- ruby_2_0_0/test/rubygems/test_gem_ext_builder.rb	(revision 42352)
+++ ruby_2_0_0/test/rubygems/test_gem_ext_builder.rb	(revision 42353)
@@ -50,8 +50,10 @@ install: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/rubygems/test_gem_ext_builder.rb#L50
       refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
     end
 
-    assert_match %r%^all: destination$%,     results
-    assert_match %r%^install: destination$%, results
+    if /nmake/ !~ results
+      assert_match %r%^all: destination$%,     results
+      assert_match %r%^install: destination$%, results
+    end
   end
 
 end

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42322


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