Index: build-scripts/build.properties
===================================================================
--- build-scripts/build.properties	(revision 8812)
+++ build-scripts/build.properties	(working copy)
@@ -61,3 +61,5 @@
 <!-- Directories to exclude from JSLint validation -->
 excludeFromJSLint=**/lib*/
 
+<!-- destination directory for InfusionBuilder package -->
+builder-dir=../infusionBuilder/
\ No newline at end of file
Index: build-scripts/build.xml
===================================================================
--- build-scripts/build.xml	(revision 8812)
+++ build-scripts/build.xml	(working copy)
@@ -55,6 +55,7 @@
     <target name="clean" description="Cleans up all build-related artifacts and products.">
         <delete dir="${build}" />
         <delete dir="${products}" />
+        <delete dir="${builder-dir}" />
     </target>
   
     <!-- Set up the build directory structure -->
@@ -120,19 +121,27 @@
     <!-- Creates the release directory structure and zips it all up -->
     <target name="package">
       <echo>Zipping distribution bundle to ${dist}/${zipfile}</echo>
-      <zip destfile="${products}/${zipfile}.zip" 
-        basedir="${dist}"
+      <zip destfile="${toDir}/${zipfile}.zip" 
+        basedir="${minDir}"
         includes="**/*"  excludes="*.zip" />
               
       <echo>Zipping source bundle to ${dist}/${zipfile}</echo>
-      <zip destfile="${products}/${zipfile}-src.zip" 
-        basedir="${src-dist}"
+      <zip destfile="${toDir}/${zipfile}-src.zip" 
+        basedir="${srcDir}"
         includes="**/*"  excludes="*.zip" />
     </target>
+    
+    <target name="infusionPackage" >
+        <antcall target="package">
+            <param name="toDir" value="${products}" />
+            <param name="srcDir" value="${src-dist}" />
+            <param name="minDir" value="${dist}" />
+        </antcall>
+    </target>
 
     <!-- Copies the files required to build a war file containing Infusion. -->
     <target name="copyInfusionWARFiles">        
-      <copy todir="${build}/war/src/webapp/" >
+      <copy todir="${toDir}src/webapp/">
         <fileset dir="${dist}">
             <include name="components/**/*" />
             <include name="framework/**/*" />
@@ -140,11 +149,11 @@
         </fileset>
       </copy>
   
-      <copy todir="${build}/war/src/webapp/WEB-INF" >
+      <copy todir="${toDir}src/webapp/WEB-INF" >
         <fileset dir="${web-inf}"/>
       </copy>
   
-      <copy todir="${build}/war">
+      <copy todir="${toDir}">
         <fileset dir="..">
           <include name="pom.xml" />
           <include name="project.xml" />
@@ -156,22 +165,26 @@
     
     <!-- Builds the WAR file using Maven 2 and copies it to the distribution folder. -->
     <target name="buildWAR">
-      <condition property="isWindows">
-        <os family="windows" />
-      </condition>
-      <antcall target="invokeMavenForWAR"/>
-      <antcall target="invokeMavenForWARWindows"/>
-      <echo>Copying war file ${build}/war/target/${warfile} to ${dist}...</echo>
-      <copy todir="${dist}">
-          <fileset dir="${build}/war/target">
-              <include name="${warfile}" />
-          </fileset>
-      </copy>
+        <condition property="isWindows">
+            <os family="windows" />
+        </condition>
+        <antcall target="invokeMavenForWAR">
+            <param name="buildDir" value="${buildDir}" />
+        </antcall>
+        <antcall target="invokeMavenForWARWindows">
+            <param name="buildDir" value="${buildDir}" />
+        </antcall>
+        <echo>Copying war file ${build}/war/target/${warfile} to ${dist}...</echo>
+        <copy todir="${toDir}">
+            <fileset dir="${buildDir}/target">
+                <include name="${warfile}" />
+            </fileset>
+        </copy>
     </target>
   
     <target name="invokeMavenForWAR" unless="isWindows">
       <echo>Building war file...</echo>
-      <apply executable="mvn" dir="${build}/war" parallel="true">
+      <apply executable="mvn" dir="${buildDir}" parallel="true">
           <fileset  dir=".">
               <include name="pom.xml"/>
           </fileset>
@@ -180,7 +193,7 @@
     </target>
   
     <target name="invokeMavenForWARWindows" if="isWindows">
-      <apply executable="cmd" dir="${build}/war" parallel="true" vmlauncher="false">
+      <apply executable="cmd" dir="${buildDir}" parallel="true" vmlauncher="false">
           <fileset  dir=".">
               <include name="pom.xml"/>
           </fileset>
@@ -189,17 +202,32 @@
     </target>
     
     <!-- Builds the core Infusion WAR file. -->
