X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=ac14d7ac69474e2ed4d9d5733160269e9ef79a97;hb=5480cd3fa181a2e105bba3c641ef58723fbd3521;hp=0d54c96c0fce457b02c1d870654127e3e0fb035c;hpb=b7ccc58afec145120e8e675cf8fd30e9ea97f2a3;p=jquery.git

diff --git a/Makefile b/Makefile
index 0d54c96..ac14d7a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ SRC_DIR = src
 BUILD_DIR = build
 
 PREFIX = .
-TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
 
 BASE_FILES = ${SRC_DIR}/core.js\
@@ -33,43 +32,47 @@ MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
 
 DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
 
-all: jquery test min
+all: jquery 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; then git clone git://github.com/jquery/qunit.git test/qunit; fi
+	@@if test ! -d src/sizzle; then git clone git://github.com/jeresig/sizzle.git src/sizzle; fi
+	@@cd src/sizzle && git pull origin master &> /dev/null
+	@@cd test/qunit && git pull origin master &> /dev/null
+
+jquery: ${DIST_DIR} selector ${JQ}
 
 ${JQ}: ${MODULES}
 	@@echo "Building" ${JQ}
 
 	@@mkdir -p ${DIST_DIR}
+
 	@@cat ${MODULES} | \
 		sed 's/Date:./&'"${DATE}"'/' | \
 		${VER} > ${JQ};
 
-	@@echo ${JQ} "Built"
-	@@echo
+selector: init
+	@@echo "Building selector code from Sizzle"
+	@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.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
-
 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