Index: lib/ant-contrib-1.0b3.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: lib/ant-contrib-1.0b3.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: antHelp.txt
===================================================================
--- antHelp.txt	(revision 0)
+++ antHelp.txt	(revision 0)
@@ -0,0 +1,38 @@
+Introduction:
+--------------------------------------------------------------------------------
+This file, ./docs/antHelp.txt, provides some default help text for the Fluid
+ant build. The build.xml is configured to print this file by default in the
+case where no other specific target is specified.
+
+
+Other help with our build file:
+--------------------------------------------------------------------------------
+Type "ant -p" to see a list of ant targets and the descriptions of those targets
+as recorded directly in the build.xml file.
+
+
+Running the targets:
+--------------------------------------------------------------------------------
+Your run the targets by specifying the specific target to the GUI in which you
+are running Ant (Eclipse is highly recommended) or by invoking ant with the name
+of the desired task as the first argument.
+
+Example:
+  ant build -Dcomponents=FluidAll -DJSAll=true     //Build all Fluid components and all JS libs
+  ant build -Dcomponents=Reorderer -DJSAll=true    //Build Reorderer component and jQuery libs
+  ant build -Dcomponents=InlineEdit -DJSAll=false  //Build InlineEdit component but no jQuery libs
+  ant build -Dcomponents="Reorderer InlineEdit" -DJSAll=true
+                                                   //Build myFluid with Reorderer and InlineEdit components and jQuery libs
+
+
+Available targets:
+--------------------------------------------------------------------------------
+"help"       -   The target that prints this file
+"build"      -   The target for building Fluid project
+"clean"      -   The target to clean the build environment
+
+Available parameters:
+--------------------------------------------------------------------------------
+"components" -   A list of components in the Fluid build, the default is FluidAll.
+                 The available components: Fluid, Reorderer, InlineEdit, Pager, and Uploader
+"JSAll"      -   Include all jQuery javascript library when set to true and true is the default
Index: build.properties
===================================================================
--- build.properties	(revision 5994)
+++ build.properties	(working copy)
@@ -12,4 +12,11 @@
 fluid_renderer_order_of_dependencies=fastXmlPull.js,fluidParser.js,fluidRenderer.js

 

 <!-- Directories to exclude from JSLint validation -->

-excludeFromJSLint=**/jquery*/,**/json*/
\ No newline at end of file
+excludeFromJSLint=**/jquery*/,**/json*/
+
+<!-- Fluid components and dependencies -->
+fluid_basic=Fluid.js
+fluid_InlineEdit=InlineEdit.js
+fluid_Pager=Pager.js
+fluid_Reorderer=FluidDOMUtilities.js,GeometricManager.js,Reorderer.js
+fluid_Uploader=Uploader.js
Index: build.xml
===================================================================
--- build.xml	(revision 5994)
+++ build.xml	(working copy)
@@ -2,9 +2,14 @@
 To build a distribution, type: ant
 To jsLint all source code in the source directory, type: ant validate
 To jsLint source code within a specific directory, type: ant validate -Dlint="../some/folder"
+Current, this build.xml supports Reorderer, InlineEdit, Pager, and Uploader Fluid components.
+If a new component is added, the following files need to be updated:
+antHelp.txt: 		the new component added to the help content
+build.properties:	the dependent js files added to the component list
+build.xml:			the new component js files in the for list and in the switch-case
 -->
 
-<project name="Fluid" default="buildAll" basedir=".">
+<project name="Fluid" default="help" basedir=".">
 	<description>
 	Build a distributable package of Fluid components.
 	</description>
@@ -55,9 +60,65 @@
 		classname="net.happygiraffe.jslint.ant.JSLintTask" 
 		classpath="${jslint}" />
 
-	<!-- Target: buildAll -->
-	<target name="buildAll" depends="clean, war, package" />
+	<!-- task definition for ant tool library -->
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+        <classpath>
+            <pathelement location="lib/ant-contrib-1.0b3.jar" />
+        </classpath>
+    </taskdef>
 
+    <!-- Set the default component and JS property to FluidAll and AllJS if they are not set yet -->
+    <!-- This block must be before all targets -->
+    <if>
+        <isset property="components"/>
+        <then>
+            <echo>component is set to "${components}".</echo>
+            <propertyregex property="singleBuild"
+                input="${components}"
+                regexp="\s"
+                select = "\0"
+                casesensitive="false" />
+
+            <if>
+                <!-- If there is " ", then the build contains mutiple components -->
+                <equals arg1="${singleBuild}" arg2=" " />
+                <then>
+                    <echo>build myFluid</echo>
+                    <property name="targetName" value="myFluid" />
+                </then>
+                <else>
+                    <!-- If there is NO " ", then the build contains single component -->
+                    <echo>build ${components}</echo>
+                    <property name="targetName" value="${components}" />
+                </else>
+            </if>
+        </then>
+        <else>
+            <property name="components" value="FluidAll" />
+            <property name="targetName" value="FluidAll" />
+            <echo>components is NOT set, and set it to default ${components}.</echo>
+        </else>
+    </if>
+    <if>
+        <isset property="JSAll"/>
+        <then>
+            <echo>JSAll is set to "${JSAll}".</echo>
+        </then>
+        <else>
+            <property name="JSAll" value="true" />
+            <echo>JSAll is NOT set, and set it to ${JSAll}.</echo>
+        </else>
+    </if>
+
+	<!-- Target: help -->
+    <target name="help" description="Print information about using this ant build file.">
+        <loadfile property="helpMessage" srcFile="antHelp.txt" />
+        <echo message="${helpMessage}" />
+    </target>
+
+	<!-- Target: build -->
+	<target name="build" depends="clean, war, package" />
+
 	<!-- Target: cleanup before running -->
 	<target name="clean">
 		<delete dir="${build}" />
