git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://github.com/jquery/jquery into fixedbuild
[jquery.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
d377c4c
..
6927dbf
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-37,12
+37,14
@@
JQ_MIN = ${DIST_DIR}/jquery.min.js
SIZZLE_DIR = ${SRC_DIR}/sizzle
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)
DATE=$(shell git log -1 --pretty=format:%ad)
-all: update_submodules jquery min lint
+all: update_submodules core
+
+core: jquery min lint
@@echo "jQuery build complete."
${DIST_DIR}:
@@echo "jQuery build complete."
${DIST_DIR}:
@@
-66,7
+68,7
@@
${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
lint: jquery
@@if test ! -z ${JS_ENGINE}; then \
echo "Checking jQuery against JSLint..."; \
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
else \
echo "You must have NodeJS installed in order to test jQuery against JSLint."; \
fi
@@
-96,8
+98,16
@@
distclean: clean
@@rm -rf test/qunit src/sizzle
# change pointers for submodules and update them to what is specified in jQuery
@@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:
update_submodules:
- @@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
+ @@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:
# update the submodules to the latest at the most logical branch
pull_submodules:
@@
-107,4
+117,4
@@
pull_submodules:
pull: pull_submodules
@@git pull ${REMOTE} ${BRANCH}
pull: pull_submodules
@@git pull ${REMOTE} ${BRANCH}
-.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull
+.PHONY: all jquery lint min clean distclean update_submodules pull_submodules pull core