Rakefile in drake-0.8.1.10.0.1 vs Rakefile in drake-0.8.1.11.0.1

@@ -14,11 +14,11 @@
 end
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-CLEAN.include('**/*.o', '*.dot', '**/*.rbc')
+CLEAN.include('**/*.o', '*.dot', '**/.*.rbc')
 CLOBBER.include('doc/example/main', 'testdata')
 CLOBBER.include('test/data/**/temp_*')
 CLOBBER.include('test/data/chains/play.*')
 CLOBBER.include('test/data/file_creation_task/build')
 CLOBBER.include('test/data/file_creation_task/src')
@@ -47,10 +47,12 @@
 # The default task is run if rake is given no explicit arguments.
 
 desc "Default Task"
 task :default => :test_all
 
+load 'Rakefile.drake'
+
 # Test Tasks ---------------------------------------------------------
 task :dbg do |t|
   puts "Arguments are: #{t.args.join(', ')}"
 end
 
@@ -219,11 +221,11 @@
     s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
     s.rdoc_options = rd.options
 
     #### Author and project details.
 
-    s.author = "Jim Weirich, James M. Lawrence"
+    s.author = "James M. Lawrence"
     s.email = "[e-mail]"
     s.homepage = "http://drake.rubyforge.org"
     s.rubyforge_project = "drake"
 #     if ENV['CERT_DIR']
 #       s.signing_key = File.join(ENV['CERT_DIR'], 'gem-private_key.pem')
@@ -430,109 +432,5 @@
 
 desc "Where is the current directory.  This task displays\nthe current rake directory"
 task :where_am_i do
   puts Rake.original_dir
 end
-
-######################################################################
-# repackage files from contrib/
-
-$LOAD_PATH.unshift "./contrib/comp_tree/contrib/quix/lib"
-require 'quix/subpackager'
-require 'quix/fileutils'
-
-task :generate_rb do
-  packages = {
-    :rake => {
-      :name_in_ruby => "Rake",
-      :lib_dir => "./lib",
-      :subpackages => {
-        :comp_tree => {
-          :name_in_ruby => "CompTree",
-          :sources => [
-            "driver",
-            "node",
-            "task_node",
-            "error",
-            "bucket_ipc",
-            "algorithm",
-            "retriable_fork",
-            "quix/diagnostic",
-            "quix/kernel",
-            "quix/builtin/kernel/tap",
-          ],
-          :lib_dir => "./contrib/comp_tree/lib",
-          :ignore_root_rb => true,
-        },
-      },
-    },
-  }
-  Quix::Subpackager.run(packages)
-end
-
-######################################################################
-# git
-
-def git(*args)
-  cmd = ["git"] + args
-  sh(*cmd)
-end
-
-task :add_contrib_first_time => :init_contrib do
-  git(*%w!merge --squash -s ours --no-commit comp_tree/master!)
-  git(*%w!read-tree --prefix=contrib/comp_tree -u comp_tree/master!)
-  git("commit", "-m", "add comp_tree package")
-end
-
-task :init_contrib do
-  unless `git remote`.split.include? "comp_tree"
-    git(*%w!remote add -f comp_tree [e-mail]:quix/comp_tree.git!)
-  end
-end
-
-task :run_pull_contrib => :init_contrib do
-  git(*%w!pull --no-commit -s subtree comp_tree master!)
-end
-
-task :pull_mainline do
-  git(*%w!pull --no-commit
-          git://github.com/jimweirich/rake.git
-          refs/heads/master:refs/heads/origin!)
-end
-
-task :pull_contrib => [ :init_contrib, :run_pull_contrib, :generate_rb ]
-
-######################################################################
-# drake_release
-
-require 'fileutils'
-
-task :drake_prerelease do
-  rm_rf("html")
-  rm_rf("pkg")
-end
-
-task :drake_publish => :rdoc do
-  Dir.chdir(rd.rdoc_dir) {
-    sh(*%w(scp -r . [e-mail]:/var/www/gforge-projects/drake))
-  }
-end
-
-task :drake_upload do
-  %w(gem tgz).each_with_index { |ext, index|
-    sh("rubyforge",
-       (index == 0 ? "add_release" : "add_file"), 
-       SPEC.rubyforge_project,
-       SPEC.rubyforge_project,
-       SPEC.version.to_s,
-       "pkg/#{SPEC.name}-#{SPEC.version}.#{ext}")
-  }
-end
-
-task :drake_release =>
-  [
-   :test_all,
-   :drake_prerelease,
-   :drake_publish,
-   :package,
-   :drake_upload,
-  ]