Force the submodules to keep up to date.

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index 439f42d..2ab385b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,7 @@ SRC_DIR = src
 BUILD_DIR = build
 
 PREFIX = .
-DOCS_DIR = ${PREFIX}/docs
-TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
-SPEED_DIR = ${PREFIX}/speed
 
 BASE_FILES = ${SRC_DIR}/core.js\
        ${SRC_DIR}/data.js\
@@ -26,7 +23,6 @@ MODULES = ${SRC_DIR}/intro.js\
        ${SRC_DIR}/outro.js
 
 JQ = ${DIST_DIR}/jquery.js
-JQ_LITE = ${DIST_DIR}/jquery.lite.js
 JQ_MIN = ${DIST_DIR}/jquery.min.js
 
 JQ_VER = `cat version.txt`
@@ -34,38 +30,39 @@ VER = sed s/@VERSION/${JQ_VER}/
 
 MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.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 speed
+all: jquery min
        @@echo "jQuery build complete."
 
 ${DIST_DIR}:
        @@mkdir -p ${DIST_DIR}
 
-jquery: ${DIST_DIR} ${JQ}
+init:
+       @@echo "Grabbing external dependencies..."
+       @@git submodule init
+       @@git submodule update
+       @@cd src/sizzle && git pull
+       @@cd test/qunit && git pull
+       @@git submodule update
+
+jquery: ${DIST_DIR} selector ${JQ}
 
 ${JQ}: ${MODULES}
        @@echo "Building" ${JQ}
 
        @@mkdir -p ${DIST_DIR}
+
        @@cat ${MODULES} | \
                sed 's/Date:./&'"${DATE}"'/' | \
-               sed 's/Revision:./&'"${REV}"'/' | \
                ${VER} > ${JQ};
 
        @@echo ${JQ} "Built"
        @@echo
 
-lite: ${JQ_LITE}
-
-${JQ_LITE}: ${JQ}
-       @@echo "Building" ${JQ_LITE}
-
-       @@cp ${JQ} ${JQ_LITE}
-
-       @@echo ${JQ_LITE} "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}
 
@@ -78,34 +75,9 @@ ${JQ_MIN}: ${JQ}
        @@echo ${JQ_MIN} "Built"
        @@echo
 
-test: ${JQ}
-       @@echo "Building Test Suite"
-       @@echo "Test Suite Built"
-       @@echo
-       git submodule init
-       git submodule update
-
-speed: ${JQ}
-       @@echo "Building Speed Test Suite"
-
-       @@echo " - Making Speed Test Suite Directory:" ${SPEED_DIR}
-       @@mkdir -p ${SPEED_DIR}
-
-       @@echo " - Copying over script files."
-       @@cp -f ${BUILD_DIR}/speed/index.html ${SPEED_DIR}
-       @@cp -f ${BUILD_DIR}/speed/benchmarker.css ${SPEED_DIR}
-       @@cp -f ${BUILD_DIR}/speed/benchmarker.js ${SPEED_DIR}
-       @@cp -f ${BUILD_DIR}/speed/jquery-basis.js ${SPEED_DIR}
-
-       @@echo "Speed Test Suite Built"
-       @@echo
-
 clean:
        @@echo "Removing Distribution directory:" ${DIST_DIR}
        @@rm -rf ${DIST_DIR}
 
-       @@echo "Removing Documentation directory:" ${DOCS_DIR}
-       @@rm -rf ${DOCS_DIR}
-
-       @@echo "Removing Speed Test Suite directory:" ${SPEED_DIR}
-       @@rm -rf ${SPEED_DIR}
+       @@echo "Removing built copy of Sizzle"
+       @@rm src/selector.js