Update Rakefile to remove module wrappers (feature parity with make and ant). Update...

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index ce92f4f..5792bb4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ DIST_DIR = ${PREFIX}/dist
 
 RHINO ?= java -jar ${BUILD_DIR}/js.jar
 
-CLOSURE_COMPILER = ${BUILD_DIR}/google-compiler-20091218.jar
+CLOSURE_COMPILER = ${BUILD_DIR}/google-compiler-20100917.jar
 
 MINJAR ?= java -jar ${CLOSURE_COMPILER}
 
@@ -24,6 +24,10 @@ BASE_FILES = ${SRC_DIR}/core.js\
        ${SRC_DIR}/manipulation.js\
        ${SRC_DIR}/css.js\
        ${SRC_DIR}/ajax.js\
+       ${SRC_DIR}/xhr.js\
+       ${SRC_DIR}/transports/jsonp.js\
+       ${SRC_DIR}/transports/script.js\
+       ${SRC_DIR}/transports/xhr.js\
        ${SRC_DIR}/effects.js\
        ${SRC_DIR}/offset.js\
        ${SRC_DIR}/dimensions.js
@@ -39,7 +43,7 @@ SIZZLE_DIR = ${SRC_DIR}/sizzle
 QUNIT_DIR = ${TEST_DIR}/qunit
 
 JQ_VER = $(shell cat version.txt)
-VER = sed s/@VERSION/${JQ_VER}/
+VER = sed "s/@VERSION/${JQ_VER}/"
 
 DATE=$(shell git log -1 --pretty=format:%ad)
 
@@ -75,13 +79,13 @@ init:
 jquery: ${JQ}
 jq: ${JQ}
 
-${JQ}: ${MODULES} ${DIST_DIR}
+${JQ}: ${MODULES} | ${DIST_DIR}
        @@echo "Building" ${JQ}
 
        @@cat ${MODULES} | \
                sed 's/.function..jQuery...{//' | \
                sed 's/}...jQuery..;//' | \
-               sed 's/Date:./&'"${DATE}"'/' | \
+               sed 's/@DATE/'"${DATE}"'/' | \
                ${VER} > ${JQ};
 
 ${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
@@ -97,8 +101,10 @@ min: ${JQ_MIN}
 ${JQ_MIN}: ${JQ}
        @@echo "Building" ${JQ_MIN}
 
-       @@head -$(shell grep -m 1 -n '*/' ${JQ} | cut -f1 -d:) ${JQ} > ${JQ_MIN}
-       @@${MINJAR} --js ${JQ} --warning_level QUIET --js_output_file ${JQ_MIN}
+       @@head -15 ${JQ} > ${JQ_MIN}
+       @@${MINJAR} --js ${JQ} --warning_level QUIET --js_output_file ${JQ_MIN}.tmp
+       @@cat ${JQ_MIN}.tmp >> ${JQ_MIN}
+       @@rm -f ${JQ_MIN}.tmp
 
 clean:
        @@echo "Removing Distribution directory:" ${DIST_DIR}