X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=Makefile;h=e026d9e679fa33bbdf7ab0689fae254d56da303c;hp=41bb827e73463f555d97831a66d6824d6bb7003c;hb=950b5d64a27994db1697eb4e605f5ea48ad8021b;hpb=c7006d2fa54ee66cc0fa413aabe157a0248673e0

diff --git a/Makefile b/Makefile
index 41bb827..e026d9e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,20 @@ SRC_DIR = src
 BUILD_DIR = build
 
 PREFIX = .
-TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
 
 BASE_FILES = ${SRC_DIR}/core.js\
+	${SRC_DIR}/support.js\
 	${SRC_DIR}/data.js\
+	${SRC_DIR}/queue.js\
+	${SRC_DIR}/attributes.js\
 	${SRC_DIR}/event.js\
-	${SRC_DIR}/support.js\
 	${SRC_DIR}/selector.js\
 	${SRC_DIR}/traversing.js\
-	${SRC_DIR}/attributes.js\
 	${SRC_DIR}/manipulation.js\
 	${SRC_DIR}/css.js\
 	${SRC_DIR}/ajax.js\
-	${SRC_DIR}/fx.js\
+	${SRC_DIR}/effects.js\
 	${SRC_DIR}/offset.js\
 	${SRC_DIR}/dimensions.js
 
@@ -29,49 +29,58 @@ JQ_MIN = ${DIST_DIR}/jquery.min.js
 JQ_VER = `cat version.txt`
 VER = sed s/@VERSION/${JQ_VER}/
 
-MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
+RHINO = java -jar ${BUILD_DIR}/js.jar
+MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar
 
-DATE=`svn info . | grep Date: | sed 's/.*: //g'`
-REV=`svn info . | grep Rev: | sed 's/.*: //g'`
+DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
 
-all: jquery test min
+all: jquery lint min
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
-jquery: ${DIST_DIR} ${JQ}
+init:
+	@@echo "Grabbing external dependencies..."
+	@@if test ! -d test/qunit/.git; then git clone git://github.com/jquery/qunit.git test/qunit; fi
+	@@if test ! -d src/sizzle/.git; then git clone git://github.com/jeresig/sizzle.git src/sizzle; fi
+	- @@cd src/sizzle && git pull origin master > /dev/null 2>&1
+	- @@cd test/qunit && git pull origin master > /dev/null 2>&1
+
+jquery: ${DIST_DIR} selector ${JQ}
+jq: ${DIST_DIR} ${JQ}
 
-${JQ}: ${MODULES}
+${JQ}: selector ${MODULES}
 	@@echo "Building" ${JQ}
 
 	@@mkdir -p ${DIST_DIR}
+
 	@@cat ${MODULES} | \
 		sed 's/Date:./&'"${DATE}"'/' | \
-		sed 's/Revision:./&'"${REV}"'/' | \
 		${VER} > ${JQ};
 
-	@@echo ${JQ} "Built"
-	@@echo
+selector: ${DIST_DIR} init
+	@@echo "Building selector code from Sizzle"
+	@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js
+
+lint: ${JQ}
+	@@echo "Checking jQuery against JSLint..."
+	@@${RHINO} build/jslint-check.js
 
 min: ${JQ_MIN}
 
 ${JQ_MIN}: ${JQ}
 	@@echo "Building" ${JQ_MIN}
 
-	@@echo " - Compressing using Minifier"
-	@@${MINJAR} ${JQ} > ${JQ_MIN}
-
-	@@echo ${JQ_MIN} "Built"
-	@@echo
-
-test: ${JQ}
-	@@echo "Building Test Suite"
-	@@echo "Test Suite Built"
-	@@echo
-	git submodule init
-	git submodule update
+	@@head -15 ${JQ} > ${JQ_MIN}
+	@@${MINJAR} --js ${JQ} --warning_level QUIET >> ${JQ_MIN}
 
 clean:
 	@@echo "Removing Distribution directory:" ${DIST_DIR}
 	@@rm -rf ${DIST_DIR}
+
+	@@echo "Removing built copy of Sizzle"
+	@@rm src/selector.js
+
+	@@echo "Removing cloned directories"
+	@@rm -rf test/qunit src/sizzle