Trim out the module wrappers during the build process. Follow-up to #7011.

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index 612fce1..d11d4e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ VER = sed s/@VERSION/${JQ_VER}/
 RHINO = java -jar ${BUILD_DIR}/js.jar
 MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar
 
-DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
+DATE=`git log -1 --pretty=format:%ad`
 
 all: jquery lint min
        @@echo "jQuery build complete."
@@ -56,6 +56,8 @@ ${JQ}: selector ${MODULES}
        @@mkdir -p ${DIST_DIR}
 
        @@cat ${MODULES} | \
+               sed 's/.function..jQuery...{//' | \
+               sed 's/}...jQuery..;//' | \
                sed 's/Date:./&'"${DATE}"'/' | \
                ${VER} > ${JQ};
 
@@ -80,7 +82,7 @@ clean:
        @@rm -rf ${DIST_DIR}
 
        @@echo "Removing built copy of Sizzle"
-       @@rm src/selector.js
+       @@rm -f src/selector.js
 
        @@echo "Removing cloned directories"
        @@rm -rf test/qunit src/sizzle