X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=1854c866a0a5c38a3cfecc466e05f9f487e6e8f4;hb=31f1e99500af6e57cfdd571272be193b4646fc09;hp=439f42d349be53309edb6f45886d6ed36b59f671;hpb=cd05cac37f8e63608496788fc7afa5400c18752e;p=jquery.git

diff --git a/Makefile b/Makefile
index 439f42d..1854c86 100644
--- a/Makefile
+++ b/Makefile
@@ -2,22 +2,20 @@ 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}/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
 
@@ -26,86 +24,58 @@ 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`
 VER = sed s/@VERSION/${JQ_VER}/
 
-MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.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 speed
+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/.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}
 	@@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}
 
 ${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
-
-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
+	@@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 Documentation directory:" ${DOCS_DIR}
-	@@rm -rf ${DOCS_DIR}
+	@@echo "Removing built copy of Sizzle"
+	@@rm src/selector.js
 
-	@@echo "Removing Speed Test Suite directory:" ${SPEED_DIR}
-	@@rm -rf ${SPEED_DIR}
+	@@echo "Removing cloned directories"
+	@@rm -rf test/qunit src/sizzle