X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=build.xml;h=d4cd39d0d66c0e64ff772bb12e68da34c1edb939;hb=981d1e08eb00f4b5c29ad1f3977a45e30c93ad70;hp=22d6a0cfd4affd8e58aa78554acf0a3c6166a1c5;hpb=5778a35abd65673e2eb7f5012868203622c5b105;p=jquery.git

diff --git a/build.xml b/build.xml
index 22d6a0c..d4cd39d 100644
--- a/build.xml
+++ b/build.xml
@@ -1,106 +1,129 @@
-<project name="jQuery" default="jquery" basedir=".">
+<project name="jQuery" default="all" basedir=".">
 
-    <property description="Source Folder" name="SRC_DIR" value="src"  />
-    <property description="Files for parsing etc." name="BUILD_DIR" value="build" />
-    <property description="YUICompressor" name="YUICompressor" value="${BUILD_DIR}/yuicompressor-2.4.2.jar" />
-	<loadfile description="Version to build" property="version" srcfile="version.txt" />
+	<loadfile property="version" srcfile="version.txt" />
+	<property name="PREFIX" value="." />
+	<property description="Folder for jquery and min target" name="dist" value="${PREFIX}/dist" />
 
-    <property description="Folder for jquery and min target" name="DIST_DIR" value="./dist" />
+	<property name="JQ" value="${dist}/jquery.js" />
+	<property name="JQ_MIN" value="${dist}/jquery.min.js" />
 
-    <property name="JQ" value="${DIST_DIR}/jquery.js" />
-    <property name="JQ_LITE" value="${DIST_DIR}/jquery.lite.js" />
-    <property name="JQ_MIN" value="${DIST_DIR}/jquery.min.js" />
-	<loadfile property="version" srcfile="version.txt" />
 	<loadfile property="sizzle-exports" srcfile="src/sizzle-jquery.js" />
-	
+
 	<available property="qunit" file="test/qunit" />
 	<available property="sizzle" file="src/sizzle" />
-	
+
+	<target name="all" depends="jquery,lint,min" />
+
 	<target name="qunit-clone" unless="qunit">
-		<exec executable="git" outputproperty="git-qunit" >  
-			<arg line="clone git://github.com/jquery/qunit.git test/qunit"/>  
+		<exec executable="git" outputproperty="git-qunit" >
+			<arg line="clone git://github.com/jquery/qunit.git test/qunit" />
 		</exec>
 		<echo message="git clone qunit: ${git-qunit}" />
 	</target>
 	<target name="qunit-pull" if="qunit">
-		<exec executable="git" outputproperty="git-qunit" dir="test/qunit" >  
-			<arg line="pull origin master"/>  
-		</exec> 
+		<exec executable="git" outputproperty="git-qunit" dir="test/qunit" >
+			<arg line="pull origin master" />
+		</exec>
 		<echo message="git pull sizzle: ${git-qunit}" />
 	</target>
 	<target name="sizzle-clone" unless="sizzle">
-		<exec executable="git" outputproperty="git-sizzle" >  
-			<arg line="clone git://github.com/jeresig/sizzle.git src/sizzle"/>  
-		</exec> 
+		<exec executable="git" outputproperty="git-sizzle" >
+			<arg line="clone git://github.com/jeresig/sizzle.git src/sizzle" />
+		</exec>
 		<echo message="git clone sizzle: ${git-sizzle}" />
 	</target>
 	<target name="sizzle-pull" if="sizzle">
-		<exec executable="git" outputproperty="git-sizzle" dir="src/sizzle" >  
-			<arg line="pull origin master"/>  
-		</exec> 
+		<exec executable="git" outputproperty="git-sizzle" dir="src/sizzle" >
+			<arg line="pull origin master" />
+		</exec>
 		<echo message="git pull sizzle: ${git-sizzle}" />
 	</target>
 
