X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=0d54c96c0fce457b02c1d870654127e3e0fb035c;hb=b7ccc58afec145120e8e675cf8fd30e9ea97f2a3;hp=e1e69212f3a54106480da1bb96f6f1c59c75f027;hpb=b2e96801165e20822dd535525260f96d9199ac67;p=jquery.git diff --git a/Makefile b/Makefile index e1e6921..0d54c96 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ BUILD_DIR = build PREFIX = . TEST_DIR = ${PREFIX}/test DIST_DIR = ${PREFIX}/dist -SPEED_DIR = ${PREFIX}/speed BASE_FILES = ${SRC_DIR}/core.js\ ${SRC_DIR}/data.js\ @@ -32,10 +31,9 @@ VER = sed s/@VERSION/${JQ_VER}/ 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'` +DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'` -all: jquery test min speed +all: jquery test min @@echo "jQuery build complete." ${DIST_DIR}: @@ -49,7 +47,6 @@ ${JQ}: ${MODULES} @@mkdir -p ${DIST_DIR} @@cat ${MODULES} | \ sed 's/Date:./&'"${DATE}"'/' | \ - sed 's/Revision:./&'"${REV}"'/' | \ ${VER} > ${JQ}; @@echo ${JQ} "Built" @@ -73,24 +70,6 @@ test: ${JQ} git submodule init git submodule update -speed: ${JQ} - @@echo "Building Speed Test Suite" - - @@echo " - Making Speed Test Suite Directory:" ${SPEED_DIR} - @@mkdir -p ${SPEED_DIR} - - @@echo " - Copying over script files." - @@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-basis.js ${SPEED_DIR} - - @@echo "Speed Test Suite Built" - @@echo - clean: @@echo "Removing Distribution directory:" ${DIST_DIR} @@rm -rf ${DIST_DIR} - - @@echo "Removing Speed Test Suite directory:" ${SPEED_DIR} - @@rm -rf ${SPEED_DIR}