X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=Makefile;h=c708db5a1455adfe4ee75dfc3bdba5bef1fbff41;hp=f949811aa898e333286180b4d147b15685994d1a;hb=9d306bd73bb47562cd52f0fc4cc158c534cfdfdf;hpb=51dd3736eb84b171b041f419f6fb8a7e8626b0f2

diff --git a/Makefile b/Makefile
index f949811..c708db5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,114 @@
+V ?= 0
+
 SRC_DIR = src
+TEST_DIR = test
 BUILD_DIR = build
 
-DOCS_DIR = docs
-DIST_DIR = dist
+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\
+	${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
 
-MODULES = jquery event fx ajax
 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}/"
 
-all: jquery lite pack docs
+DATE=$(shell git log -1 --pretty=format:%ad)
+
+all: init jquery min lint
+	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
-	mkdir -p ${DIST_DIR}
+	@@mkdir -p ${DIST_DIR}
+
+ifeq ($(strip $(V)),0)
+verbose = --quiet
+else ifeq ($(strip $(V)),1)
+verbose =
+else
+verbose = --verbose
+endif
 
-jquery: ${DIST_DIR} ${JQ}
+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
 
-${JQ}:
-	@@echo "Building" ${JQ};
+endef
 
-	@@for f in ${MODULES}; do \
-		echo "Adding module:" $$f;\
-		cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
-	done
+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)
 
-	@@echo ${JQ} "built.";
+jquery: ${JQ}
+jq: ${JQ}
 
-lite: ${JQ_LITE}
+${JQ}: ${MODULES} | ${DIST_DIR}
+	@@echo "Building" ${JQ}
 
-${JQ_LITE}: ${JQ}
-	@@echo "Building" ${JQ_LITE};
-	java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/lite.js ${JQ} ${JQ_LITE}
-	@@echo ${JQ_LITE} "built.";
+	@@cat ${MODULES} | \
+		sed 's/.function..jQuery...{//' | \
+		sed 's/}...jQuery..;//' | \
+		sed 's/@DATE/'"${DATE}"'/' | \
+		${VER} > ${JQ};
 
-pack: ${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
 
-${JQ_PACK}: ${JQ}
-	@@echo "Building" ${JQ_PACK};
-	java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build.js ${JQ} ${JQ_PACK}
-	@@echo ${JQ_PACK} "built.";
+lint: ${JQ}
+	@@echo "Checking jQuery against JSLint..."
+	@@${JS_ENGINE} build/jslint-check.js
 
-test:
+min: ${JQ_MIN}
 
-docs: ${JQ}
-	@@echo "Building Documentation";
-	java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs.js ${JQ} ${DOCS_DIR}
-	@@echo "Documentation built.";
+${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:
-	rm -rf ${DIST_DIR}
-	rm -f ${DOCS_DIR}/index.xml
-	rm -f ${DOCS_DIR}/data/*
+	@@echo "Removing Distribution directory:" ${DIST_DIR}
+	@@rm -rf ${DIST_DIR}
+
+	@@echo "Removing built copy of Sizzle"
+	@@rm -f src/selector.js
+
+	@@echo "Removing cloned directories"
+	@@rm -rf test/qunit src/sizzle
+
+.PHONY: all jquery lint min init jq clean