Skip to content
Permalink
Browse files

Introduce submodules, closes #8536

Instead of the manual clone of sizzle and qunit, use git submodules
instead. this will ensure that all future releases can be recreated by
checking out an tag.
  • Loading branch information
azatoth committed Mar 15, 2011
1 parent 714ae37 commit 150d3decb54971a7378fb48d0b6970d3fb50ff95
Showing with 12 additions and 32 deletions.
  1. +0 −2 .gitignore
  2. +6 −0 .gitmodules
  3. +4 −30 Makefile
  4. +1 −0 src/sizzle
  5. +1 −0 test/qunit
@@ -4,7 +4,5 @@ dist
*~
*.diff
*.patch
test/qunit
src/sizzle
/*.html
.DS_Store
@@ -0,0 +1,6 @@
[submodule "src/sizzle"]
path = src/sizzle
url = git://github.com/jeresig/sizzle.git
[submodule "test/qunit"]
path = test/qunit
url = git://github.com/jquery/qunit.git
@@ -1,5 +1,3 @@
V ?= 0

SRC_DIR = src
TEST_DIR = test
BUILD_DIR = build
@@ -38,7 +36,6 @@ JQ = ${DIST_DIR}/jquery.js
JQ_MIN = ${DIST_DIR}/jquery.min.js

SIZZLE_DIR = ${SRC_DIR}/sizzle
QUNIT_DIR = ${TEST_DIR}/qunit

JQ_VER = $(shell cat version.txt)
VER = sed "s/@VERSION/${JQ_VER}/"
@@ -51,32 +48,8 @@ all: jquery min lint
${DIST_DIR}:
@@mkdir -p ${DIST_DIR}

ifeq ($(strip $(V)),0)
verbose = --quiet
else ifeq ($(strip $(V)),1)
verbose =
else
verbose = --verbose
endif

define clone_or_pull
-@@if test ! -d $(strip ${1})/.git; then \
echo "Cloning $(strip ${1})..."; \
git clone $(strip ${verbose}) --depth=1 $(strip ${2}) $(strip ${1}); \
else \
echo "Pulling $(strip ${1})..."; \
git --git-dir=$(strip ${1})/.git pull $(strip ${verbose}) origin master; \
fi

endef

${QUNIT_DIR}:
$(call clone_or_pull, ${QUNIT_DIR}, git://github.com/jquery/qunit.git)

${SIZZLE_DIR}:
$(call clone_or_pull, ${SIZZLE_DIR}, git://github.com/jeresig/sizzle.git)

init: ${QUNIT_DIR} ${SIZZLE_DIR}
init:
@@if [ -d .git ]; then git submodule update --init --recursive; fi

jquery: init ${JQ}
jq: init ${JQ}
@@ -122,7 +95,8 @@ clean:
@@echo "Removing built copy of Sizzle"
@@rm -f src/selector.js

@@echo "Removing cloned directories"
distclean: clean
@@echo "Removing submodules"
@@rm -rf test/qunit src/sizzle

.PHONY: all jquery lint min init jq clean
Submodule sizzle added at ef1927
Submodule qunit added at d404fa

2 comments on commit 150d3de

@jzaefferer

This comment has been minimized.

Copy link
Member

jzaefferer replied Mar 15, 2011

That looks like QUnit has to be updated manually now?

@JakeWharton

This comment has been minimized.

Copy link

JakeWharton replied Mar 15, 2011

Change 'manually' to 'deliberately' and you loose the connotation of it being a disadvantage.

Please sign in to comment.
You can’t perform that action at this time.