X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=Makefile;h=4d17f00caf20a45b5ef7f40654f87fe4e76190aa;hp=0f8187b3b4288679f623f97c0e3bc2ab0c348d3d;hb=b1a40c9bfdbbfce5416e4dfa52577379bdcc0a74;hpb=1fc7dcff11827a2abd3516c941b56d0b2b46f078

diff --git a/Makefile b/Makefile
index 0f8187b..4d17f00 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,14 @@ SPEED_DIR = ${PREFIX}/speed
 PLUG_DIR = ../plugins
 
 BASE_FILES = ${SRC_DIR}/core.js\
+	${SRC_DIR}/data.js\
 	${SRC_DIR}/selector.js\
 	${SRC_DIR}/event.js\
+	${SRC_DIR}/support.js\
 	${SRC_DIR}/ajax.js\
 	${SRC_DIR}/fx.js\
-	${SRC_DIR}/offset.js
+	${SRC_DIR}/offset.js\
+	${SRC_DIR}/dimensions.js
 
 PLUGINS = ${PLUG_DIR}/button/*\
 	${PLUG_DIR}/center/*\
@@ -47,8 +50,12 @@ JQ_VER = `cat version.txt`
 VER = sed s/@VERSION/${JQ_VER}/
 
 JAR = java -jar ${BUILD_DIR}/js.jar
+MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar
 
-all: jquery lite min pack speed
+DATE=`svn info . | grep Date: | sed 's/.*: //g'`
+REV=`svn info . | grep Rev: | sed 's/.*: //g'`
+
+all: jquery min speed
 	@@echo "jQuery build complete."
 
 ${DIST_DIR}:
@@ -60,7 +67,10 @@ ${JQ}: ${MODULES}
 	@@echo "Building" ${JQ}
 
 	@@mkdir -p ${DIST_DIR}
-	@@cat ${MODULES} | ${VER} > ${JQ};
+	@@cat ${MODULES} | \
+		sed 's/Date:./&'"${DATE}"'/' | \
+		sed 's/Revision:./&'"${REV}"'/' | \
+		${VER} > ${JQ};
 
 	@@echo ${JQ} "Built"
 	@@echo
@@ -101,7 +111,7 @@ ${JQ_MIN}: ${JQ}
 	@@echo "Building" ${JQ_MIN}
 
 	@@echo " - Compressing using Minifier"
-	@@${JAR} ${BUILD_DIR}/build/min.js ${JQ} ${JQ_MIN}
+	@@${MINJAR} ${JQ} > ${JQ_MIN}
 
 	@@echo ${JQ_MIN} "Built"
 	@@echo
@@ -118,28 +128,6 @@ runtest: ${JQ} test
 	@@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"
 
@@ -150,7 +138,7 @@ speed: ${JQ}
 	@@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}
+	@@cp -f ${BUILD_DIR}/speed/jquery-basis.js ${SPEED_DIR}
 
 	@@echo "Speed Test Suite Built"
 	@@echo