X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=build.xml;h=3596136c8a9817ee3492fea354dd3d1d9f372d3d;hb=dde208fc4b60aa183899687ec071a6c31556ead2;hp=569a4fad4bcf6e3cb22a6de0b3ae5c9219f89748;hpb=b9e216ca75a0e8cfbaf14b064cc8a371de3e5c13;p=jquery.git

diff --git a/build.xml b/build.xml
index 569a4fa..3596136 100644
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,14 @@
-<project name="jQuery" default="all" basedir=".">
+<project name="jQuery" default="all" basedir=".">
+	
+	<!-- SETUP -->
 
     <property name="SRC_DIR" value="src" />
     <property name="BUILD_DIR" value="build" />
-    <property name="JAR" value="${BUILD_DIR}/js.jar" />
-
+    <property name="JAR" value="${BUILD_DIR}/js.jar" />
+	
+	<property name="PLUGIN_DIR" location="../plugins" />
+	<property name="PLUGINS" value="none" />
+	
     <property name="PREFIX" value="." />
     <property name="DOCS_DIR" value="${PREFIX}/docs" />
     <property name="TEST_DIR" value="${PREFIX}/test" />
@@ -11,16 +16,22 @@
 
     <property name="JQ" value="${DIST_DIR}/jquery.js" />
     <property name="JQ_LITE" value="${DIST_DIR}/jquery.lite.js" />
-    <property name="JQ_PACK" value="${DIST_DIR}/jquery.pack.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">
         <echo message="Building ${JQ}" />
         <mkdir dir="${DIST_DIR}" />
-        <concat destfile="${JQ}">
+        <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="ajax/*.js" />
+        	<fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />
+    		<fileset dir="${SRC_DIR}" includes="outro.js" />
         </concat>
         <echo message="${JQ} built." />
     </target>
@@ -35,6 +46,16 @@
         <echo message="${JQ_LITE} built." />
     </target>
 
+    <target name="min" depends="jquery">
+        <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>
+        <echo message="${JQ_MIN} built." />
+    </target>
+
     <target name="pack" depends="jquery">
         <echo message="Building ${JQ_PACK}" />
         <java jar="${JAR}" fork="true">
@@ -48,14 +69,10 @@
     <target name="test" depends="jquery">
         <echo message="Building Test Suite" />
         <delete dir="${TEST_DIR}" />
-        <mkdir dir="${TEST_DIR}/tests" />
-        <mkdir dir="${TEST_DIR}/js" />
-        <copy todir="${TEST_DIR}/js">
-            <fileset dir="${BUILD_DIR}/test/js">
-                <include name="**/*.js"/>
-            </fileset>
-        </copy>
-
+    	<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}" />
@@ -68,6 +85,7 @@
         <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">
@@ -93,8 +111,22 @@
         <delete dir="${DIST_DIR}" />
     </target>
 
-    <target name="all" depends="clean,jquery,lite,pack,docs,test" >
+    <target name="all" depends="clean,jquery,lite,min,pack,docs,test" >
         <echo message="Build complete." />
-    </target>
+    </target>
+	
+	<!-- PLUGINS -->
+	
+	<target name="ifx" description="Build jquery with Interface fx plugins">
+		<antcall target="jquery">
+			<param name="PLUGINS" value="interface/ifx*.js" />
+		</antcall>
+	</target>
+	
+	<target name="cookieFormPager" description="Build jquery with cookie, form and pager plugins">
+		<antcall target="jquery">
+			<param name="PLUGINS" value="cookie/*.js,form/*.js,pager/*.js" />
+		</antcall>
+	</target>
 
 </project>