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

diff --git a/build.xml b/build.xml
index 362f0cb..22d6a0c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,177 +1,109 @@
-<project name="jQuery" default="all" basedir=".">
+<project name="jQuery" default="jquery" basedir=".">
 
-    <!--
-    - Using this build file to create your own custom distribution -
-
-    If you want to include jQuery on your site with a certain set of plugins,
-    follow these steps to create your custom build:
-
-    1. Copy the plugins you need to the plugins folder (if you haven't already, checkout
-       the plugins folder from SVN.
-    2. Modify the PLUGINS property to include all plugins you want, see PLUGINS_ALL for syntax
-       eg. if you need form and tabs plugin, set the value for PLUGINS to this:
-       form/*.js, tabs/*.js
-    3. Execute the standard jquery and packed targets to build your distribution
-
-    TODO Using this build file to create docs for a single plugin
-    -->
-
-    <!-- SETUP -->
-
-    <property description="Source Folder" name="SRC_DIR" value="src" />
+    <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="Dir to look for plugins" name="PLUGIN_DIR" location="../plugins" />
-    <property description="Add single plugins here" name="PLUGINS" value="none" />
-    <property description="Add all plugins here" name="PLUGINS_ALL"
-        value="button/*.js,center/*.js,cookie/*.js,form/*.js,greybox/*.js,interface/*.js,pager/*.js,tablesorter/*.js,tabs/*.js,tooltip/*.js,accordion/*.js" />
+    <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="Target parent folder for built files" name="PREFIX" value="." />
-    <property description="Folder for docs target" name="DOCS_DIR" value="${PREFIX}/docs" />
-    <property description="Folder for test target" name="TEST_DIR" value="${PREFIX}/test" />
-    <property description="Folder for jquery, min, lite and packed target" name="DIST_DIR" value="${PREFIX}/dist" />
+    <property description="Folder for jquery and min 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" />
-
-    <!-- MAIN -->
-
-    <target name="jquery" description="Main jquery build, set PLUGINS property to include plugins">
+	<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="qunit-clone" unless="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> 
+		<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> 
+		<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> 
+		<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="jquery/jquery.js" />
-            <fileset dir="${SRC_DIR}" includes="selector/selector.js" />
-            <fileset dir="${SRC_DIR}" includes="event/event.js" />
-            <fileset dir="${SRC_DIR}" includes="fx/fx.js" />
-            <fileset dir="${SRC_DIR}" includes="ajax/ajax.js" />
-            <fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />
+            <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="jquery_with_plugins" description="Build jquery with all plugins, useful to full documentation">
-        <antcall target="jquery">
-            <param name="PLUGINS" value="${PLUGINS_ALL}" />
-        </antcall>
-    </target>
-
-    <target name="lite" depends="jquery" description="Remove all /** */ comments">
-        <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" description="Remove all comments and whitespace, no compression">
+    <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" 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" />
-            <arg value="${JQ}" />
-            <arg value="${JQ_PACK}" />
+	<target name="runtest">
+		<echo message="Running Automated Test Suite" />
+		<java jar="${JAR}" fork="true">
+            <arg value="${BUILD_DIR}/runtest/test.js" />
         </java>
-        <echo message="${JQ_PACK} built." />
-    </target>
-
-    <target name="pack_with_plugins" depends="jquery_with_plugins" description="Pack jquery with all plugins, not very useful">
-        <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" description="Copy files for the test suite into their own directory.">
-        <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>
-        <copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/index.html" />
-        <copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/fx.html" />
-        <copy todir="${TEST_DIR}" file="${BUILD_DIR}/test/cow.jpg" />
-        <echo message="Test Suite built." />
-    </target>
-
-    <target name="docs" depends="jquery" description="Reads inline docs from source and compiles into xml file">
-        <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>
-
-    <!-- TODO refactor to remove duplication with above -->
-    <target name="docs_with_plugins" depends="jquery_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">
-        <echo message="Build complete." />
-    </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>