@@ -127,9 +188,103 @@
 	</target>
 
     <target name="concatAllJS">
-		<concat destfile="${toDir}/Fluid-all.js" append="true" >
-		    <filelist dir="${src}/js/jquery" files="${jquery_order_of_dependencies}" />
-			<filelist dir="${src}/js/fluid" files="${fluid_order_of_dependencies}" />
+        <!-- include or not jQuery libs -->
+        <if>
+            <equals arg1="${JSAll}" arg2="true" />
+            <then>
+	            <concat destfile="${toDir}/${targetName}.js" append="true" >
+	                <filelist dir="${src}/js/jquery" files="${jquery_order_of_dependencies}" />
+                </concat>    
+            </then>
+        </if>
+        <if>
+            <!-- Fluid-all -->
+            <equals arg1="${targetName}" arg2="FluidAll" />
+            <then>
+	            <concat destfile="${toDir}/${targetName}.js" append="true" >
+			        <filelist dir="${src}/js/fluid" files="${fluid_order_of_dependencies}" />
+                </concat>    
+            </then>
+            <else>
+                <if>
+                    <!-- myFluid -->
+                    <equals arg1="${targetName}" arg2="myFluid" />
+                    <then>
+		                <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                <filelist dir="${src}/js/fluid" files="${fluid_basic}" />
+		                </concat>
+                        <for list="${components}" param="component" delimiter=" ">
+                            <sequential>
+                                <if>
+                                    <equals arg1="@{component}" arg2="Reorderer" />
+                                    <then>
+		                                <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                                <filelist dir="${src}/js/fluid" files="${fluid_Reorderer}" />
+		                                </concat>
+                                    </then>
+                                </if>
+                                <if>
+                                    <equals arg1="@{component}" arg2="InlineEdit" />
+                                    <then>
+		                                <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                                <filelist dir="${src}/js/fluid" files="${fluid_InlineEdit}" />
+		                                </concat>
+                                    </then>
+                                </if>
+                                <if>
+                                    <equals arg1="@{component}" arg2="Uploader" />
+                                    <then>
+		                                <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                                <filelist dir="${src}/js/fluid" files="${fluid_Uploader}" />
+		                                </concat>
+                                    </then>
+                                </if>
+                                <if>
+                                    <equals arg1="@{component}" arg2="Pager" />
+                                    <then>
+		                                <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                                <filelist dir="${src}/js/fluid" files="${fluid_Pager}" />
+		                                </concat>
+                                    </then>
+                                </if>
+                            </sequential>
+                        </for>
+                    </then>
+                    <!-- single Fluid component -->
+                    <else>
+		                <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                <filelist dir="${src}/js/fluid" files="${fluid_basic}" />
+		                </concat>
+                        <switch value="${components}">
+                            <case value="Reorderer">
+		                        <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                        <filelist dir="${src}/js/fluid" files="${fluid_Reorderer}" />
+		                        </concat>
+                            </case>
+                            <case value="InlineEdit">
+		                        <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                        <filelist dir="${src}/js/fluid" files="${fluid_InlineEdit}" />
+		                        </concat>
+                            </case>
+                            <case value="Uploader">
+		                        <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                        <filelist dir="${src}/js/fluid" files="${fluid_Uploader}" />
+		                        </concat>
+                            </case>
+                            <case value="Pager">
+		                        <concat destfile="${toDir}/${targetName}.js" append="true" >
+			                        <filelist dir="${src}/js/fluid" files="${fluid_Pager}" />
+		                        </concat>
+                            </case>
+                            <default>
+                                <fail message="There is no ${components} to build"/>
+                            </default>
+                        </switch>
+                    </else>
+                </if>
+            </else>
+        </if>
+		<concat destfile="${toDir}/${targetName}.js" append="true" >
 			<filelist dir="${src}/js/fluid/renderer" files="${fluid_renderer_order_of_dependencies}" />
             <filelist dir="${src}/js/json" files="json2.js" />
             <filelist dir="${src}/js/swfupload" files="swfupload.js" />
@@ -146,7 +301,7 @@
 		<antcall target="minify">

 			<param name="fromDir" value="${components-build}/js/all" />

 			<param name="toDir" value="${components-build}/js/" />

-			<param name="file-pattern" value="Fluid-all.js" />

+			<param name="file-pattern" value="${targetName}.js" />

 			<param name="lineBreakArg" value="" />

 		</antcall>