X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=Makefile;h=146b5e3c2bf39cb9663069d5c3d5d6a3b8dfd663;hb=6d358c0cdd4f84884c3d776bad0f48a93908b29b;hp=6a71722bece5456a3d71b8b680d1302e2e62e494;hpb=c43b078c6911027fd4124d542446ad0098662f6a;p=jquery.git

diff --git a/Makefile b/Makefile
index 6a71722..146b5e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V ?= 0
+V ?= 0
 
 SRC_DIR = src
 TEST_DIR = test
@@ -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\
@@ -93,17 +90,14 @@ ${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}
+	@@sed -i '$ s#^\( \*/\)\(.\+\)#\1\n\2;#' ${JQ_MIN}
 
 clean:
 	@@echo "Removing Distribution directory:" ${DIST_DIR}