Tagging the 1.5rc1 release.

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index 1854c86..c708db5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,15 @@
+V ?= 0
+
 SRC_DIR = src
+TEST_DIR = test
 BUILD_DIR = build
 
 PREFIX = .
 DIST_DIR = ${PREFIX}/dist
 
+JS_ENGINE ?= `which node nodejs`
+COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
+
 BASE_FILES = ${SRC_DIR}/core.js\
        ${SRC_DIR}/support.js\
        ${SRC_DIR}/data.js\
@@ -15,6 +21,9 @@ BASE_FILES = ${SRC_DIR}/core.js\
        ${SRC_DIR}/manipulation.js\
        ${SRC_DIR}/css.js\
        ${SRC_DIR}/ajax.js\
+       ${SRC_DIR}/ajax/jsonp.js\
+       ${SRC_DIR}/ajax/script.js\
+       ${SRC_DIR}/ajax/xhr.js\
        ${SRC_DIR}/effects.js\
        ${SRC_DIR}/offset.js\
        ${SRC_DIR}/dimensions.js
@@ -26,56 +35,80 @@ 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
 
-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 | grep Date: | sed 's/[^:]*: *//'`
+DATE=$(shell git log -1 --pretty=format:%ad)
 
-all: jquery 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}: ${MODULES}
+${JQ}: ${MODULES} | ${DIST_DIR}
        @@echo "Building" ${JQ}
 
-       @@mkdir -p ${DIST_DIR}
-
        @@cat ${MODULES} | \
-               sed 's/Date:./&'"${DATE}"'/' | \
+               sed 's/.function..jQuery...{//' | \
+               sed 's/}...jQuery..;//' | \
+               sed 's/@DATE/'"${DATE}"'/' | \
                ${VER} > ${JQ};
 
-selector: 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 > 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..."
+       @@${JS_ENGINE} build/jslint-check.js
 
 min: ${JQ_MIN}
 
 ${JQ_MIN}: ${JQ}
        @@echo "Building" ${JQ_MIN}
-
-       @@head -15 ${JQ} > ${JQ_MIN}
-       @@${MINJAR} --js ${JQ} --warning_level QUIET >> ${JQ_MIN}
+       @@${COMPILER} ${JQ} > ${JQ_MIN}.tmp
+       @@echo ";" >> ${JQ_MIN}.tmp
+       @@sed 's/\*\/(/*\/ʩ(/' ${JQ_MIN}.tmp | tr "ʩ" "\n" > ${JQ_MIN}
+       @@rm -rf ${JQ_MIN}.tmp
 
 clean:
        @@echo "Removing Distribution directory:" ${DIST_DIR}
        @@rm -rf ${DIST_DIR}
 
        @@echo "Removing built copy of Sizzle"
-       @@rm src/selector.js
+       @@rm -f src/selector.js
 
        @@echo "Removing cloned directories"
        @@rm -rf test/qunit src/sizzle
+
+.PHONY: all jquery lint min init jq clean