Refactored with_plugins target to reuse jquery target, avoiding duplication

diff --git a/build.xml b/build.xml
index 2ec3a5b..79718c3 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -7,7 +7,8 @@
     <property name="JAR" value="${BUILD_DIR}/js.jar" />\r
 \r
        <property name="PLUGIN_DIR" location="../plugins" />\r
-       <property name="PLUGINS" value="none" />\r
+       <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" />\r
 
     <property name="PREFIX" value="." />
     <property name="DOCS_DIR" value="${PREFIX}/docs" />
@@ -38,29 +39,12 @@
         </concat>
         <echo message="${JQ} built." />
     </target>
-\r
-    <target name="with_plugins">\r
-        <echo message="Building ${JQ}" />\r
-        <mkdir dir="${DIST_DIR}" />\r
-        <concat destfile="${JQ}">\r
-               <fileset dir="${SRC_DIR}" includes="intro.js" />\r
-            <fileset dir="${SRC_DIR}" includes="jquery/*.js" />\r
-            <fileset dir="${SRC_DIR}" includes="event/*.js" />\r
-            <fileset dir="${SRC_DIR}" includes="fx/*.js" />\r
-            <fileset dir="${SRC_DIR}" includes="ajax/*.js" />\r
-                                               <fileset dir="${PLUGIN_DIR}" includes="button/*.js" />\r
-                                               <fileset dir="${PLUGIN_DIR}" includes="center/*.js" />\r
-                                               <fileset dir="${PLUGIN_DIR}" includes="cookie/*.js" />\r
-                                               <fileset dir="${PLUGIN_DIR}" includes="form/*.js" />\r
-                                               <fileset dir="${PLUGIN_DIR}" includes="greybox/*.js" />\r
-                                               <fileset dir="${PLUGIN_DIR}" includes="interface/*.js" />\r
-                                               <fileset dir="${PLUGIN_DIR}" includes="pager/*.js" />\r
-                                               <fileset dir="${PLUGIN_DIR}" includes="tablesorter/*.js" />\r
-                                               <fileset dir="${PLUGIN_DIR}" includes="tabs/*.js" />\r
-               <fileset dir="${SRC_DIR}" includes="outro.js" />\r
-        </concat>\r
-        <echo message="${JQ} built." />\r
-    </target>\r
+       
+       <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>\r
-\r
-       <!-- PLUGINS -->\r
-\r
-       <target name="ifx" description="Build jquery with Interface fx plugins">\r
-               <antcall target="jquery">\r
-                       <param name="PLUGINS" value="interface/ifx*.js" />\r
-               </antcall>\r
-       </target>\r
-\r
-       <target name="cookieFormPager" description="Build jquery with cookie, form and pager plugins">\r
-               <antcall target="jquery">\r
-                       <param name="PLUGINS" value="cookie/*.js,form/*.js,pager/*.js" />\r
-               </antcall>\r
-       </target>\r
-\r
+    </target>
+       
        <target name="pack_tabs">\r
         <echo message="Building ${TABS_PACK}" />\r
                <mkdir dir="${DIST_DIR}" />\r