X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=8363be021383e3865eadfe03dec80cd66f8162d5;hb=9155d298ae8738ece29d4b2edfd32c578aebb27a;hp=36bd11cff5390dc8ce279e5ad22da663c70d28ec;hpb=4afa60835146e71c0e57b492a1cca278eaf1ef9c;p=jquery.git

diff --git a/Makefile b/Makefile
index 36bd11c..8363be0 100644
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,9 @@ PLUG_DIR = ../plugins
 
 BASE_FILES = ${SRC_DIR}/core.js\
 	${SRC_DIR}/data.js\
-	${SRC_DIR}/support.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\
@@ -50,6 +50,10 @@ 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
+
+DATE=`svn info . | grep Date: | sed 's/.*: //g'`
+REV=`svn info . | grep Rev: | sed 's/.*: //g'`
 
 all: jquery lite min pack speed
 	@@echo "jQuery build complete."
@@ -63,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
@@ -104,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
@@ -121,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"