X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=build.xml;h=095c52eb719bfe3f4a855b8b001b8e163460bcb1;hb=d7d908b05a442745c1a90728805b74db0a7921cf;hp=cf18781718d7b6a0e013399651850e9c57c9b157;hpb=7ec65c268355c52c871cf1e015fdd5551b83e0b7;p=jquery.git

diff --git a/build.xml b/build.xml
index cf18781..095c52e 100644
--- a/build.xml
+++ b/build.xml
@@ -1,71 +1,96 @@
-<project name="jQuery" default="all" basedir=".">
-
-	<!-- SETUP -->
+<project name="jQuery" default="jquery" basedir=".">
 
-    <property name="SRC_DIR" value="src" />
-    <property name="BUILD_DIR" value="build" />
-    <property name="JAR" value="${BUILD_DIR}/js.jar" />
-
-	<property name="PLUGIN_DIR" location="../plugins" />
-	<property name="PLUGINS" value="none" />
-	<property name="PLUGINS_ALL" value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js" />
+    <!--
+    To get jQuery even smaller, remove the modules you don't need by removing the fileset elements
+	in the jquery-target, for example leaving only these:
 
-    <property name="PREFIX" value="." />
-    <property name="DOCS_DIR" value="${PREFIX}/docs" />
-    <property name="TEST_DIR" value="${PREFIX}/test" />
-    <property name="DIST_DIR" value="${PREFIX}/dist" />
+	<fileset dir="${SRC_DIR}" includes="intro.js" />
+    <fileset dir="${SRC_DIR}" includes="core.js" />
+    <fileset dir="${SRC_DIR}" includes="selector.js" />
+    <fileset dir="${SRC_DIR}" includes="event.js" />
+    <fileset dir="${SRC_DIR}" includes="outro.js" />
 
+	That'd remove ajax, fx and offset support, leaving basic selectors, manipulation and event handling.
+    -->
+
+    <!-- SETUP -->
+
+    <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" />
+	<loadfile description="Version to build" property="version" srcfile="version.txt" />
+
+    <property description="Folder for jquery, min, lite and packed target" name="DIST_DIR" value="./dist" />
+
+    <!-- Files names for distribution -->
     <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" />
-    <property name="JQ_PACK" value="${DIST_DIR}/jquery.pack.js" />
-
-	<property name="TABS" value="${PLUGIN_DIR}/tabs/tabs.js" />
-	<property name="TABS_PACK" value="${DIST_DIR}/jquery.tabs.pack.js" />
-
-	<!-- MAIN -->
-
-    <target name="jquery">
+    <property name="JQ_PACK" value="${DIST_DIR}/jquery.pack.js" />
+	<loadfile property="version" srcfile="version.txt" />
+	
+	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
+		<classpath>
+			<pathelement location="build/ant-contrib-0.6.jar"/>
+		</classpath>
+	</taskdef>
+	<exec executable="svn" outputproperty="svnlog.out" >  
+		<arg line="info ."/>  
+	</exec> 
+	<propertyregex property="revision" input="${svnlog.out}" select="\1">  
+		<regexp pattern="Revision: ([0-9]*)"/>  
+	</propertyregex>
+	<propertyregex property="date" input="${svnlog.out}" select="\1">  
+		<regexp pattern="Date: (.+\))"/>  
+	</propertyregex>  
+
+    <!-- MAIN -->
+
+    <target name="jquery" description="Main jquery build, concatenates source files and replaces @VERSION">
         <echo message="Building ${JQ}" />
         <mkdir dir="${DIST_DIR}" />
-        <concat destfile="${JQ}">
-        	<fileset dir="${SRC_DIR}" includes="intro.js" />
-            <fileset dir="${SRC_DIR}" includes="jquery/*.js" />
-            <fileset dir="${SRC_DIR}" includes="event/*.js" />
-            <fileset dir="${SRC_DIR}" includes="fx/*.js" />
-            <fileset dir="${SRC_DIR}" includes="ajax/*.js" />
-    		<fileset dir="${SRC_DIR}" includes="outro.js" />
+        <concat destfile="${JQ}">
+            <fileset dir="${SRC_DIR}" includes="intro.js" />
+            <fileset dir="${SRC_DIR}" includes="core.js" />
+            <fileset dir="${SRC_DIR}" includes="data.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="event.js" />
+            <fileset dir="${SRC_DIR}" includes="support.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}" />
+		<replaceregexp match="Revision: " replace="Revision: ${revision}" file="${JQ}" />
         <echo message="${JQ} built." />
     </target>
-	
-	<target name="with_plugins" description="Build jquery with all plugins">
-		<antcall target="jquery">
-			<param name="PLUGINS" value="${PLUGINS_ALL}" />
-		</antcall>
-	</target>
 
-    <target name="lite" depends="jquery">
-        <echo message="Building ${JQ_LITE}" />
-        <java jar="${JAR}" fork="true">
-            <arg value="${BUILD_DIR}/build/lite.js" />
-            <arg value="${JQ}" />
-            <arg value="${JQ_LITE}" />
-        </java>
-        <echo message="${JQ_LITE} built." />
-    </target>
-
-    <target name="min" depends="jquery">
+    <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>
 
