Index: unix_installer/upgrader-package/build.xml
===================================================================
diff -u -rf881a836edb4620893311ae8de2c55d7399f4c2e -rae03aa8c8bc205026de9dcab8324b8975426c264
--- unix_installer/upgrader-package/build.xml	(.../build.xml)	(revision f881a836edb4620893311ae8de2c55d7399f4c2e)
+++ unix_installer/upgrader-package/build.xml	(.../build.xml)	(revision ae03aa8c8bc205026de9dcab8324b8975426c264)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="Unix-Updater-Script-2.0.4" default="build" basedir=".">
+<project name="Unix-Updater-Build-Script" default="build" basedir=".">
 
- 	<property name="VERSION" value="2.0.4" />
- 	<property name="PACKAGE-ROOT" value="build/lams-unix-updater-2.0.4" />
+ 	<property name="VERSION" value="2.1" />
+ 	<property name="PACKAGE-ROOT" value="build/lams-unix-updater-${VERSION}" />
+	<property name="LAMS_PROJECT_ROOT" value="../.." />
+	<property name="TOOLS" value="tools" />
 	<property name="db.username" value="lams" />
 	<property name="db.password" value="lamsdemo" />
 	<property name="db.name" value="lams" />
@@ -61,19 +63,120 @@
 			<arg line="${PACKAGE-ROOT}/bin" />
 		</exec>
 		
-		<!-- create ${PACKAGE-ROOT}.tar.gz and place it in the build directory -->
-		<tar longfile="gnu" destfile="${PACKAGE-ROOT}.tar" basedir="build" excludes="*.tar.gz, *.tar.gz.bak"/>
-		<gzip zipfile="${PACKAGE-ROOT}.tar.gz" src="${PACKAGE-ROOT}.tar" />
-		
-		<delete failonerror="false" file="${PACKAGE-ROOT}.tar" />
+		<!-- Remove all the CVS directories -->
+        <exec executable="/bin/bash" failonerror="true">
+            <arg value="-c" />
+            <arg value="./createPackage.sh" />
+        </exec>
 	</target>
 	
 	<!-- clean the installation, the .bak file will remain in the build dir -->
 	<target name="clean" description="Clean up output directories.">
 		<delete dir="${PACKAGE-ROOT}" failonerror="false"/>
-		
-		<!-- backup existing tar.gz file if it exists-->
 		<delete file="${PACKAGE-ROOT}.tar.gz" failonerror="false"/>
 	</target>
 	
+	<target name="copy-tools" description="Copies all the tool deploy files to the tools directory">
+
+		<antcall target="copy-tool-deploy-package"> 
+			<param name="tool.dir" value="lams_tool_chat" /> 
+			<param name="tool.sig" value="lachat11" /> 
+		</antcall>
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_forum" /> 
+            <param name="tool.sig" value="lafrum11" /> 
+        </antcall>	
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_lamc" /> 
+            <param name="tool.sig" value="lamc11" /> 
+        </antcall>	
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_laqa" /> 
+            <param name="tool.sig" value="laqa11" /> 
+        </antcall>	
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_larsrc" /> 
+            <param name="tool.sig" value="larsrc11" /> 
+        </antcall>	
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_nb" /> 
+            <param name="tool.sig" value="lanb11" /> 
+        </antcall>		
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_notebook" /> 
+            <param name="tool.sig" value="lantbk11" /> 
+        </antcall>
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_sbmt" /> 
+            <param name="tool.sig" value="lasbmt11" /> 
+        </antcall>
+            	
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_chat" /> 
+            <param name="tool.sig" value="lachat11" /> 
+        </antcall>
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_scribe" /> 
+            <param name="tool.sig" value="lascrb11" /> 
+        </antcall>
+		
+        <antcall target="copy-tool-deploy-package"> 
+            <param name="tool.dir" value="lams_tool_vote" /> 
+            <param name="tool.sig" value="lavote11" /> 
+        </antcall>
+		
+    </target>
+	
+    <target name="copy-tool-deploy-package" description="Copies the tools deploy packages after it has been built">
+        <echo>Copying tool deploy project for ${tool.sig}</echo>
+    	
+    	<!-- Cleaning the directory -->
+    	<delete dir="${TOOLS}/${tool.sig}" failonerror="false"/>
+        <mkdir dir="${TOOLS}/${tool.sig}" /> 
+    	
+    	<mkdir dir="${TOOLS}/${tool.sig}/build/deploy/language" />
+    	<mkdir dir="${TOOLS}/${tool.sig}/build/deploy/sql/updatescripts" />
+    	
+    	<!-- Copy the tool's build.properties -->
+    	<copy todir="${TOOLS}/${tool.sig}">
+            <fileset dir="${LAMS_PROJECT_ROOT}/${tool.dir}">
+                <include name="build.properties" />  
+            </fileset>
+    	</copy>
+    	
+    	<!-- Copy files to the tool's deploy dir -->
+    	<copy todir="${TOOLS}/${tool.sig}/build/deploy">
+            <fileset dir="${LAMS_PROJECT_ROOT}/${tool.dir}/build/deploy">
+                <include name="deploy.xml" />
+            	<include name="lams-tool-${tool.sig}.jar" />
+            	<include name="lams-tool-${tool.sig}.war" />
+            	<include name="deploy.sh" />
+            </fileset>
+        </copy>
+    	
+    	<!-- Make sure deploy.sh is executable -->
+    	<chmod file="${TOOLS}/${tool.sig}/build/deploy/deploy.sh" perm="ugo+rx"/>
+    	
+    	<!-- Copying language files for the tool -->
+    	<copy todir="${TOOLS}/${tool.sig}/build/deploy/language">
+    		<fileset dir="${LAMS_PROJECT_ROOT}/${tool.dir}/build/deploy/language" />
+    	</copy>
+    	
+    	<!-- Copying sql files for the tool -->
+        <copy todir="${TOOLS}/${tool.sig}/build/deploy/sql">
+            <fileset dir="${LAMS_PROJECT_ROOT}/${tool.dir}/build/deploy/sql" />
+        </copy>
+
+    </target>
+	
+	
+	
 </project>