X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=Makefile;h=0dae73230dd3d6ba57df1af23d83b465cea838ed;hb=c04500a8347f381b069c036d9ac24b591b3fc6b7;hp=ce92f4ffb5a1dbf2636bbbf2d4a6c69887048729;hpb=06883449d6ac16c2f9ed631da15d88929dd7f817;p=jquery.git diff --git a/Makefile b/Makefile index ce92f4f..0dae732 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ DIST_DIR = ${PREFIX}/dist RHINO ?= java -jar ${BUILD_DIR}/js.jar -CLOSURE_COMPILER = ${BUILD_DIR}/google-compiler-20091218.jar +CLOSURE_COMPILER = ${BUILD_DIR}/google-compiler-20100917.jar MINJAR ?= java -jar ${CLOSURE_COMPILER} @@ -39,7 +39,7 @@ SIZZLE_DIR = ${SRC_DIR}/sizzle QUNIT_DIR = ${TEST_DIR}/qunit JQ_VER = $(shell cat version.txt) -VER = sed s/@VERSION/${JQ_VER}/ +VER = sed "s/@VERSION/${JQ_VER}/" DATE=$(shell git log -1 --pretty=format:%ad) @@ -97,8 +97,10 @@ min: ${JQ_MIN} ${JQ_MIN}: ${JQ} @@echo "Building" ${JQ_MIN} - @@head -$(shell grep -m 1 -n '*/' ${JQ} | cut -f1 -d:) ${JQ} > ${JQ_MIN} - @@${MINJAR} --js ${JQ} --warning_level QUIET --js_output_file ${JQ_MIN} + @@head -15 ${JQ} > ${JQ_MIN} + @@${MINJAR} --js ${JQ} --warning_level QUIET --js_output_file ${JQ_MIN}.tmp + @@cat ${JQ_MIN}.tmp >> ${JQ_MIN} + @@rm -f ${JQ_MIN}.tmp clean: @@echo "Removing Distribution directory:" ${DIST_DIR}