aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile5
-rw-r--r--build.xml21
-rw-r--r--build/google-compiler-20091218.jarbin0 -> 4237729 bytes
-rw-r--r--build/yuicompressor-2.4.2.jarbin851219 -> 0 bytes
-rw-r--r--src/intro.js7
5 files changed, 25 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 2bf19fe9c..a0dbd8b78 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 581d13034..8e8fcf9ad 100644
--- a/build.xml
+++ b/build.xml
@@ -71,13 +71,24 @@
<include name="jquery.js" />
</fileset>
<arg line="-jar" />
- <arg path="build/yuicompressor-2.4.2.jar" />
- <arg value="--charset" />
- <arg value="ANSI" />
- <arg value="-o" />
+ <arg path="build/google-compiler-20091218.jar" />
+ <arg value="--warning_level" />
+ <arg value="QUIET" />
+ <arg value="--js_output_file" />
<targetfile />
- <mapper type="glob" from="jquery.js" to="jquery.min.js" />
+ <arg value="--js" />
+ <mapper type="glob" from="jquery.js" to="tmpmin" />
</apply>
+ <concat destfile="${JQ_MIN}">
+ <filelist files="${JQ}, dist/tmpmin"/>
+ <filterchain>
+ <headfilter lines="15"/>
+ </filterchain>
+ </concat>
+ <concat destfile="${JQ_MIN}" append="yes">
+ <filelist files="dist/tmpmin"/>
+ </concat>
+ <delete file="dist/tmpmin"/>
<echo message="${JQ_MIN} built." />
</target>
diff --git a/build/google-compiler-20091218.jar b/build/google-compiler-20091218.jar
new file mode 100644
index 000000000..da053a7dd
--- /dev/null
+++ b/build/google-compiler-20091218.jar
Binary files differ
diff --git a/build/yuicompressor-2.4.2.jar b/build/yuicompressor-2.4.2.jar
deleted file mode 100644
index c29470bd0..000000000
--- a/build/yuicompressor-2.4.2.jar
+++ /dev/null
Binary files differ
diff --git a/src/intro.js b/src/intro.js
index d4ef8fdc6..adea1b575 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){