X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=build.xml;h=71439966882ad1e1dba370333c6290073eab4dcd;hb=82958c79ff7604b1854a58cf161e8d6691bed6ac;hp=ec081cea204b7888d5561dca5ca67e8077870b5f;hpb=b850ab2b8e65eadd25093c81bbc67a881daa0488;p=jquery.git

diff --git a/build.xml b/build.xml
index ec081ce..7143996 100644
--- a/build.xml
+++ b/build.xml
@@ -18,6 +18,7 @@
     <property description="Source Folder" name="SRC_DIR" value="src"  />
     <property description="Files for parsing etc." name="BUILD_DIR" value="build" />
     <property description="Rhino JS Engine" name="JAR" value="${BUILD_DIR}/js.jar" />
+    <property description="YUICompressor" name="YUICompressor" value="${BUILD_DIR}/yuicompressor-2.4.2.jar" />
 
     <property description="Folder for jquery, min, lite and packed target" name="DIST_DIR" value="./dist" />
 
@@ -35,9 +36,10 @@
         <concat destfile="${JQ}">
             <fileset dir="${SRC_DIR}" includes="intro.js" />
             <fileset dir="${SRC_DIR}" includes="core.js" />
-            <fileset dir="${SRC_DIR}" includes="support.js" />
+            <fileset dir="${SRC_DIR}" includes="data.js" />
             <fileset dir="${SRC_DIR}" includes="selector.js" />
             <fileset dir="${SRC_DIR}" includes="event.js" />
+            <fileset dir="${SRC_DIR}" includes="support.js" />
             <fileset dir="${SRC_DIR}" includes="ajax.js" />
             <fileset dir="${SRC_DIR}" includes="fx.js" />
             <fileset dir="${SRC_DIR}" includes="offset.js" />
@@ -53,11 +55,18 @@
 
     <target name="min" depends="jquery" description="Remove all comments and whitespace, no compression, great in combination with GZip">
         <echo message="Building ${JQ_MIN}" />
-        <java jar="${JAR}" fork="true">
-            <arg value="${BUILD_DIR}/build/min.js" />
-            <arg value="${JQ}" />
-            <arg value="${JQ_MIN}" />
-        </java>
+		<apply executable="java" parallel="false" verbose="true" dest="${DIST_DIR}">
+			<fileset dir="${DIST_DIR}">
+				<include name="jquery.js" />
+			</fileset>
+			<arg line="-jar" />
+			<arg path="${YUICompressor}" />
+			<arg value="--charset" />
+			<arg value="ANSI" />
+			<arg value="-o" />
+			<targetfile />
+			<mapper type="glob" from="jquery.js" to="jquery.min.js" />
+		</apply>
         <echo message="${JQ_MIN} built." />
     </target>