merge revision(s) 42322:

	nmake doesn't out put targets

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 6 deletions

diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb
index 14a77b8db3..6e34ee7e46 100644
--- a/test/rubygems/test_gem_ext_builder.rb
+++ b/test/rubygems/test_gem_ext_builder.rb
@@ -50,8 +50,10 @@ install:
       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
diff --git a/version.h b/version.h
index 19e7e1bc44..725a8aef56 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"