X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=beb4686869a32996c7e63bb0d18e5bf1209206ef;hb=192d6cd4a30bef497f72b1ca9b62fd8b90ade806;hp=05e8a4267c784944f61d17984926fb60e6962c8f;hpb=aea452f1624df811c8b0b2916bfb22213d153f9d;p=jquery.git diff --git a/Makefile b/Makefile index 05e8a42..beb4686 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,8 @@ SPEED_DIR = ${PREFIX}/speed 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}/ajax.js\ @@ -48,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." @@ -59,9 +65,13 @@ jquery: ${DIST_DIR} ${JQ} ${JQ}: ${MODULES} @@echo "Building" ${JQ} + echo "${DATE}" @@mkdir -p ${DIST_DIR} - @@cat ${MODULES} | ${VER} > ${JQ}; + @@cat ${MODULES} | \ + sed 's/Date:./&'"${DATE}"'/' | \ + sed 's/Revision:./&'"${REV}"'/' | \ + ${VER} > ${JQ}; @@echo ${JQ} "Built" @@echo @@ -102,7 +112,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