library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Introduce submodules, closes #8536

Browse Source 
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.
This commit is contained in:
Carl Fürstenberg 2011-03-15 20:16:09 +01:00
parent 714ae379db
commit 150d3decb5
5 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,7 +4,5 @@ dist
*~ *~
*.diff *.diff
*.patch *.patch
test/qunit
src/sizzle
/*.html /*.html
.DS_Store .DS_Store

6
.gitmodules vendored Normal file
View File

@ -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

34
Makefile
View File

@ -1,5 +1,3 @@
V ?= 0
SRC_DIR = src SRC_DIR = src
TEST_DIR = test TEST_DIR = test
BUILD_DIR = build BUILD_DIR = build
@ -38,7 +36,6 @@ JQ = ${DIST_DIR}/jquery.js
JQ_MIN = ${DIST_DIR}/jquery.min.js JQ_MIN = ${DIST_DIR}/jquery.min.js
SIZZLE_DIR = ${SRC_DIR}/sizzle SIZZLE_DIR = ${SRC_DIR}/sizzle
QUNIT_DIR = ${TEST_DIR}/qunit
JQ_VER = $(shell cat version.txt) JQ_VER = $(shell cat version.txt)
VER = sed "s/@VERSION/${JQ_VER}/" VER = sed "s/@VERSION/${JQ_VER}/"
@ -51,32 +48,8 @@ all: jquery min lint
${DIST_DIR}: ${DIST_DIR}:
@@mkdir -p ${DIST_DIR} @@mkdir -p ${DIST_DIR}
ifeq ($(strip $(V)),0) init:
verbose = --quiet @@if [ -d .git ]; then git submodule update --init --recursive; fi
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}
jquery: init ${JQ} jquery: init ${JQ}
jq: init ${JQ} jq: init ${JQ}
@ -122,7 +95,8 @@ clean:
@@echo "Removing built copy of Sizzle" @@echo "Removing built copy of Sizzle"
@@rm -f src/selector.js @@rm -f src/selector.js
@@echo "Removing cloned directories" distclean: clean
@@echo "Removing submodules"
@@rm -rf test/qunit src/sizzle @@rm -rf test/qunit src/sizzle
.PHONY: all jquery lint min init jq clean .PHONY: all jquery lint min init jq clean

1
src/sizzle Submodule

@ -0,0 +1 @@
Subproject commit ef19279f54ba49242c6461d47577c703f4f4e80e

1
test/qunit Submodule

@ -0,0 +1 @@
Subproject commit d404faf8f587fcbe6b8907943022e6318dd51e0c