X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=Makefile;h=48a885da28e05dbab58f390c862f2c5544c375c1;hp=6a71722bece5456a3d71b8b680d1302e2e62e494;hb=8d8db3f2b3f8c3d41854726c8a0227f6deecc602;hpb=c43b078c6911027fd4124d542446ad0098662f6a

diff --git a/Makefile b/Makefile
index 6a71722..48a885d 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\
@@ -46,7 +43,7 @@ VER = sed "s/@VERSION/${JQ_VER}/"
 
 DATE=$(shell git log -1 --pretty=format:%ad)
 
-all: init jquery min lint
+all: jquery min lint
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -71,12 +68,16 @@ define clone_or_pull
 
 endef
 
-init:
+${QUNIT_DIR}:
 	$(call clone_or_pull, ${QUNIT_DIR}, git://github.com/jquery/qunit.git)
+
+${SIZZLE_DIR}:
 	$(call clone_or_pull, ${SIZZLE_DIR}, git://github.com/jeresig/sizzle.git)
 
-jquery: ${JQ}
-jq: ${JQ}
+init: ${QUNIT_DIR} ${SIZZLE_DIR}
+
+jquery: init ${JQ}
+jq: init ${JQ}
 
 ${JQ}: ${MODULES} | ${DIST_DIR}
 	@@echo "Building" ${JQ}
@@ -91,19 +92,26 @@ ${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
 	@@echo "Building selector code from Sizzle"
 	@@sed '/EXPOSE/r src/sizzle-jquery.js' ${SIZZLE_DIR}/sizzle.js | grep -v window.Sizzle > ${SRC_DIR}/selector.js
 
-lint: ${JQ}
-	@@echo "Checking jQuery against JSLint..."
-	@@${RHINO} build/jslint-check.js
+lint: jquery
+	@@if test ! -z ${JS_ENGINE}; then \
+		echo "Checking jQuery against JSLint..."; \
+		${JS_ENGINE} build/jslint-check.js; \
+	else \
+		echo "You must have NodeJS installed in order to test jQuery against JSLint."; \
+	fi
 
 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
+${JQ_MIN}: jquery
+	@@if test ! -z ${JS_ENGINE}; then \
+		echo "Minifying jQuery" ${JQ_MIN}; \
+		${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \
+		sed '$ s#^\( \*/\)\(.\+\)#\1\n\2;#' ${JQ_MIN}.tmp > ${JQ_MIN}; \
+		rm -rf ${JQ_MIN}.tmp; \
+	else \
+		echo "You must have NodeJS installed in order to minify jQuery."; \
+	fi
+	
 
 clean:
 	@@echo "Removing Distribution directory:" ${DIST_DIR}