X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=6927dbfd6ba73b8bdc996486f83191ddaef3e04b;hb=refs%2Fheads%2Ffixedbuild;hp=e0d1da716faeec80d347a9b76d5e0c46fd60dd4a;hpb=150d3decb54971a7378fb48d0b6970d3fb50ff95;p=jquery.git

diff --git a/Makefile b/Makefile
index e0d1da7..6927dbf 100644
--- a/Makefile
+++ b/Makefile
@@ -37,22 +37,20 @@ JQ_MIN = ${DIST_DIR}/jquery.min.js
 
 SIZZLE_DIR = ${SRC_DIR}/sizzle
 
-JQ_VER = $(shell cat version.txt)
-VER = sed "s/@VERSION/${JQ_VER}/"
+GIT_VER = $(shell git describe --tags --always --dirty)
+VER = sed "s/@VERSION/${GIT_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}
@@ -70,7 +68,7 @@ ${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
 lint: jquery
 	@@if test ! -z ${JS_ENGINE}; then \
 		echo "Checking jQuery against JSLint..."; \
-		${JS_ENGINE} build/jslint-check.js; \
+		${JS_ENGINE} build/jslint-check.js ${JQ}; \
 	else \
 		echo "You must have NodeJS installed in order to test jQuery against JSLint."; \
 	fi
@@ -99,4 +97,24 @@ distclean: clean
 	@@echo "Removing submodules"
 	@@rm -rf test/qunit src/sizzle
 
-.PHONY: all jquery lint min init jq clean
+# 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