X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=Makefile;h=c708db5a1455adfe4ee75dfc3bdba5bef1fbff41;hp=0dae73230dd3d6ba57df1af23d83b465cea838ed;hb=9d306bd73bb47562cd52f0fc4cc158c534cfdfdf;hpb=9bd9ebdd73fe0e2d29fadf82947c98adde4023e7

diff --git a/Makefile b/Makefile
index 0dae732..c708db5 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,8 @@ BUILD_DIR = build
 PREFIX = .
 DIST_DIR = ${PREFIX}/dist
 
-RHINO ?= java -jar ${BUILD_DIR}/js.jar
-
-CLOSURE_COMPILER = ${BUILD_DIR}/google-compiler-20100917.jar
-
-MINJAR ?= java -jar ${CLOSURE_COMPILER}
+JS_ENGINE ?= `which node nodejs`
+COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
 
 BASE_FILES = ${SRC_DIR}/core.js\
 	${SRC_DIR}/support.js\
@@ -24,6 +21,9 @@ BASE_FILES = ${SRC_DIR}/core.js\
 	${SRC_DIR}/manipulation.js\
 	${SRC_DIR}/css.js\
 	${SRC_DIR}/ajax.js\
+	${SRC_DIR}/ajax/jsonp.js\
+	${SRC_DIR}/ajax/script.js\
+	${SRC_DIR}/ajax/xhr.js\
 	${SRC_DIR}/effects.js\
 	${SRC_DIR}/offset.js\
 	${SRC_DIR}/dimensions.js
@@ -75,13 +75,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
@@ -90,17 +90,16 @@ ${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
 
 lint: ${JQ}
 	@@echo "Checking jQuery against JSLint..."
-	@@${RHINO} build/jslint-check.js
+	@@${JS_ENGINE} build/jslint-check.js
 
 min: ${JQ_MIN}
 
 ${JQ_MIN}: ${JQ}
 	@@echo "Building" ${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
+	@@${COMPILER} ${JQ} > ${JQ_MIN}.tmp
+	@@echo ";" >> ${JQ_MIN}.tmp
+	@@sed 's/\*\/(/*\/Ê©(/' ${JQ_MIN}.tmp | tr "Ê©" "\n" > ${JQ_MIN}
+	@@rm -rf ${JQ_MIN}.tmp
 
 clean:
 	@@echo "Removing Distribution directory:" ${DIST_DIR}