-    <target name="buildInfusionWAR" depends="copyInfusionWARFiles, buildWAR">
+    <target name="buildInfusionWAR">
+        <antcall target="copyInfusionWARFiles">
+            <param name="toDir" value="${build}/war/" />
+        </antcall>
+        
+        <antcall target="buildWAR">
+            <param name="buildDir" value="${build}/war" />
+            <param name="toDir" value="${dist}" />
+        </antcall>
     </target>
         
     <!-- Builds a full-fledged WAR file used for the daily build, which includes sample code and tests. -->
-    <target name="buildDailyWAR" depends="copyInfusionWARFiles">        
+    <target name="buildDailyWAR">
+        <antcall target="copyInfusionWARFiles">
+            <param name="warToDir" value="${build}/war/" />
+        </antcall>
+                      
         <!-- Copy the additional files into the war build required for the daily build. -->
         <antcall target="copyDistroFiles">
             <param name="toDir" value="${build}/war/src/webapp/" />
         </antcall>
         
-        <antcall target="buildWAR" />
+        <antcall target="buildWAR">
+            <param name="buildDir" value="${build}/war" />
+            <param name="toDir" value="${dist}" />
+        </antcall>
     </target>
 
     <!-- Target: validate -->
@@ -219,7 +247,7 @@
     </target>
     
     <!-- Runs the javascript dependency resolver which sets $jsfile, $requiredDirectoriesSelector, $jsRegExp, $jsReplaceRegExp and $allRequiredJSFiles -->
-    <target name="resolveDependencies" depends="clean">
+    <target name="resolveDependencies">
         <script language="javascript" src="${base-dir}/build-scripts/build.js" />
     </target>
 
@@ -298,16 +326,58 @@
         </copy>
     </target> 
 
-    <target name="releaseBuild" depends="buildSrcBundle, buildDeployBundle, rewriteHTMLHead, buildInfusionWAR, package" 
+    <target name="infusionBuilderPackage">
+        <antcall target="package">
+            <param name="toDir" value="${builder-dir}" />
+            <param name="srcDir" value="${builder-dir}/dist/" />
+            <param name="minDir" value="${builder-dir}/src-dist/" />
+        </antcall>
+    </target>
+    
+    <target name="infusionBuilderWAR">
+        <antcall target="buildWAR">
+            <param name="buildDir" value="${builder-dir}/dist/war" />
+            <param name="toDir" value="${builder-dir}/dist/" />
+        </antcall>
+        <delete dir="${builder-dir}/dist/war"/>
+    </target>
+
+    <target name="infusionBuilderCopy">
+        <!-- copy files for regular distribution -->
+        <copy todir="${builder-dir}/dist">
+            <fileset dir="${dist}" includes="${requiredDirectoriesSelector}README.txt,licenses/*" />         
+        </copy>
+        <copy todir="${builder-dir}/src-dist">
+            <fileset dir="${src-dist}" includes="${requiredDirectoriesSelector}README.txt,licenses/*" />
+        </copy>
+
+        <!-- copy files for war - only minified build has war -->
+        <antcall target="copyInfusionWARFiles">
+            <param name="toDir" value="${builder-dir}/dist/war/" />            
+        </antcall>
+    </target>
+
+    <target name="infusionBuilderClean" description="Cleans up Infusion Builder products.">
+        <delete dir="${builder-dir}" />
+    </target>
+
+    <target name="releaseBuild" depends="buildSrcBundle, buildDeployBundle, rewriteHTMLHead, buildInfusionWAR, infusionPackage" 
         description="Builds and packages a release bundle of Infusion.">
     </target>
     
-    <target name="dailyBuild" depends="buildSrcBundle, buildDeployBundle, rewriteHTMLHead, buildDailyWAR, package"
+    <target name="dailyBuild" depends="buildSrcBundle, buildDeployBundle, rewriteHTMLHead, buildDailyWAR, infusionPackage"
         description="Builds and packages Infusion along with tests and sample code, suitable for development testing or a daily build.">
     </target>
 
-    <target name="customBuild" depends="copyToSrcBundle, copyToDeployBundle, rewriteHTMLHead, buildInfusionWAR, package" 
+    <target name="customBuild" depends="copyToSrcBundle, copyToDeployBundle, rewriteHTMLHead, buildInfusionWAR, infusionPackage" 
         description="Builds a custom package of Infusion containing the modules specified as command line arguments.">
     </target>
     
+    <target name="deployInfusionBuilder" depends="copyToSrcBundle, copyToDeployBundle" 
+        description="Performs minification tasks required before deploying the Infusion Builder.">
+    </target>
+        
+    <target name="infusionBuilder" depends="infusionBuilderClean, resolveDependencies, infusionBuilderCopy, infusionBuilderWAR, infusionBuilderPackage" 
+        description="Provides a custom packaged fluid infusion from already minified files">
+    </target>    
 </project>