Update Rakefile to remove module wrappers (feature parity with make and ant). Update Makefile to avoid rebuilding jquery.js when it is not necessary to do so.

This commit is contained in:
Jonas Pfenniger 2010-12-30 01:38:28 -06:00 committed by Colin Snover
parent 4eeae8b0bc
commit c1625f6b79
2 changed files with 28 additions and 3 deletions

View file

@ -79,7 +79,7 @@ init:
jquery: ${JQ} jquery: ${JQ}
jq: ${JQ} jq: ${JQ}
${JQ}: ${MODULES} ${DIST_DIR} ${JQ}: ${MODULES} | ${DIST_DIR}
@@echo "Building" ${JQ} @@echo "Building" ${JQ}
@@cat ${MODULES} | \ @@cat ${MODULES} | \

View file

@ -9,7 +9,28 @@ test_dir = File.join( prefix, 'test' )
# setting DIST_DIR before calling rake # setting DIST_DIR before calling rake
dist_dir = ENV['DIST_DIR'] || File.join( prefix, 'dist' ) dist_dir = ENV['DIST_DIR'] || File.join( prefix, 'dist' )
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" ) } 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, QUnit and jQuery files/dirs
sizzle_dir = File.join( src_dir, "sizzle" ) sizzle_dir = File.join( src_dir, "sizzle" )
@ -89,7 +110,11 @@ file jq => [dist_dir, base_files].flatten do
puts "Building jquery.js..." puts "Building jquery.js..."
File.open(jq, 'w') do |f| File.open(jq, 'w') do |f|
f.write cat(base_files).gsub(/@DATE/, date).gsub(/@VERSION/, version) f.write cat(base_files).
gsub(/@DATE/, date).
gsub(/@VERSION/, version).
gsub(/.function..jQuery...\{/, '').
gsub(/\}...jQuery..;/, '')
end end
end end