Fix a potential error in the previous commit caused by the use of a separate index...

[jquery.git] / Rakefile

diff --git a/Rakefile b/Rakefile
index 790b5f3..5ea143b 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,7 @@ test_dir  = File.join( prefix, 'test' )
 # setting DIST_DIR before calling rake
 dist_dir  = ENV['DIST_DIR'] || File.join( prefix, 'dist' )
 
-base_files = %w{intro core support data queue attributes event selector traversing manipulation css ajax effects offset dimensions outro}.map { |js| File.join( src_dir, "#{js}.js" ) }
+base_files = %w{intro core support data queue attributes event selector traversing manipulation css ajax xhr transports/jsonp transports/script transports/xhr effects offset dimensions outro}.map { |js| File.join( src_dir, "#{js}.js" ) }
 
 # Sizzle, QUnit and jQuery files/dirs
 sizzle_dir = File.join( src_dir, "sizzle" )
@@ -28,13 +28,13 @@ version    = File.read( File.join( prefix, 'version.txt' ) ).strip
 
 # Build tools
 rhino      = "java -jar #{build_dir}/js.jar"
-minfier    = "java -jar #{build_dir}/google-compiler-20091218.jar"
+minfier    = "java -jar #{build_dir}/google-compiler-20100917.jar"
 
 # Turn off output other than needed from `sh` and file commands
 verbose(false) 
 
 # Tasks
-task :default => "jquery"
+task :default => "all"
 
 desc "Builds jQuery; Tests with JSLint; Minifies jQuery"
 task :all => [:jquery, :lint, :min] do
@@ -62,14 +62,14 @@ end
 desc "Removes dist folder, selector.js, and Sizzle/QUnit"
 task :clean do
   puts "Removing Distribution directory: #{dist_dir}..." 
-  rm_r dist_dir, :force => true
+  rm_rf dist_dir
 
   puts "Removing built copy of Sizzle..."
-  rm_r selector, :force => true
+  rm_rf selector
 
   puts "Removing cloned directories..."
-  rm_r qunit_dir, :force => true
-  rm_r sizzle_dir, :force => true
+  rm_rf qunit_dir
+  rm_rf sizzle_dir
 end
 
 desc "Rebuilds selector.js from SizzleJS"
@@ -135,4 +135,4 @@ def cat( files )
   files.map do |file|
     File.read(file)
   end.join('')
-end
\ No newline at end of file
+end