X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=build.xml;h=49596e9ba6349718421d6e5c573a2e6a615f013c;hb=7b780def0d7843e26d6a26dbc60499ea75f09e59;hp=024dcd7999ac32896a6135728c321d9b59fe01cf;hpb=3980dc92955a62bdfeb9f3b0572bfe64155a125d;p=jquery.git

diff --git a/build.xml b/build.xml
index 024dcd7..49596e9 100644
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,8 @@
     <property name="JAR" value="${BUILD_DIR}/js.jar" />
 
 	<property name="PLUGIN_DIR" location="../plugins" />
-	<property name="PLUGINS" value="none" />
+	<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" />
 
     <property name="PREFIX" value="." />
     <property name="DOCS_DIR" value="${PREFIX}/docs" />
@@ -38,29 +39,12 @@
         </concat>
         <echo message="${JQ} built." />
     </target>
-
-    <target name="with_plugins">
-        <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="${PLUGIN_DIR}" includes="button/*.js" />
-						<fileset dir="${PLUGIN_DIR}" includes="center/*.js" />
-						<fileset dir="${PLUGIN_DIR}" includes="cookie/*.js" />
-						<fileset dir="${PLUGIN_DIR}" includes="form/*.js" />
-						<fileset dir="${PLUGIN_DIR}" includes="greybox/*.js" />
-						<fileset dir="${PLUGIN_DIR}" includes="interface/*.js" />
-						<fileset dir="${PLUGIN_DIR}" includes="pager/*.js" />
-						<fileset dir="${PLUGIN_DIR}" includes="tablesorter/*.js" />
-						<fileset dir="${PLUGIN_DIR}" includes="tabs/*.js" />
-    		<fileset dir="${SRC_DIR}" includes="outro.js" />
-        </concat>
-        <echo message="${JQ} built." />
-    </target>
+	
+	<target name="jquery_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}" />
@@ -92,7 +76,7 @@
         <echo message="${JQ_PACK} built." />
     </target>
 		
-    <target name="pack_with_plugins" depends="with_plugins">
+    <target name="pack_with_plugins" depends="jquery_with_plugins">
         <echo message="Building ${JQ_PACK}" />
         <java jar="${JAR}" fork="true">
             <arg value="${BUILD_DIR}/build/pack.js" />
@@ -141,7 +125,7 @@
         <echo message="Documentation built." />
     </target>
 		
-    <target name="docs_with_plugins" depends="with_plugins">
+    <target name="docs_with_plugins" depends="jquery_with_plugins">
         <echo message="Building Documentation" />
         <delete dir="${DOCS_DIR}" />
         <mkdir dir="${DOCS_DIR}/data" />
@@ -173,24 +157,11 @@
 
     <target name="all" depends="clean,jquery,lite,min,pack,docs,test" >
         <echo message="Build complete." />
-    </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>
-
+    </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}" />