X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=2ab385bee127362c5b95d80d521e1d88581193e8;hb=a8b089a02089d3d7b7e0744e59618ff9800e760a;hp=41bb827e73463f555d97831a66d6824d6bb7003c;hpb=c7006d2fa54ee66cc0fa413aabe157a0248673e0;p=jquery.git diff --git a/Makefile b/Makefile index 41bb827..2ab385b 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\ @@ -31,29 +30,40 @@ 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 +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 +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} @@ -65,13 +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 - clean: @@echo "Removing Distribution directory:" ${DIST_DIR} @@rm -rf ${DIST_DIR} + + @@echo "Removing built copy of Sizzle" + @@rm src/selector.js