Tagging the 1.5rc1 release.

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index ed30269..c708db5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,105 +1,114 @@
+V ?= 0
+
 SRC_DIR = src
+TEST_DIR = test
 BUILD_DIR = build
 
 PREFIX = .
-DOCS_DIR = ${PREFIX}/docs
-TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
 
-MODULES = ${SRC_DIR}/jquery/*\
-       ${SRC_DIR}/event/*\
-       ${SRC_DIR}/fx/*\
-       ${SRC_DIR}/ajax/*
+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\
+       ${SRC_DIR}/queue.js\
+       ${SRC_DIR}/attributes.js\
+       ${SRC_DIR}/event.js\
+       ${SRC_DIR}/selector.js\
+       ${SRC_DIR}/traversing.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
+
+MODULES = ${SRC_DIR}/intro.js\
+       ${BASE_FILES}\
+       ${SRC_DIR}/outro.js
 
 JQ = ${DIST_DIR}/jquery.js
-JQ_LITE = ${DIST_DIR}/jquery.lite.js
-JQ_PACK = ${DIST_DIR}/jquery.pack.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}/"
 
-JAR = java -jar ${BUILD_DIR}/js.jar
+DATE=$(shell git log -1 --pretty=format:%ad)
 
-all: jquery lite pack docs test
+all: init jquery min lint
        @@echo "jQuery build complete."
 
 ${DIST_DIR}:
        @@mkdir -p ${DIST_DIR}
 
-jquery: ${DIST_DIR} ${JQ}
-
-${JQ}: ${MODULES}
+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:
+       $(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: ${JQ}
+jq: ${JQ}
+
+${JQ}: ${MODULES} | ${DIST_DIR}
        @@echo "Building" ${JQ}
 
-       @@mkdir -p ${DIST_DIR}
-       @@cat ${MODULES} > ${JQ};
-
-       @@echo ${JQ} "Built"
-       @@echo
-
-lite: ${JQ_LITE}
-
-${JQ_LITE}: ${JQ}
-       @@echo "Building" ${JQ_LITE}
-
-       @@echo " - Removing ScriptDoc from" ${JQ}
-       @@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
-
-       @@echo ${JQ_LITE} "Built"
-       @@echo
-
-pack: ${JQ_PACK}
-
-${JQ_PACK}: ${JQ}
-       @@echo "Building" ${JQ_PACK}
+       @@cat ${MODULES} | \
+               sed 's/.function..jQuery...{//' | \
+               sed 's/}...jQuery..;//' | \
+               sed 's/@DATE/'"${DATE}"'/' | \
+               ${VER} > ${JQ};
 
-       @@echo " - Compressing using Packer"
-       @@${JAR} ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
+${SRC_DIR}/selector.js: ${SIZZLE_DIR}/sizzle.js
+       @@echo "Building selector code from Sizzle"
+       @@sed '/EXPOSE/r src/sizzle-jquery.js' ${SIZZLE_DIR}/sizzle.js | grep -v window.Sizzle > ${SRC_DIR}/selector.js
 
-       @@echo ${JQ_PACK} "Built"
-       @@echo
+lint: ${JQ}
+       @@echo "Checking jQuery against JSLint..."
+       @@${JS_ENGINE} build/jslint-check.js
 
-test: ${JQ}
-       @@echo "Building Test Suite"
+min: ${JQ_MIN}
 
-       @@echo " - Making Test Suite Directory:" ${TEST_DIR}
-       @@mkdir -p ${TEST_DIR}
-       @@mkdir -p ${TEST_DIR}/tests/
-
-       @@echo " - Removing any old tests"
-       @@rm -f ${TEST_DIR}/tests/*
-
-       @@echo " - Copying over script files."
-       @@cp -nR ${BUILD_DIR}/test/js ${TEST_DIR}/js
-
-       @@echo " - Compiling Test Cases"
-       @@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
-
-       @@echo "Test Suite Built"
-       @@echo
-
-docs: ${JQ}
-       @@echo "Building Documentation"
-
-       @@echo " - Making Documentation Directory:" ${DOCS_DIR}
-       @@mkdir -p ${DOCS_DIR}
-       @@mkdir -p ${DOCS_DIR}/data
-
-       @@echo " - Copying over script files."
-       @@cp -nR ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
-
-       @@echo " - Copying over style files."
-       @@cp -nR ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
-
-       @@echo " - Extracting ScriptDoc from" ${JQ}
-       @@${JAR} ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
-
-       @@echo "Documentation Built"
-       @@echo
+${JQ_MIN}: ${JQ}
+       @@echo "Building" ${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 Test Suite directory:" ${TEST_DIR}
-       @@rm -rf ${TEST_DIR}
+       @@echo "Removing built copy of Sizzle"
+       @@rm -f src/selector.js
+
+       @@echo "Removing cloned directories"
+       @@rm -rf test/qunit src/sizzle
 
-       @@echo "Removing Documentation directory:" ${DOCS_DIR}
-       @@rm -rf ${DOCS_DIR}
+.PHONY: all jquery lint min init jq clean