X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=2ab385bee127362c5b95d80d521e1d88581193e8;hb=a8b089a02089d3d7b7e0744e59618ff9800e760a;hp=de1821961a685eda7fb91cdd03e8b67a7416d4f9;hpb=f01c002f2620473aa32a5d07a51b5ffb43d573f7;p=jquery.git

diff --git a/Makefile b/Makefile
index de18219..2ab385b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,83 @@
 SRC_DIR = src
 BUILD_DIR = build
-DOCS_DIR = docs
 
-MODULES = jquery event fx ajax
-JQ = jquery-svn.js
-JQ_PACK = jquery-svn.pack.js
+PREFIX = .
+DIST_DIR = ${PREFIX}/dist
 
-all: ${JQ} ${JQ_PACK} docs
+BASE_FILES = ${SRC_DIR}/core.js\
+	${SRC_DIR}/data.js\
+	${SRC_DIR}/event.js\
+	${SRC_DIR}/support.js\
+	${SRC_DIR}/selector.js\
+	${SRC_DIR}/traversing.js\
+	${SRC_DIR}/attributes.js\
+	${SRC_DIR}/manipulation.js\
+	${SRC_DIR}/css.js\
+	${SRC_DIR}/ajax.js\
+	${SRC_DIR}/fx.js\
+	${SRC_DIR}/offset.js\
+	${SRC_DIR}/dimensions.js
 
-${JQ}: 
-	@@echo "Building jquery-svn.js";
+MODULES = ${SRC_DIR}/intro.js\
+	${BASE_FILES}\
+	${SRC_DIR}/outro.js
 
-	@@for f in ${MODULES}; do \
-		echo "Adding module:" $$f;\
-		cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
-	done
+JQ = ${DIST_DIR}/jquery.js
+JQ_MIN = ${DIST_DIR}/jquery.min.js
 
-	@@echo "jquery-svn.js built.";
+JQ_VER = `cat version.txt`
+VER = sed s/@VERSION/${JQ_VER}/
 
-${JQ_PACK}: ${JQ}
-	@@echo "Building jquery-svn.pack.js";
+MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
 
-	cd ${BUILD_DIR} && java -jar js.jar build.js ../${JQ} ../${JQ_PACK}
+DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'`
 
-	@@echo "jquery-svn.pack.js built.";
+all: jquery min
+	@@echo "jQuery build complete."
 
-test:
+${DIST_DIR}:
+	@@mkdir -p ${DIST_DIR}
 
-docs: ${JQ}
-	@@echo "Building Documentation";
-	cd ${BUILD_DIR} && java -jar js.jar docs.js ../${JQ} ../${DOCS_DIR}
-	@@echo "Documentation built.";
+init:
+	@@echo "Grabbing external dependencies..."
+	@@git submodule init
+	@@git submodule update
+	@@cd src/sizzle && git pull
+	@@cd test/qunit && git pull
+	@@git submodule update
+
+jquery: ${DIST_DIR} selector ${JQ}
+
+${JQ}: ${MODULES}
+	@@echo "Building" ${JQ}
+
+	@@mkdir -p ${DIST_DIR}
+
+	@@cat ${MODULES} | \
+		sed 's/Date:./&'"${DATE}"'/' | \
+		${VER} > ${JQ};
+
+	@@echo ${JQ} "Built"
+	@@echo
+
+selector: init
+	@@echo "Building selector code from Sizzle"
+	@@sed '/EXPOSE/r src/sizzle-jquery.js' src/sizzle/sizzle.js > src/selector.js
+
+min: ${JQ_MIN}
+
+${JQ_MIN}: ${JQ}
+	@@echo "Building" ${JQ_MIN}
+
+	@@echo " - Compressing using Minifier"
+	@@${MINJAR} ${JQ} > ${JQ_MIN}
+
+	@@echo ${JQ_MIN} "Built"
+	@@echo
 
 clean:
-	rm ${JQ}
+	@@echo "Removing Distribution directory:" ${DIST_DIR}
+	@@rm -rf ${DIST_DIR}
+
+	@@echo "Removing built copy of Sizzle"
+	@@rm src/selector.js