File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -42,16 +42,13 @@ VER = sed "s/@VERSION/${JQ_VER}/"
42
42
43
43
DATE =$(shell git log -1 --pretty=format:% ad)
44
44
45
- all : jquery min lint
45
+ all : update_submodules jquery min lint
46
46
@@echo " jQuery build complete."
47
47
48
48
${DIST_DIR} :
49
49
@@mkdir -p ${DIST_DIR}
50
50
51
- init :
52
- @@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
53
-
54
- jquery : init ${JQ}
51
+ jquery : ${JQ}
55
52
56
53
${JQ} : ${MODULES} | ${DIST_DIR}
57
54
@@echo " Building" ${JQ}
@@ -98,6 +95,10 @@ distclean: clean
98
95
@@echo " Removing submodules"
99
96
@@rm -rf test/qunit src/sizzle
100
97
98
+ # change pointers for submodules and update them to what is specified in jQuery
99
+ update_submodules :
100
+ @@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
101
+
101
102
# update the submodules to the latest at the most logical branch
102
103
pull_submodules :
103
104
@@git submodule foreach " git pull origin \$ $( git branch --no-color --contains \$ $( git rev-parse HEAD) | grep -v \( | head -1) "
You can’t perform that action at this time.
0 commit comments