X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=0d54c96c0fce457b02c1d870654127e3e0fb035c;hb=b7ccc58afec145120e8e675cf8fd30e9ea97f2a3;hp=439f42d349be53309edb6f45886d6ed36b59f671;hpb=cd05cac37f8e63608496788fc7afa5400c18752e;p=jquery.git diff --git a/Makefile b/Makefile index 439f42d..0d54c96 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,8 @@ SRC_DIR = src BUILD_DIR = build PREFIX = . -DOCS_DIR = ${PREFIX}/docs TEST_DIR = ${PREFIX}/test DIST_DIR = ${PREFIX}/dist -SPEED_DIR = ${PREFIX}/speed BASE_FILES = ${SRC_DIR}/core.js\ ${SRC_DIR}/data.js\ @@ -26,7 +24,6 @@ MODULES = ${SRC_DIR}/intro.js\ ${SRC_DIR}/outro.js JQ = ${DIST_DIR}/jquery.js -JQ_LITE = ${DIST_DIR}/jquery.lite.js JQ_MIN = ${DIST_DIR}/jquery.min.js JQ_VER = `cat version.txt` @@ -34,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}: @@ -51,22 +47,11 @@ ${JQ}: ${MODULES} @@mkdir -p ${DIST_DIR} @@cat ${MODULES} | \ sed 's/Date:./&'"${DATE}"'/' | \ - sed 's/Revision:./&'"${REV}"'/' | \ ${VER} > ${JQ}; @@echo ${JQ} "Built" @@echo -lite: ${JQ_LITE} - -${JQ_LITE}: ${JQ} - @@echo "Building" ${JQ_LITE} - - @@cp ${JQ} ${JQ_LITE} - - @@echo ${JQ_LITE} "Built" - @@echo - min: ${JQ_MIN} ${JQ_MIN}: ${JQ} @@ -85,27 +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 Documentation directory:" ${DOCS_DIR} - @@rm -rf ${DOCS_DIR} - - @@echo "Removing Speed Test Suite directory:" ${SPEED_DIR} - @@rm -rf ${SPEED_DIR}