diff options
| author | Carl Fürstenberg <azatoth@gmail.com> | 2011-03-22 21:55:49 +0100 |
|---|---|---|
| committer | Carl Fürstenberg <azatoth@gmail.com> | 2011-03-22 21:55:49 +0100 |
| commit | 07392bb090c1aa378a71ee6c3bb0f08c72fe86f6 (patch) | |
| tree | bfb4166d4ce019e3f867c0c78756c0ed210d5720 /Makefile | |
| parent | 51abb3dc071fd86afd346ec5c340734f5c61064f (diff) | |
| parent | 7705c35b140f378e407c196599cc738bc54c5cec (diff) | |
| download | jquery-07392bb090c1aa378a71ee6c3bb0f08c72fe86f6.tar.gz jquery-07392bb090c1aa378a71ee6c3bb0f08c72fe86f6.zip | |
Merge branch 'master' into makefile_fixes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 24 |
1 files changed, 17 insertions, 7 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} @@ -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 |