Index: unix_installer/installer-package/build.xml
===================================================================
RCS file: /usr/local/cvsroot/unix_installer/installer-package/build.xml,v
diff -u -r1.1 -r1.2
--- unix_installer/installer-package/build.xml	17 May 2007 05:25:11 -0000	1.1
+++ unix_installer/installer-package/build.xml	11 Jul 2007 01:46:40 -0000	1.2
@@ -1,101 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="Unix-Installer-Build" basedir=".">
-	<property file="../../lams_build/common.properties" />
-	<property file="../../lams_build/unix.properties" />
-	<property name="package-root" value="build/lams-unix-installer-2.0.2"/>
+<project name="Unix-Build-Script-2.0.4" default="build" basedir=".">
+
+ 	<property name="VERSION" value="2.0.4" />
+ 	<property name="PACKAGE-ROOT" value="build/lams-unix-installer-2.0.4" />
+	<property name="db.username" value="lams" />
+	<property name="db.password" value="lamsdemo" />
+	<property name="db.name" value="lams" />
 	
-	<target name="clean" description="Create build dir.">
-		<delete dir="build" />
-		<mkdir dir="build" />
-		<mkdir dir="${package-root}" />
-		<mkdir dir="${package-root}/assembly" />
-		<mkdir dir="${package-root}/assembly/lams.ear" />
-		<mkdir dir="${package-root}/sql-scripts" />
-		<mkdir dir="${package-root}/log" />
-		<mkdir dir="${package-root}/database" />
-		<mkdir dir="${package-root}/bin" />
-		<mkdir dir="${package-root}/conf" />
-		<mkdir dir="${package-root}/doc" />
-		<mkdir dir="${package-root}/wrapper" />
-		<mkdir dir="${package-root}/ant" />
-		<mkdir dir="${package-root}/ant-scripts" />
-	</target>
+	<description>
+		Unix build script for lams ${VERSION}
+	</description>
 	
 	<target name="dump-db" description="Dump full LAMS database contents.">
-	    <exec dir="" executable="C:\Program Files\MySQL\MySQL Server 5.0\bin\mysqldump.exe" 
-	     output="${package-root}/database/lams.dump" failonerror="true">
-	      <arg line="-u${db.username}" />
-	      <arg line="--password=${db.password}" />
-	      <arg line="${db.name}" />
-	    </exec>
+		<exec executable="mysqldump" 
+		     output="${basedir}/database/lams.dump" failonerror="true">
+		      <arg line="-u${db.username}" />
+		      <arg line="--password=${db.password}" />
+		      <arg line="${db.name}" />
+		</exec>
 	</target>
 	
-	<target name="compile-java" description="Compile custom java class">
-		<javac srcdir="bin" destdir="bin" />
-	</target>
-	
-	<target name="copy-assembly">
-		<copy todir="${package-root}/assembly">
-			<fileset dir="${j2eelibs}">
-				<include name="lams-session.jar"/>
-				<include name="lams-valve.jar"/>
-			</fileset>
-		</copy>
+	<target name="build" depends="clean" description="Compile all sources.">
+
+		<!-- create the necessary directories -->
+		<mkdir dir="${PACKAGE-ROOT}" /> 
+		<mkdir dir="${PACKAGE-ROOT}/log" /> 
+		<mkdir dir="${PACKAGE-ROOT}/sql-scripts" /> 
+		<mkdir dir="${PACKAGE-ROOT}/doc" />
 		
-		<copy todir="${package-root}/assembly/lams.ear">
-			<fileset dir="${jboss.deploy}"/>
-		</copy>	
-	</target>
+		<!-- copy files to new created folders -->
+		<exec executable="cp" failonerror="true">
+			<arg line="-r" />
+		    <arg line="ant" />
+		    <arg line="ant-scripts" />
+		    <arg line="assembly" />
+		    <arg line="bin" />
+			<arg line="conf" />
+		    <arg line="database" />
+		    <arg line="install-lams.sh" />		
+			<arg line="wrapper" />		
+			<arg line="readme" />
+			<arg line="license" />
+			<arg line="lams.properties" />
+			<arg line="${PACKAGE-ROOT}" />
+		</exec>
+		
+		<exec executable="cp" failonerror="true">
+			<arg line="doc/setLamsConfiguration.sql" />
+		    <arg line="${PACKAGE-ROOT}/doc" />
+		</exec>
+		
+		<exec executable="cp" failonerror="true">
+			<arg line="sql-scripts/create-database.sql" />
+		    <arg line="${PACKAGE-ROOT}/sql-scripts" />
+		</exec>
 	
-	
-	<target name="copy-files" depends="copy-assembly" description="Copies the files to the build dir">
-		<copy todir="${package-root}">
-			<fileset file="doc/lams.properties"/>
-			<fileset dir="${basedir}">
-				<include name="readme"/>
-				<include name="license"/>
-				<include name="install-lams.sh"/>
-			</fileset>
-		</copy>
+		<exec executable="cp" failonerror="true">
+			<arg line="bin/checkmysql.class" />
+			<arg line="bin/testJava.class" />
+			<arg line="bin/run-lams.sh" />
+			<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" />
 		
-		<copy tofile="${package-root}/doc/setLamsConfiguration.sql" file="doc/setLamsConfiguration.sql"/>
-			
-		<copy todir="${package-root}/ant">
-			<fileset dir="ant"/>
-		</copy>
-		<copy todir="${package-root}/ant-scripts">
-			<fileset dir="ant-scripts"/>
-		</copy>
-		<copy todir="${package-root}/bin">
-			<fileset dir="bin">
-				<include name="*.class"/>	
-				<include name="*.sh"/>
-			</fileset>
-		</copy>
-		<copy todir="${package-root}/conf">
-			<fileset dir="conf"/>
-		</copy>
-		<copy todir="${package-root}/wrapper">
-			<fileset dir="wrapper"/>
-		</copy>	
+		<delete failonerror="false" file="${PACKAGE-ROOT}.tar" />
 	</target>
 	
-	<target name="create-package">
-		<delete failonerror="false" file="${package-root}.tar.gz" />
+	<!-- 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"/>
 		
-		<tar destfile="${package-root}.tar" basedir="${package-root}" excludes="CVS"/>
-		<gzip zipfile="${package-root}.tar.gz" src="${package-root}.tar" />
-		
-		<delete failonerror="false" file="${package-root}.tar" />
+		<!-- backup existing tar.gz file if it exists-->
+		<delete file="${PACKAGE-ROOT}.tar.gz" failonerror="false"/>
 	</target>
 	
-	<target name="build-package" depends="clean, compile-java, dump-db, copy-files, create-package"> 
-		<echo>Build Successful</echo>
-	</target>
-	
-	<target name="rebuild-package" depends="clean, copy-files, create-package"> 
-			<echo>Rebuild Successful</echo>
-	</target>
-	
-</project>
\ No newline at end of file
+</project>