Fixed boxModel support - is now computed with feature detection, rather than sniffing.

[jquery.git] / Makefile

diff --git a/Makefile b/Makefile
index 36bd11c..33efcea 100644 (file)
--- 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