deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Change makefile order to only update submodules on 'all' target

Browse source 
insterad of always update the submodules, now only "make all" will run
that, thus an "make jquery" will not update them
This commit is contained in:
Carl Fürstenberg 2011-03-17 20:14:15 +01:00
parent 22738e0e4b
commit 4f9e78616e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -42,16 +42,13 @@ VER = sed "s/@VERSION/${JQ_VER}/"
DATE=$(shell git log -1 --pretty=format:%ad) DATE=$(shell git log -1 --pretty=format:%ad)
all: jquery min lint all: update_submodules jquery min lint
@@echo "jQuery build complete." @@echo "jQuery build complete."
${DIST_DIR}: ${DIST_DIR}:
@@mkdir -p ${DIST_DIR} @@mkdir -p ${DIST_DIR}
init: jquery: ${JQ}
@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
jquery: init ${JQ}
${JQ}: ${MODULES} | ${DIST_DIR} ${JQ}: ${MODULES} | ${DIST_DIR}
@@echo "Building" ${JQ} @@echo "Building" ${JQ}
@ -98,6 +95,10 @@ distclean: clean
@@echo "Removing submodules" @@echo "Removing submodules"
@@rm -rf test/qunit src/sizzle @@rm -rf test/qunit src/sizzle
# change pointers for submodules and update them to what is specified in jQuery
update_submodules:
@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
# update the submodules to the latest at the most logical branch # update the submodules to the latest at the most logical branch
pull_submodules: pull_submodules:
@@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)" @@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)"