From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Fri, 27 Oct 2006 12:32:14 +0000 (+0000)
Subject: Refactored with_plugins target to reuse jquery target, avoiding duplication
X-Git-Tag: 1.0.3~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b3b2c1f42d6df46377c05b90bf9bcc664356d0e;p=jquery.git

Refactored with_plugins target to reuse jquery target, avoiding duplication
---

diff --git a/build.xml b/build.xml
index 2ec3a5b9e..79718c3c3 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="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}" />
@@ -173,22 +157,8 @@
 
     <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}" />