X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Rakefile;h=5ea143b66e5a0792ab3346b686441335835e3da3;hb=f5d4bf8920868c2d1f88cc4f3bfcf85c0b566b2e;hp=74acf423293c82a93d8d75781da8c0cd0f01811c;hpb=ad849eb5a46d284caf8305f8f720169d4192a3ed;p=jquery.git diff --git a/Rakefile b/Rakefile index 74acf42..5ea143b 100644 --- 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" @@ -126,7 +126,7 @@ file sizzle do end file qunit do - puts "Retrieving QUnity from Github..." + puts "Retrieving QUnit from Github..." sh "git clone git://github.com/jquery/qunit.git #{qunit_dir}" end @@ -135,4 +135,4 @@ def cat( files ) files.map do |file| File.read(file) end.join('') -end \ No newline at end of file +end