Improved jquery target to allow inclusion of plugins directly (specify via the PLUGIN...

diff --git a/build.xml b/build.xml
index 4a598ea..5768ff7 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -6,8 +6,9 @@
     <property name="BUILD_DIR" value="build" />
     <property name="JAR" value="${BUILD_DIR}/js.jar" />\r
        \r
-       <property name="PLUGIN_DIR" location="../plugins" />
-
+       <property name="PLUGIN_DIR" location="../plugins" />\r
+       <property name="PLUGINS" value="" />\r
+       
     <property name="PREFIX" value="." />
     <property name="DOCS_DIR" value="${PREFIX}/docs" />
     <property name="TEST_DIR" value="${PREFIX}/test" />
@@ -17,7 +18,6 @@
     <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" />\r
-       <property name="JQ_TEMP" value="${DIST_DIR}/jquery.js.tmp" />
 \r
        <!-- MAIN -->\r
        \r
@@ -30,6 +30,7 @@
             <fileset dir="${SRC_DIR}" includes="event/*.js" />
             <fileset dir="${SRC_DIR}" includes="fx/*.js" />
             <fileset dir="${SRC_DIR}" includes="ajax/*.js" />\r
+               <fileset dir="${PLUGIN_DIR}" includes="${PLUGINS}" />\r
                <fileset dir="${SRC_DIR}" includes="outro.js" />
         </concat>
         <echo message="${JQ} built." />
@@ -117,33 +118,15 @@
        <!-- PLUGINS -->\r
        \r
        <target name="ifx" description="Build jquery with Interface fx plugins">\r
-               <antcall target="plugin">\r
-                       <param name="plugins" value="interface/ifx*.js" />\r
+               <antcall target="jquery">\r
+                       <param name="PLUGINS" value="interface/ifx*.js" />\r
                </antcall>\r
        </target>\r
        \r
-       <target name="plugindocs" description="Build documentation for a set of plugins - Not working, yet">\r
-               <antcall target="raw">\r
-                       <param name="plugins" value="center/*.js, cookie/*.js, form/*.js" />\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
-               <antcall target="docs" />\r
-       </target>\r
-       \r
-       <target name="raw" description="Build a set of plugins, without jquery itself">\r
-               <concat destfile="${JQ}">\r
-                       <fileset dir="${PLUGIN_DIR}" includes="${plugins}" />\r
-        </concat>\r
-               <echo message="${plugins} built." />\r
        </target>\r
-       \r
-       <target name="plugin" depends="jquery" description="Build jquery with a given set of plugins, see ifx target for an example">\r
-               <copy tofile="${JQ_TEMP}" file="${JQ}"/>\r
-               <concat destfile="${JQ}">\r
-               <fileset file="${JQ_TEMP}" />\r
-                       <fileset dir="${PLUGIN_DIR}" includes="${plugins}" />\r
-        </concat>\r
-               <delete file="${JQ_TEMP}" />\r
-               <echo message="${JQ} with ${plugins} built." />\r
-       </target>
 
 </project>