Merge branch 'master' of git://github.com/jimweirich/rake

ruby · Sep 19, 2008 · a3d5a9a · a3d5a9a
2 parents c374f2d + 5d69a5e
commit a3d5a9a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/rake.rb b/lib/rake.rb
@@ -32,7 +32,6 @@
 RAKEVERSION = '0.8.2.1.0.11'
 
 require 'rbconfig'
-require 'getoptlong'
 require 'fileutils'
 require 'singleton'
 require 'monitor'

diff --git a/rakelib/ruby19.rake b/rakelib/ruby19.rake
@@ -5,7 +5,7 @@ module Ruby19
   RELEASE_FILES = FileList['bin/drake', 'lib/rake.rb', 'lib/rake/**/*']
   RELEASE_FILES.exclude('lib/rake/lib', 'project.rake', 'lib/rake/plugins', 'lib/rake/contrib')
 
-  SVN = "../thirdparty/ruby"
+  SVN = "#{ENV['HOME']}/working/svn/software/thirdparty/ruby"
 
   def run_tests(files, opts='')
     sh "#{PROG} -Ilib lib/rake/rake_test_loader.rb #{opts} #{files}"
@@ -15,6 +15,12 @@ module Ruby19
 end
 
 namespace "ruby19" do
+  desc "Generate a diff file between the primary repo and Ruby 1.9"
+  task :diff => [:check_svn] do
+    sh %{diff -u #{Ruby19::SVN}/lib/rake.rb lib/rake.rb}
+    sh %{diff -u -x .svn -x contrib -x lib #{Ruby19::SVN}/lib/rake lib/rake}
+  end
+
   desc "Ruby Release Files"
   task :release_files do
     puts Ruby19::RELEASE_FILES