X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=Makefile;h=e026d9e679fa33bbdf7ab0689fae254d56da303c;hp=972cb4db266f52cb318f33b94deac6cb688e84c7;hb=950b5d64a27994db1697eb4e605f5ea48ad8021b;hpb=8e53f7b5d6716e60d8c8ea7e167f2b187aae9d89 diff --git a/Makefile b/Makefile index 972cb4d..e026d9e 100644 --- a/Makefile +++ b/Makefile @@ -29,11 +29,12 @@ JQ_MIN = ${DIST_DIR}/jquery.min.js JQ_VER = `cat version.txt` VER = sed s/@VERSION/${JQ_VER}/ +RHINO = java -jar ${BUILD_DIR}/js.jar MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'` -all: jquery min +all: jquery lint min @@echo "jQuery build complete." ${DIST_DIR}: @@ -43,12 +44,13 @@ 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 + - @@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} +${JQ}: selector ${MODULES} @@echo "Building" ${JQ} @@mkdir -p ${DIST_DIR} @@ -57,10 +59,14 @@ ${JQ}: ${MODULES} sed 's/Date:./&'"${DATE}"'/' | \ ${VER} > ${JQ}; -selector: init +selector: ${DIST_DIR} init @@echo "Building selector code from Sizzle" @@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js +lint: ${JQ} + @@echo "Checking jQuery against JSLint..." + @@${RHINO} build/jslint-check.js + min: ${JQ_MIN} ${JQ_MIN}: ${JQ}