]> source.dussan.org Git - jquery.git/commitdiff
Switched from using YUI Compressor to Google Compiler. Minified and Gzipped filesize...
authorjeresig <jeresig@gmail.com>
Sat, 19 Dec 2009 02:23:26 +0000 (21:23 -0500)
committerjeresig <jeresig@gmail.com>
Sat, 19 Dec 2009 02:23:26 +0000 (21:23 -0500)
Makefile
build.xml
build/google-compiler-20091218.jar [new file with mode: 0644]
build/yuicompressor-2.4.2.jar [deleted file]
src/intro.js

index 2bf19fe9cdbf67902ac0b043d5d1b9cc847034fb..a0dbd8b78bfe46a197de7a5a69df54e655edd056 100644 (file)
--- 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}
index 581d130344ca196507f03b1a011a2b2242c65da8..8e8fcf9ad8a901f5064eaf56eaa70e544a9e17a5 100644 (file)
--- a/build.xml
+++ b/build.xml
                                <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 (file)
index 0000000..da053a7
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 (file)
index c29470b..0000000
Binary files a/build/yuicompressor-2.4.2.jar and /dev/null differ
index d4ef8fdc62a6fee05bc764868974a744c61cedcb..adea1b575838a65e57a216ad4d362faa3c9eb5ad 100644 (file)
@@ -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){