X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=cf985549b5709538aa87ae9e349c75b1c069ff85;hb=981d1e08eb00f4b5c29ad1f3977a45e30c93ad70;hp=ce92f4ffb5a1dbf2636bbbf2d4a6c69887048729;hpb=06883449d6ac16c2f9ed631da15d88929dd7f817;p=jquery.git

diff --git a/Makefile b/Makefile
index ce92f4f..cf98554 100644
--- 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,9 @@ BASE_FILES = ${SRC_DIR}/core.js\
 	${SRC_DIR}/manipulation.js\
 	${SRC_DIR}/css.js\
 	${SRC_DIR}/ajax.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 +42,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 +78,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 +100,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}