-    <target name="jquery" depends="qunit-clone,qunit-pull,sizzle-clone,sizzle-pull" description="Main jquery build, concatenates source files and replaces @VERSION">
-        <echo message="Building ${JQ}" />
-    	<copy file="src/sizzle/sizzle.js" tofile="src/selector.js" overwrite="true" />
-    	<replaceregexp match="// EXPOSE" replace="${sizzle-exports}" file="src/selector.js" />
-        <mkdir dir="${DIST_DIR}" />
-        <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="queue.js" />
-            <fileset dir="${SRC_DIR}" includes="event.js" />
-            <fileset dir="${SRC_DIR}" includes="selector.js" />
-            <fileset dir="${SRC_DIR}" includes="traversing.js" />
-            <fileset dir="${SRC_DIR}" includes="attributes.js" />
-            <fileset dir="${SRC_DIR}" includes="manipulation.js" />
-            <fileset dir="${SRC_DIR}" includes="css.js" />
-            <fileset dir="${SRC_DIR}" includes="ajax.js" />
-            <fileset dir="${SRC_DIR}" includes="fx.js" />
-            <fileset dir="${SRC_DIR}" includes="offset.js" />
-            <fileset dir="${SRC_DIR}" includes="dimensions.js" />
-            <fileset dir="${SRC_DIR}" includes="outro.js" />
-        </concat>
-    	<replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true" file="${JQ}" />
-		<replaceregexp match="Date: " replace="Date: ${date}" file="${JQ}" />
-        <echo message="${JQ} built." />
-    </target>
+	<target name="init" depends="qunit-clone,qunit-pull,sizzle-clone,sizzle-pull" />
+
+	<target name="selector" depends="init" description="Builds the selector library for jQuery from Sizzle.">
+		<copy file="src/sizzle/sizzle.js" tofile="src/selector.js" overwrite="true" />
+		<replaceregexp match="// EXPOSE(.*)&#10;" replace="// EXPOSE\1&#10;${sizzle-exports}" file="src/selector.js" />
+		<replaceregexp match="window.Sizzle(.*)&#10;" replace="" file="src/selector.js" />
+	</target>
+
+	<target name="jquery" depends="init,selector" description="Main jquery build, concatenates source files and replaces @VERSION">
+		<echo message="Building ${JQ}" />
+		<mkdir dir="${dist}" />
+		<concat destfile="${JQ}">
+			<fileset file="src/intro.js" />
+			<fileset file="src/core.js" />
+			<fileset file="src/support.js" />
+			<fileset file="src/data.js" />
+			<fileset file="src/queue.js" />
+			<fileset file="src/attributes.js" />
+			<fileset file="src/event.js" />
+			<fileset file="src/selector.js" />
+			<fileset file="src/traversing.js" />
+			<fileset file="src/manipulation.js" />
+			<fileset file="src/css.js" />
+			<fileset file="src/ajax.js" />
+			<fileset file="src/transports/jsonp.js" />
+			<fileset file="src/transports/script.js" />
+			<fileset file="src/transports/xhr.js" />
+			<fileset file="src/effects.js" />
+			<fileset file="src/offset.js" />
+			<fileset file="src/dimensions.js" />
+			<fileset file="src/outro.js" />
+		</concat>
+		<replaceregexp match="@VERSION" replace="${version}" flags="g" byline="true" file="${JQ}" />
+		<exec executable="git" outputproperty="date">
+			<arg line="log -1 --pretty=format:%ad" />
+		</exec>
+		<replaceregexp match="(\(\s*function\s*\(\s*jQuery\s*\)\s*\{)|(\}\s*\)\s*\(\s*jQuery\s*\)\s*;)" flags="g" replace="" file="${JQ}" />
+		<replaceregexp match="@DATE" replace="${date}" file="${JQ}" />
+		<echo message="${JQ} built." />
+	</target>
 
-    <target name="min" depends="jquery" description="Remove all comments and whitespace, no compression, great in combination with GZip">
-        <echo message="Building ${JQ_MIN}" />
-		<apply executable="java" parallel="false" verbose="true" dest="${DIST_DIR}">
-			<fileset dir="${DIST_DIR}">
+	<target name="lint" depends="jquery" description="Check jQuery against JSLint">
+		<exec executable="java">
+			<arg line="-jar build/js.jar build/jslint-check.js" />
+		</exec>
+	</target>
+
+	<target name="min" depends="jquery" description="Remove all comments and whitespace, no compression, great in combination with GZip">
+		<echo message="Building ${JQ_MIN}" />
+		<apply executable="java" parallel="false" verbose="true" dest="${dist}">
+			<fileset dir="${dist}">
 				<include name="jquery.js" />
 			</fileset>
 			<arg line="-jar" />
-			<arg path="${YUICompressor}" />
-			<arg value="--charset" />
-			<arg value="ANSI" />
-			<arg value="-o" />
+			<arg path="build/google-compiler-20100917.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>
-        <echo message="${JQ_MIN} built." />
-    </target>
-
-	<target name="runtest">
-		<echo message="Running Automated Test Suite" />
-		<java jar="${JAR}" fork="true">
-            <arg value="${BUILD_DIR}/runtest/test.js" />
-        </java>
-		<echo message="Test Suite Finished" />
+		<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>
 
-    <target name="clean">
-        <delete dir="${DIST_DIR}" />
-    </target>
+	<target name="clean">
+		<delete dir="${dist}" />
+		<delete file="src/selector.js" />
+		<delete dir="test/qunit" />
+		<delete dir="src/sizzle" />
+	</target>
 
 	<target name="openAjaxMetadata">
 		<property name="target" value="openAjaxMetadata-jquery-${version}.xml" />
-		<delete file="dist/jquery-*.xml" />
+		<delete file="${dist}/jquery-*.xml" />
 		<get src="http://www.exfer.net/jquery/createjQueryXMLDocs.py?version=1.3" dest="${target}" />
 		<xslt includes="${target}" excludes="build.xml" destdir="./dist" style="build/style.xsl" extension=".xml" />
 		<delete file="${target}" />