diff options
| author | timmywil <tim.willison@thisismedium.com> | 2011-03-30 21:52:09 -0400 |
|---|---|---|
| committer | timmywil <tim.willison@thisismedium.com> | 2011-03-30 21:52:09 -0400 |
| commit | 6da3885cc38043fd8d384d1184468b0a2fba9fd9 (patch) | |
| tree | 5a04b2c47f119ff700c134a4e53ccb172a81e76b /Makefile | |
| parent | e93ca40aa7ec4337a57fcdbc699d900e01b4c67e (diff) | |
| parent | ad4152709cd7c7b7fdafd2dc0b266fd273aff5d5 (diff) | |
| download | jquery-6da3885cc38043fd8d384d1184468b0a2fba9fd9.tar.gz jquery-6da3885cc38043fd8d384d1184468b0a2fba9fd9.zip | |
Merge branch 'master' of git://github.com/jquery/jquery into 2773_find_closest
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 19 insertions, 9 deletions
@@ -42,17 +42,15 @@ VER = sed "s/@VERSION/${JQ_VER}/" DATE=$(shell git log -1 --pretty=format:%ad) -all: jquery min lint +all: update_submodules core + +core: jquery min lint @@echo "jQuery build complete." ${DIST_DIR}: @@mkdir -p ${DIST_DIR} -init: - @@if [ -d .git ]; then git submodule update --init --recursive; fi - -jquery: init ${JQ} -jq: init ${JQ} +jquery: ${JQ} ${JQ}: ${MODULES} | ${DIST_DIR} @@echo "Building" ${JQ} @@ -75,9 +73,9 @@ lint: jquery echo "You must have NodeJS installed in order to test jQuery against JSLint."; \ fi -min: ${JQ_MIN} +min: jquery ${JQ_MIN} -${JQ_MIN}: jquery +${JQ_MIN}: ${JQ} @@if test ! -z ${JS_ENGINE}; then \ echo "Minifying jQuery" ${JQ_MIN}; \ ${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \ @@ -99,6 +97,18 @@ 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)" @@ -107,4 +117,4 @@ pull_submodules: pull: pull_submodules @@git pull ${REMOTE} ${BRANCH} -.PHONY: all jquery lint min init jq clean +.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull core |