-    <target name="pack" depends="jquery">
+    <target name="pack" depends="jquery" description="Remove all comments and whitespace and compress">
         <echo message="Building ${JQ_PACK}" />
         <java jar="${JAR}" fork="true">
             <arg value="${BUILD_DIR}/build/pack.js" />
@@ -73,100 +98,30 @@
             <arg value="${JQ_PACK}" />
         </java>
         <echo message="${JQ_PACK} built." />
-    </target>
-		
-    <target name="pack_with_plugins" depends="with_plugins">
-        <echo message="Building ${JQ_PACK}" />
-        <java jar="${JAR}" fork="true">
-            <arg value="${BUILD_DIR}/build/pack.js" />
-            <arg value="${JQ}" />
-            <arg value="${JQ_PACK}" />
-        </java>
-        <echo message="${JQ_PACK} built." />
-    </target>		
-
-    <target name="test" depends="jquery">
-        <echo message="Building Test Suite" />
-        <delete dir="${TEST_DIR}" />
-    	<mkdir dir="${TEST_DIR}/data" />
-        <copy todir="${TEST_DIR}/data">
-        	<fileset dir="${BUILD_DIR}/test/data/" />
-    	</copy>
-        <java jar="${JAR}" fork="true">
-            <arg value="${BUILD_DIR}/test/test.js" />
-            <arg value="${JQ}" />
-            <arg value="${TEST_DIR}" />
-        </java>
-        <echo message="Test Suite built." />
     </target>
 
-    <target name="docs" depends="jquery">
-        <echo message="Building Documentation" />
-        <delete dir="${DOCS_DIR}" />
-        <mkdir dir="${DOCS_DIR}/data" />
-    	<copy todir="${DOCS_DIR}" file="${BUILD_DIR}/docs/.htaccess" />
-        <mkdir dir="${DOCS_DIR}/js" />
-        <copy todir="${DOCS_DIR}/js" >
-            <fileset dir="${BUILD_DIR}/docs/js">
-                <include name="**/*.js"/>
-            </fileset>
-        </copy>
-		<copy todir="${DOCS_DIR}/style" >
-            <fileset dir="${BUILD_DIR}/docs/style">
-                <include name="**"/>
-            </fileset>
-        </copy>
-        <java jar="${JAR}" fork="true">
-            <arg value="${BUILD_DIR}/docs/docs.js" />
-            <arg value="${JQ}" />
-            <arg value="${DOCS_DIR}" />
+	<target name="runtest">
+		<echo message="Running Automated Test Suite" />
+		<java jar="${JAR}" fork="true">
+            <arg value="${BUILD_DIR}/runtest/test.js" />
         </java>
-        <echo message="Documentation built." />
-    </target>
-		
-    <target name="docs_with_plugins" depends="with_plugins">
-        <echo message="Building Documentation" />
-        <delete dir="${DOCS_DIR}" />
-        <mkdir dir="${DOCS_DIR}/data" />
-    	<copy todir="${DOCS_DIR}" file="${BUILD_DIR}/docs/.htaccess" />
-        <mkdir dir="${DOCS_DIR}/js" />
-        <copy todir="${DOCS_DIR}/js" >
-            <fileset dir="${BUILD_DIR}/docs/js">
-                <include name="**/*.js"/>
-            </fileset>
-        </copy>
-		<copy todir="${DOCS_DIR}/style" >
-            <fileset dir="${BUILD_DIR}/docs/style">
-                <include name="**"/>
-            </fileset>
-        </copy>
-        <java jar="${JAR}" fork="true">
-            <arg value="${BUILD_DIR}/docs/docs.js" />
-            <arg value="${JQ}" />
-            <arg value="${DOCS_DIR}" />
-        </java>
-        <echo message="Documentation built." />
-    </target>		
+		<echo message="Test Suite Finished" />
+	</target>
 
     <target name="clean">
-        <delete dir="${DOCS_DIR}" />
-        <delete dir="${TEST_DIR}" />
         <delete dir="${DIST_DIR}" />
     </target>
 
-    <target name="all" depends="clean,jquery,lite,min,pack,docs,test" >
+    <target name="all" depends="clean,jquery,min,pack">
         <echo message="Build complete." />
     </target>
 	
-	<target name="pack_tabs">
-        <echo message="Building ${TABS_PACK}" />
-		<mkdir dir="${DIST_DIR}" />
-        <java jar="${JAR}" fork="true">
-            <arg value="${BUILD_DIR}/build/pack.js" />
-            <arg value="${TABS}" />
-            <arg value="${TABS_PACK}" />
-        </java>
-        <echo message="${TABS_PACK} built." />
-    </target>
+	<target name="openAjaxMetadata">
+		<property name="target" value="openAjaxMetadata-jquery-${version}.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}" />
+	</target>
 
 </project>