Shortened the build messages in the Makefile and added test/qunit and src/sizzle...

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index bf0bfd0..ac14d7a 100644 (file)
--- 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\
@@ -31,45 +30,49 @@ VER = sed s/@VERSION/${JQ_VER}/
 
 MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
 
-DATE=`git log -1 | grep Date: | sed 's/.*: *//g'`
+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