diff options
| author | Carl Fürstenberg <carl@excito.com> | 2010-08-07 00:21:08 +0200 |
|---|---|---|
| committer | jeresig <jeresig@gmail.com> | 2010-09-22 11:21:59 -0400 |
| commit | 06883449d6ac16c2f9ed631da15d88929dd7f817 (patch) | |
| tree | 7ce395fc5e99f4664b96c4e1c5c545e6616c042f /Makefile | |
| parent | 8e1d3697109e70ccdcb29e269af251216de057a8 (diff) | |
| download | jquery-06883449d6ac16c2f9ed631da15d88929dd7f817.tar.gz jquery-06883449d6ac16c2f9ed631da15d88929dd7f817.zip | |
Makefile: cleanup
* updating init to either pull or clone, not do both
* make sure it building only when it needs to
* make some variables overridable
* use variables when they should be used instead of direct text
* add V verbosity variable
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 65 |
1 files changed, 45 insertions, 20 deletions
@@ -1,9 +1,18 @@ +V ?= 0 + SRC_DIR = src +TEST_DIR = test BUILD_DIR = build PREFIX = . DIST_DIR = ${PREFIX}/dist +RHINO ?= java -jar ${BUILD_DIR}/js.jar + +CLOSURE_COMPILER = ${BUILD_DIR}/google-compiler-20091218.jar + +MINJAR ?= java -jar ${CLOSURE_COMPILER} + BASE_FILES = ${SRC_DIR}/core.js\ ${SRC_DIR}/support.js\ ${SRC_DIR}/data.js\ @@ -26,44 +35,58 @@ MODULES = ${SRC_DIR}/intro.js\ JQ = ${DIST_DIR}/jquery.js JQ_MIN = ${DIST_DIR}/jquery.min.js -JQ_VER = `cat version.txt` -VER = sed s/@VERSION/${JQ_VER}/ +SIZZLE_DIR = ${SRC_DIR}/sizzle +QUNIT_DIR = ${TEST_DIR}/qunit -RHINO = java -jar ${BUILD_DIR}/js.jar -MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar +JQ_VER = $(shell cat version.txt) +VER = sed s/@VERSION/${JQ_VER}/ -DATE=`git log -1 --pretty=format:%ad` +DATE=$(shell git log -1 --pretty=format:%ad) -all: jquery lint min +all: init jquery min lint @@echo "jQuery build complete." ${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 + init: - @@echo "Grabbing external dependencies..." - @@if test ! -d test/qunit/.git; then git clone git://github.com/jquery/qunit.git test/qunit; fi - @@if test ! -d src/sizzle/.git; then git clone git://github.com/jeresig/sizzle.git src/sizzle; fi - - @@cd src/sizzle && git pull origin master > /dev/null 2>&1 - - @@cd test/qunit && git pull origin master > /dev/null 2>&1 + $(call clone_or_pull, ${QUNIT_DIR}, git://github.com/jquery/qunit.git) + $(call clone_or_pull, ${SIZZLE_DIR}, git://github.com/jeresig/sizzle.git) -jquery: ${DIST_DIR} selector ${JQ} -jq: ${DIST_DIR} ${JQ} +jquery: ${JQ} +jq: ${JQ} -${JQ}: selector ${MODULES} +${JQ}: ${MODULES} ${DIST_DIR} @@echo "Building" ${JQ} - @@mkdir -p ${DIST_DIR} - @@cat ${MODULES} | \ sed 's/.function..jQuery...{//' | \ sed 's/}...jQuery..;//' | \ sed 's/Date:./&'"${DATE}"'/' | \ ${VER} > ${JQ}; -selector: ${DIST_DIR} init +${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js @@echo "Building selector code from Sizzle" - @@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js | grep -v window.Sizzle > src/selector.js + @@sed '/EXPOSE/r src/sizzle-jquery.js' ${SIZZLE_DIR}/sizzle.js | grep -v window.Sizzle > ${SRC_DIR}/selector.js lint: ${JQ} @@echo "Checking jQuery against JSLint..." @@ -74,8 +97,8 @@ min: ${JQ_MIN} ${JQ_MIN}: ${JQ} @@echo "Building" ${JQ_MIN} - @@head -15 ${JQ} > ${JQ_MIN} - @@${MINJAR} --js ${JQ} --warning_level QUIET >> ${JQ_MIN} + @@head -$(shell grep -m 1 -n '*/' ${JQ} | cut -f1 -d:) ${JQ} > ${JQ_MIN} + @@${MINJAR} --js ${JQ} --warning_level QUIET --js_output_file ${JQ_MIN} clean: @@echo "Removing Distribution directory:" ${DIST_DIR} @@ -86,3 +109,5 @@ clean: @@echo "Removing cloned directories" @@rm -rf test/qunit src/sizzle + +.PHONY: all jquery lint min init jq clean |