From c1625f6b79b2693ea85f2c16349f708ff203773b Mon Sep 17 00:00:00 2001
From: Jonas Pfenniger <jonas@pfenniger.name>
Date: Thu, 30 Dec 2010 01:38:28 -0600
Subject: [PATCH] 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.

---
 Makefile |    2 +-
 Rakefile |   29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6f22817..5792bb4 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ init:
 jquery: ${JQ}
 jq: ${JQ}
 
-${JQ}: ${MODULES} ${DIST_DIR}
+${JQ}: ${MODULES} | ${DIST_DIR}
 	@@echo "Building" ${JQ}
 
 	@@cat ${MODULES} | \
diff --git a/Rakefile b/Rakefile
index 4319aa7..52d7899 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,7 +9,28 @@ 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 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_dir = File.join( src_dir, "sizzle" )
@@ -89,7 +110,11 @@ file jq => [dist_dir, base_files].flatten do
   puts "Building jquery.js..."
 
   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
 
-- 
1.7.10.4