X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=Makefile;h=525d3a1974d7b38a2f295c0b7c968fee92abdc43;hb=a2faed347de389d6f667a4e98576398db88d1a14;hp=5b2cae8d9eebf13d9b92df0672c1fd7283f1eda4;hpb=fc5ab8d6557884d275ba91795d208df635b6bff5;p=jquery.git

diff --git a/Makefile b/Makefile
index 5b2cae8..525d3a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,74 +1,110 @@
 SRC_DIR = src
+TEST_DIR = test
 BUILD_DIR = build
 
 PREFIX = .
-DOCS_DIR = ${PREFIX}/docs
-TEST_DIR = ${PREFIX}/test
 DIST_DIR = ${PREFIX}/dist
 
-MODULES = jquery event fx ajax
-JQ = ${DIST_DIR}/jquery.js
-JQ_LITE = ${DIST_DIR}/jquery.lite.js
-JQ_PACK = ${DIST_DIR}/jquery.pack.js
-
-all: jquery lite pack docs
-	@@echo "jQuery build complete."
-
-${DIST_DIR}:
-	@@mkdir -p ${DIST_DIR}
+JS_ENGINE ?= `which node nodejs`
+COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
+POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js
+
+BASE_FILES = ${SRC_DIR}/core.js\
+	${SRC_DIR}/deferred.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
 
-jquery: ${DIST_DIR} ${JQ}
+JQ = ${DIST_DIR}/jquery.js
+JQ_MIN = ${DIST_DIR}/jquery.min.js
 
-${JQ}:
-	@@echo "Building" ${JQ}
+SIZZLE_DIR = ${SRC_DIR}/sizzle
 
-	@@for f in ${MODULES}; do \
-		echo " - Adding module:" $$f;\
-		cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
-	done
+JQ_VER = $(shell cat version.txt)
+VER = sed "s/@VERSION/${JQ_VER}/"
 
-	@@echo ${JQ} "built."
-	@@echo
+DATE=$(shell git log -1 --pretty=format:%ad)
 
-lite: ${JQ_LITE}
+all: jquery min lint
+	@@echo "jQuery build complete."
 
-${JQ_LITE}: jquery
-	@@echo "Building" ${JQ_LITE}
-	@@echo " - Removing ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/lite.js ${JQ} ${JQ_LITE}
-	@@echo ${JQ_LITE} "built."
-	@@echo
+${DIST_DIR}:
+	@@mkdir -p ${DIST_DIR}
 
-pack: ${JQ_PACK}
+init:
+	@@if [ -d .git ]; then git submodule update --init --recursive --merge; fi
 
-${JQ_PACK}: jquery
-	@@echo "Building" ${JQ_PACK}
-	@@echo " - Compressing using Packer"
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build.js ${JQ} ${JQ_PACK}
-	@@echo ${JQ_PACK} "built."
-	@@echo
+jquery: init ${JQ}
+jq: init ${JQ}
 
-test: ${JQ}
+${JQ}: ${MODULES} | ${DIST_DIR}
+	@@echo "Building" ${JQ}
 
-docs: ${JQ}
-	@@echo "Building Documentation"
+	@@cat ${MODULES} | \
+		sed 's/.function..jQuery...{//' | \
+		sed 's/}...jQuery..;//' | \
+		sed 's/@DATE/'"${DATE}"'/' | \
+		${VER} > ${JQ};
+
+${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
+
+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}: jquery
+	@@if test ! -z ${JS_ENGINE}; then \
+		echo "Minifying jQuery" ${JQ_MIN}; \
+		${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \
+		${POST_COMPILER} ${JQ_MIN}.tmp > ${JQ_MIN}; \
+		rm -f ${JQ_MIN}.tmp; \
+	else \
+		echo "You must have NodeJS installed in order to minify jQuery."; \
+	fi
+	
 
-	@@echo " - Making Documentation Directory:" ${DOCS_DIR}
-	@@mkdir -p ${DOCS_DIR}
-	@@mkdir -p ${DOCS_DIR}/data
+clean:
+	@@echo "Removing Distribution directory:" ${DIST_DIR}
+	@@rm -rf ${DIST_DIR}
 
-	@@echo " - Copying over script files."
-	@@cp -R ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
+	@@echo "Removing built copy of Sizzle"
+	@@rm -f src/selector.js
 
-	@@echo " - Copying over style files."
-	@@cp -R ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
+distclean: clean
+	@@echo "Removing submodules"
+	@@rm -rf test/qunit src/sizzle
 
-	@@echo " - Extracting ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs.js ${JQ} ${DOCS_DIR}
+# update the submodules to the latest at the most logical branch
+pull_submodules:
+	@@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)"
+	@@git submodule summary
 
-	@@echo "Documentation built."
-	@@echo
+pull: pull_submodules
+	@@git pull ${REMOTE} ${BRANCH}
 
-clean:
-	@@rm -rf ${DIST_DIR}
-	@@rm -rf ${DOCS_DIR}
+.PHONY: all jquery lint min init jq clean