diff --git a/Makefile b/Makefile index 2bf19fe9cd..a0dbd8b78b 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ JQ_MIN = ${DIST_DIR}/jquery.min.js JQ_VER = `cat version.txt` VER = sed s/@VERSION/${JQ_VER}/ -MINJAR = java -jar ${BUILD_DIR}/yuicompressor-2.4.2.jar +MINJAR = java -jar ${BUILD_DIR}/google-compiler-20091218.jar DATE=`git log -1 | grep Date: | sed 's/[^:]*: *//'` @@ -66,7 +66,8 @@ min: ${JQ_MIN} ${JQ_MIN}: ${JQ} @@echo "Building" ${JQ_MIN} - @@${MINJAR} ${JQ} > ${JQ_MIN} + @@head -15 ${JQ} > ${JQ_MIN} + @@${MINJAR} --js ${JQ} --warning_level QUIET >> ${JQ_MIN} clean: @@echo "Removing Distribution directory:" ${DIST_DIR} diff --git a/build.xml b/build.xml index 581d130344..8e8fcf9ad8 100644 --- a/build.xml +++ b/build.xml @@ -71,13 +71,24 @@ - - - - + + + + - + + + + + + + + + + + + diff --git a/build/google-compiler-20091218.jar b/build/google-compiler-20091218.jar new file mode 100644 index 0000000000..da053a7ddd Binary files /dev/null and b/build/google-compiler-20091218.jar differ diff --git a/build/yuicompressor-2.4.2.jar b/build/yuicompressor-2.4.2.jar deleted file mode 100644 index c29470bd0d..0000000000 Binary files a/build/yuicompressor-2.4.2.jar and /dev/null differ diff --git a/src/intro.js b/src/intro.js index d4ef8fdc62..adea1b5758 100644 --- a/src/intro.js +++ b/src/intro.js @@ -2,10 +2,15 @@ * jQuery JavaScript Library v@VERSION * http://jquery.com/ * - * Copyright (c) 2009 John Resig + * Copyright 2009, John Resig * Dual licensed under the MIT or GPL Version 2 licenses. * http://docs.jquery.com/License * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * * Date: */ (function(window, undefined){