X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=6927dbfd6ba73b8bdc996486f83191ddaef3e04b;hb=refs%2Fheads%2Ffixedbuild;hp=8363be021383e3865eadfe03dec80cd66f8162d5;hpb=9155d298ae8738ece29d4b2edfd32c578aebb27a;p=jquery.git diff --git a/Makefile b/Makefile index 8363be0..6927dbf 100644 --- a/Makefile +++ b/Makefile @@ -1,154 +1,120 @@ SRC_DIR = src +TEST_DIR = test BUILD_DIR = build PREFIX = . -DOCS_DIR = ${PREFIX}/docs -TEST_DIR = ${PREFIX}/test DIST_DIR = ${PREFIX}/dist -SPEED_DIR = ${PREFIX}/speed -PLUG_DIR = ../plugins + +JS_ENGINE ?= `which node nodejs` +COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe +POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js BASE_FILES = ${SRC_DIR}/core.js\ + ${SRC_DIR}/deferred.js\ + ${SRC_DIR}/support.js\ ${SRC_DIR}/data.js\ - ${SRC_DIR}/selector.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}/manipulation.js\ + ${SRC_DIR}/css.js\ ${SRC_DIR}/ajax.js\ - ${SRC_DIR}/fx.js\ + ${SRC_DIR}/ajax/jsonp.js\ + ${SRC_DIR}/ajax/script.js\ + ${SRC_DIR}/ajax/xhr.js\ + ${SRC_DIR}/effects.js\ ${SRC_DIR}/offset.js\ ${SRC_DIR}/dimensions.js -PLUGINS = ${PLUG_DIR}/button/*\ - ${PLUG_DIR}/center/*\ - ${PLUG_DIR}/cookie/*\ - ${PLUG_DIR}/dimensions/*\ - ${PLUG_DIR}/metadata/*\ - ${PLUG_DIR}/form/*\ - ${PLUG_DIR}/greybox/greybox.js\ - ${PLUG_DIR}/interface/*\ - ${PLUG_DIR}/pager/*\ - ${PLUG_DIR}/tablesorter/*\ - ${PLUG_DIR}/tabs/*\ - ${PLUG_DIR}/tooltip/jquery.tooltip.js\ - ${PLUG_DIR}/accordion/jquery.accordion.js - MODULES = ${SRC_DIR}/intro.js\ ${BASE_FILES}\ ${SRC_DIR}/outro.js -MODULES_WITH_PLUGINS = ${SRC_DIR}/intro.js\ - ${BASE_FILES}\ - ${PLUGINS}\ - ${SRC_DIR}/outro.js - JQ = ${DIST_DIR}/jquery.js -JQ_LITE = ${DIST_DIR}/jquery.lite.js JQ_MIN = ${DIST_DIR}/jquery.min.js -JQ_PACK = ${DIST_DIR}/jquery.pack.js -JQ_VER = `cat version.txt` -VER = sed s/@VERSION/${JQ_VER}/ +SIZZLE_DIR = ${SRC_DIR}/sizzle -JAR = java -jar ${BUILD_DIR}/js.jar -MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar +GIT_VER = $(shell git describe --tags --always --dirty) +VER = sed "s/@VERSION/${GIT_VER}/" -DATE=`svn info . | grep Date: | sed 's/.*: //g'` -REV=`svn info . | grep Rev: | sed 's/.*: //g'` +DATE=$(shell git log -1 --pretty=format:%ad) -all: jquery lite min pack speed +all: update_submodules core + +core: jquery min lint @@echo "jQuery build complete." ${DIST_DIR}: @@mkdir -p ${DIST_DIR} -jquery: ${DIST_DIR} ${JQ} +jquery: ${JQ} -${JQ}: ${MODULES} +${JQ}: ${MODULES} | ${DIST_DIR} @@echo "Building" ${JQ} - @@mkdir -p ${DIST_DIR} @@cat ${MODULES} | \ - sed 's/Date:./&'"${DATE}"'/' | \ - sed 's/Revision:./&'"${REV}"'/' | \ + sed 's/.function..jQuery...{//' | \ + sed 's/}...jQuery..;//' | \ + sed 's/@DATE/'"${DATE}"'/' | \ ${VER} > ${JQ}; - @@echo ${JQ} "Built" - @@echo - -with_plugins: ${MODULES_WITH_PLUGINS} - @@echo "Building" ${JQ} - - @@mkdir -p ${DIST_DIR} - @@cat ${MODULES_WITH_PLUGINS} | ${VER} > ${JQ}; - - @@echo ${JQ} "Built" - @@echo - -lite: ${JQ_LITE} +${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js + @@echo "Building selector code from Sizzle" + @@sed '/EXPOSE/r src/sizzle-jquery.js' ${SIZZLE_DIR}/sizzle.js | grep -v window.Sizzle > ${SRC_DIR}/selector.js -${JQ_LITE}: ${JQ} - @@echo "Building" ${JQ_LITE} - - @@cp ${JQ} ${JQ_LITE} - - @@echo ${JQ_LITE} "Built" - @@echo - -pack: ${JQ_PACK} - -${JQ_PACK}: ${JQ} - @@echo "Building" ${JQ_PACK} - - @@echo " - Compressing using Packer" - @@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK} - - @@echo ${JQ_PACK} "Built" - @@echo +lint: jquery + @@if test ! -z ${JS_ENGINE}; then \ + echo "Checking jQuery against JSLint..."; \ + ${JS_ENGINE} build/jslint-check.js ${JQ}; \ + else \ + echo "You must have NodeJS installed in order to test jQuery against JSLint."; \ + fi 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 - -runtest: ${JQ} test - @@echo "Running Automated Test Suite" - @@${JAR} ${BUILD_DIR}/runtest/test.js - - @@echo "Test Suite Finished" - @@echo - -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 +${JQ_MIN}: jquery + @@if test ! -z ${JS_ENGINE}; then \ + echo "Minifying jQuery" ${JQ_MIN}; \ + ${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \ + ${POST_COMPILER} ${JQ_MIN}.tmp > ${JQ_MIN}; \ + rm -f ${JQ_MIN}.tmp; \ + else \ + echo "You must have NodeJS installed in order to minify jQuery."; \ + fi + 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 -f src/selector.js + +distclean: clean + @@echo "Removing submodules" + @@rm -rf test/qunit src/sizzle + +# change pointers for submodules and update them to what is specified in jQuery +# --merge doesn't work when doing an initial clone, thus test if we have non-existing +# submodules, then do an real update +update_submodules: + @@if [ -d .git ]; then \ + if git submodule status | grep -q -E '^-'; then \ + git submodule update --init --recursive; \ + else \ + git submodule update --init --recursive --merge; \ + fi; \ + fi; + +# update the submodules to the latest at the most logical branch +pull_submodules: + @@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)" + @@git submodule summary + +pull: pull_submodules + @@git pull ${REMOTE} ${BRANCH} + +.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull core