X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=Makefile;h=48a885da28e05dbab58f390c862f2c5544c375c1;hp=e9a977c19abbeab4b48fa8de7498dbd7a0c25794;hb=8d8db3f2b3f8c3d41854726c8a0227f6deecc602;hpb=b4e23b5af0820a66c2e275051f613f3df9a4444d

diff --git a/Makefile b/Makefile
index e9a977c..48a885d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,183 +1,126 @@
+V ?= 0
+
 SRC_DIR = src
+TEST_DIR = test
 BUILD_DIR = build
 
 PREFIX = .
-DOCS_DIR = ${PREFIX}/docs
-TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
-SPEED_DIR = ${PREFIX}/speed
-PLUG_DIR = ../plugins
+
+JS_ENGINE ?= `which node nodejs`
+COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
 
 BASE_FILES = ${SRC_DIR}/core.js\
-	${SRC_DIR}/selector.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}/fx.js
-
-PLUGINS = ${PLUG_DIR}/button/*\
-	${PLUG_DIR}/center/*\
-	${PLUG_DIR}/cookie/*\
-	${PLUG_DIR}/dimensions/*\
-	${PLUG_DIR}/metadata/*\
-	${PLUG_DIR}/form/*\
-	${PLUG_DIR}/greybox/greybox.js\
-	${PLUG_DIR}/interface/*\
-	${PLUG_DIR}/pager/*\
-	${PLUG_DIR}/tablesorter/*\
-	${PLUG_DIR}/tabs/*\
-	${PLUG_DIR}/tooltip/jquery.tooltip.js\
-	${PLUG_DIR}/accordion/jquery.accordion.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_WITH_PLUGINS = ${SRC_DIR}/intro.js\
-	${BASE_FILES}\
-	${PLUGINS}\
-	${SRC_DIR}/outro.js
-
 JQ = ${DIST_DIR}/jquery.js
-JQ_LITE = ${DIST_DIR}/jquery.lite.js
 JQ_MIN = ${DIST_DIR}/jquery.min.js
-JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
-JQ_VER = `cat version.txt`
-VER = sed s/@VERSION/${JQ_VER}/
+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 min pack speed
+all: jquery min lint
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
 	@@mkdir -p ${DIST_DIR}
 
-jquery: ${DIST_DIR} ${JQ}
+ifeq ($(strip $(V)),0)
+verbose = --quiet
+else ifeq ($(strip $(V)),1)
+verbose =
+else
+verbose = --verbose
+endif
 
-${JQ}: ${MODULES}
-	@@echo "Building" ${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
 
-	@@mkdir -p ${DIST_DIR}
-	@@cat ${MODULES} | ${VER} > ${JQ};
+endef
 
-	@@echo ${JQ} "Built"
-	@@echo
+${QUNIT_DIR}:
+	$(call clone_or_pull, ${QUNIT_DIR}, git://github.com/jquery/qunit.git)
 
-with_plugins: ${MODULES_WITH_PLUGINS}
-	@@echo "Building" ${JQ}
-
-	@@mkdir -p ${DIST_DIR}
-	@@cat ${MODULES_WITH_PLUGINS} | ${VER} > ${JQ};
-
-	@@echo ${JQ} "Built"
-	@@echo
-
-lite: ${JQ_LITE}
+${SIZZLE_DIR}:
+	$(call clone_or_pull, ${SIZZLE_DIR}, git://github.com/jeresig/sizzle.git)
 
-${JQ_LITE}: ${JQ}
-	@@echo "Building" ${JQ_LITE}
+init: ${QUNIT_DIR} ${SIZZLE_DIR}
 
-	@@echo " - Removing ScriptDoc from" ${JQ}
-	@@${JAR} ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
+jquery: init ${JQ}
+jq: init ${JQ}
 
-	@@echo ${JQ_LITE} "Built"
-	@@echo
-
-pack: ${JQ_PACK}
+${JQ}: ${MODULES} | ${DIST_DIR}
+	@@echo "Building" ${JQ}
 
-${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: jquery
+	@@if test ! -z ${JS_ENGINE}; then \
+		echo "Checking jQuery against JSLint..."; \
+		${JS_ENGINE} build/jslint-check.js; \
+	else \
+		echo "You must have NodeJS installed in order to test jQuery against JSLint."; \
+	fi
 
 min: ${JQ_MIN}
 
-${JQ_MIN}: ${JQ}
-	@@echo "Building" ${JQ_MIN}
-
-	@@echo " - Compressing using Minifier"
-	@@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN}
-
-	@@echo ${JQ_MIN} "Built"
-	@@echo
-
-test: ${JQ}
-	@@echo "Building Test Suite"
-
-	@@echo " - Making Test Suite Directory:" ${TEST_DIR}
-	#@@mkdir -p ${TEST_DIR}
-
-	@@echo " - Removing any old tests"
-	#@@rm -f ${TEST_DIR}/tests/*
-
-	@@echo " - Copying over script files."
-	#@@cp -fR ${BUILD_DIR}/test/data ${TEST_DIR}/data
-	#@@cp -f ${BUILD_DIR}/test/index.html ${TEST_DIR}
-
-	@@echo " - Compiling Test Cases"
-	#@@${JAR} ${BUILD_DIR}/test/test.js ${JQ} ${TEST_DIR}
-
-	@@echo "Test Suite Built"
-	@@echo
-
-runtest: ${JQ} test
-	@@echo "Running Automated Test Suite"
-	@@${JAR} ${BUILD_DIR}/runtest/test.js
-
-	@@echo "Test Suite Finished"
-	@@echo
-
-docs: ${JQ}
-	@@echo "Building Documentation"
-
-	@@echo " - Making Documentation Directory:" ${DOCS_DIR}
-	@@mkdir -p ${DOCS_DIR}
-	@@mkdir -p ${DOCS_DIR}/data
-
-	@@echo " - Copying over htaccess file."
-	@@cp -fR ${BUILD_DIR}/docs/.htaccess ${DOCS_DIR}
-
-	@@echo " - Copying over script files."
-	@@cp -fR ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
-
-	@@echo " - Copying over style files."
-	@@cp -fR ${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
-
-speed: ${JQ}
-	@@echo "Building Speed Test Suite"
-
-	@@echo " - Making Speed Test Suite Directory:" ${SPEED_DIR}
-	@@mkdir -p ${SPEED_DIR}
-
-	@@echo " - Copying over script files."
-	@@cp -f ${BUILD_DIR}/speed/index.html ${SPEED_DIR}
-	@@cp -f ${BUILD_DIR}/speed/benchmarker.css ${SPEED_DIR}
-	@@cp -f ${BUILD_DIR}/speed/benchmarker.js ${SPEED_DIR}
-	@@cp -f ${BUILD_DIR}/speed/jquery-1.1.2.js ${SPEED_DIR}
-
-	@@echo "Speed Test Suite Built"
-	@@echo
+${JQ_MIN}: jquery
+	@@if test ! -z ${JS_ENGINE}; then \
+		echo "Minifying jQuery" ${JQ_MIN}; \
+		${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \
+		sed '$ s#^\( \*/\)\(.\+\)#\1\n\2;#' ${JQ_MIN}.tmp > ${JQ_MIN}; \
+		rm -rf ${JQ_MIN}.tmp; \
+	else \
+		echo "You must have NodeJS installed in order to minify jQuery."; \
+	fi
+	
 
 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 Documentation directory:" ${DOCS_DIR}
-	@@rm -rf ${DOCS_DIR}
+	@@echo "Removing cloned directories"
+	@@rm -rf test/qunit src/sizzle
 
-	@@echo "Removing Speed Test Suite directory:" ${SPEED_DIR}
-	@@rm -rf ${SPEED_DIR}
+.PHONY: all jquery lint min init jq clean