Author: nextgens
Date: 2007-07-31 15:30:05 +0000 (Tue, 31 Jul 2007)
New Revision: 14449

Added:
   trunk/apps/Thaw/build.xml
Removed:
   trunk/apps/Thaw/build.xml
   trunk/apps/Thaw/real.build.xml
Log:
Thaw: update the build process with the new ant configuration file

Deleted: trunk/apps/Thaw/build.xml
===================================================================
--- trunk/apps/Thaw/build.xml   2007-07-31 14:35:31 UTC (rev 14448)
+++ trunk/apps/Thaw/build.xml   2007-07-31 15:30:05 UTC (rev 14449)
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Thaw" default="jar">
-
-       <property name="src.dir" value="src" />
-       <property name="bin.dir" value="build" />
-       <property name="images.dir" value="images" />
-       <property name="lib.dir" value="lib" />
-       <property name="javadoc.dir" value="javadoc" />
-       <property name="javac.debug" value="false" />
-       <property name="svn.revision" value="@custom@"/>
-       
-       <property name="jmdns.location" value="${lib.dir}/jmdns.jar" />
-       <available file="${jmdns.location}" property="jmdns_available" />
-       <fail unless="jmdns_available" status="1"
-       message="You need to download jmdns.jar from 
http://sourceforge.net/projects/jmdns/ and to put it in lib/" />
-       
-       <property name="hsqldb.location" value="${lib.dir}/hsqldb.jar" />
-       <available file="${hsqldb.location}" property="hsqldb_available" />
-       <fail unless="hsqldb_available" status="1"
-       message="You need to download hsqldb.jar from 
http://sourceforge.net/projects/hsqldb/ and to put it in lib/" />
-
-       <target name="compile">
-               <mkdir dir="${bin.dir}" />
-
-               <replace file="${src.dir}/thaw/core/Main.java">
-                       <replacefilter token="@custom@" 
value="${svn.revision}"/>
-               </replace>
-
-
-               <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="true" 
optimize="true">
-
-                       <!-- <compilerarg value="-Xlint" /> -->
-                       <classpath>
-                               <pathelement location="${jmdns.location}"/>
-                               <pathelement location="${hsqldb.location}"/>
-                       </classpath>
-               </javac>
-
-               <copy todir="${bin.dir}">
-                       <fileset file="gpl.txt" />
-                       <fileset file="readme.txt" />
-                       <fileset dir="${images.dir}" />
-
-                       <fileset dir="${src.dir}">
-                               <include name="**/*.properties" />
-                               <include name="**/*.png" /><!-- for the liquid 
lnf -->
-                       </fileset>
-               </copy>
-       </target>
-
-
-       <target name="run" depends="compile">
-               <java classname="thaw.core.Main" 
classpath="${hsqldb.location}:${bin.dir}" dir="${bin.dir}" fork="true" />
-       </target>
-
-
-       <target name="jar" depends="compile"    description="Make the Jar" >
-               <jar jarfile="${lib.dir}/Thaw.jar" basedir="${bin.dir}">
-                       <manifest>
-                               <attribute name="Main-Class" 
value="thaw.core.Main"/>
-                       </manifest>
-
-                       <fileset dir="${bin.dir}"/>
-                       <ZipFileSet src="${hsqldb.location}"/>
-                       <ZipFileSet src="${jmdns.location}"/>
-               </jar>
-       </target>
-
-
-       <target name="javadoc">
-               <javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}">
-                       <fileset dir="${src.dir}" includes="**/*.java" />
-               </javadoc>
-       </target>
-
-       <target name="clean">
-               <delete dir="${bin.dir}"/>
-               <delete file="${lib.dir}/Thaw.jar"/>
-       </target>
-
-</project>

Copied: trunk/apps/Thaw/build.xml (from rev 14448, 
trunk/apps/Thaw/real.build.xml)
===================================================================
--- trunk/apps/Thaw/build.xml                           (rev 0)
+++ trunk/apps/Thaw/build.xml   2007-07-31 15:30:05 UTC (rev 14449)
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+
+<project name="Thaw" default="jar">
+
+       <property name="src.dir" value="src" />
+       <property name="bin.dir" value="build" />
+       <property name="images.dir" value="images" />
+       <property name="lib.dir" value="lib" />
+       <property name="javadoc.dir" value="javadoc" />
+       <property name="javac.debug" value="false" />
+       <property name="svn.revision" value="@custom@"/>
+
+       <property name="licenses.dir" value="licenses" />
+
+       <property name="main.dir" value="main" />
+       <property name="thawNoDeps.location" 
value="${main.dir}/ThawNoDeps.jar"/>
+
+       <property name="final.dir" value="bin" />
+
+       <!-- JMDNS -->
+       <property name="jmdns.location" value="${lib.dir}/jmdns.jar" />
+       <available file="${jmdns.location}" property="jmdns_available" />
+       <fail unless="jmdns_available" status="1"
+       message="You need to download jmdns.jar from 
http://sourceforge.net/projects/jmdns/ and to put it in lib/" />
+
+       <!-- HSQLDB -->
+       <property name="hsqldb.location" value="${lib.dir}/hsqldb.jar" />
+       <available file="${hsqldb.location}" property="hsqldb_available" />
+       <fail unless="hsqldb_available" status="1"
+       message="You need to download hsqldb.jar from 
http://sourceforge.net/projects/hsqldb/ and to put it in lib/" />
+
+       <!-- BOUNCYCASTLE -->
+       <property name="bouncycastle.location" 
value="${lib.dir}/BouncyCastle.jar" />
+       <available file="${bouncycastle.location}" 
property="bouncycastle_available" />
+       <fail unless="bouncycastle_available" status="1"
+       message="You need to download the bouncycastle provider for the JDK 1.4 
from http://bouncycastle.org/latest_releases.html and put it in lib/ with the 
name BouncyCastle.jar." />
+
+       <!-- ONE-JAR -->
+       <property name="one-jar.location" value="${lib.dir}/one-jar-boot.jar" />
+       <available file="${one-jar.location}" property="one-jar_available" />
+       <fail unless="one-jar_available" status="1"
+       message="You need to download One-Jar-boot from 
http://prdownloads.sourceforge.net/one-jar/, put it in lib/, and rename it 
'one-jar.jar'" />
+
+
+       <target name="compile">
+               <mkdir dir="${bin.dir}" />
+
+               <replace file="${src.dir}/thaw/core/Main.java">
+                       <replacefilter token="@custom@" 
value="${svn.revision}"/>
+               </replace>
+
+
+               <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="true" 
optimize="true" encoding="UTF8">
+
+                       <!-- <compilerarg value="-Xlint" /> -->
+                       <classpath>
+                               <pathelement location="${jmdns.location}"/>
+                               <pathelement location="${hsqldb.location}"/>
+                               <pathelement 
location="${bouncycastle.location}" />
+                       </classpath>
+               </javac>
+
+               <copy todir="${bin.dir}">
+                       <fileset dir="licenses" />
+                       <fileset file="readme.txt" />
+                       <fileset dir="${images.dir}" />
+
+                       <fileset dir="${src.dir}">
+                               <include name="**/*.properties" />
+                               <include name="**/*.png" /><!-- for the liquid 
lnf -->
+                       </fileset>
+               </copy>
+       </target>
+
+
+       <target name="run" depends="compile">
+               <java classname="thaw.core.Main" 
classpath="${jmdns.location}:${bouncycastle.location}:${hsqldb.location}:${bin.dir}"
 dir="${bin.dir}" fork="true" />
+       </target>
+
+
+       <target name="jar" depends="compile" description="Make the Jar" >
+               <mkdir dir="${main.dir}" />
+               <mkdir dir="${final.dir}" />
+
+               <jar jarfile="${thawNoDeps.location}" basedir="${bin.dir}" 
index="false">
+                       <manifest>
+                               <attribute name="Main-Class" 
value="thaw.core.Main" />
+                       </manifest>
+               </jar>
+
+               <jar jarfile="${final.dir}/Thaw.jar" index="false">
+                       <manifest>
+                              <attribute name="Main-Class" 
value="com.simontuffs.onejar.Boot" />
+                              <attribute name="One-Jar-Expand" 
value="expand,doc" />
+                       </manifest>
+
+                       <fileset dir=".">
+                           <include name="${main.dir}/**/*.jar" />
+                           <include name="${lib.dir}/**/*.jar" />
+                           <include name="${licenses.dir}/**/*.txt" />
+                       </fileset>
+
+                       <ZipFileSet src="${one-jar.location}">
+                           <!-- This file is extracted from the .jar by one-jar
+                                at runtime. I can't accept it :
+                                The license will included like the others
+                                and one-jar will be in the 'about' dialog like 
the others
+                                That's all -->
+                           <exclude name="doc/one-jar-license.txt" />
+                       </ZipFileSet>
+               </jar>
+
+               <delete dir="${main.dir}" />
+       </target>
+
+
+       <target name="javadoc">
+               <javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}">
+                       <fileset dir="${src.dir}" includes="**/*.java" />
+               </javadoc>
+       </target>
+
+       <target name="clean">
+               <delete dir="${bin.dir}"/>
+               <delete dir="${main.dir}"/>
+               <delete file="${final.dir}/Thaw.jar"/>
+       </target>
+
+</project>

Deleted: trunk/apps/Thaw/real.build.xml
===================================================================
--- trunk/apps/Thaw/real.build.xml      2007-07-31 14:35:31 UTC (rev 14448)
+++ trunk/apps/Thaw/real.build.xml      2007-07-31 15:30:05 UTC (rev 14449)
@@ -1,129 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Thaw" default="jar">
-
-       <property name="src.dir" value="src" />
-       <property name="bin.dir" value="build" />
-       <property name="images.dir" value="images" />
-       <property name="lib.dir" value="lib" />
-       <property name="javadoc.dir" value="javadoc" />
-       <property name="javac.debug" value="false" />
-       <property name="svn.revision" value="@custom@"/>
-
-       <property name="licenses.dir" value="licenses" />
-
-       <property name="main.dir" value="main" />
-       <property name="thawNoDeps.location" 
value="${main.dir}/ThawNoDeps.jar"/>
-
-       <property name="final.dir" value="bin" />
-
-       <!-- JMDNS -->
-       <property name="jmdns.location" value="${lib.dir}/jmdns.jar" />
-       <available file="${jmdns.location}" property="jmdns_available" />
-       <fail unless="jmdns_available" status="1"
-       message="You need to download jmdns.jar from 
http://sourceforge.net/projects/jmdns/ and to put it in lib/" />
-
-       <!-- HSQLDB -->
-       <property name="hsqldb.location" value="${lib.dir}/hsqldb.jar" />
-       <available file="${hsqldb.location}" property="hsqldb_available" />
-       <fail unless="hsqldb_available" status="1"
-       message="You need to download hsqldb.jar from 
http://sourceforge.net/projects/hsqldb/ and to put it in lib/" />
-
-       <!-- BOUNCYCASTLE -->
-       <property name="bouncycastle.location" 
value="${lib.dir}/BouncyCastle.jar" />
-       <available file="${bouncycastle.location}" 
property="bouncycastle_available" />
-       <fail unless="bouncycastle_available" status="1"
-       message="You need to download the bouncycastle provider for the JDK 1.4 
from http://bouncycastle.org/latest_releases.html and put it in lib/ with the 
name BouncyCastle.jar." />
-
-       <!-- ONE-JAR -->
-       <property name="one-jar.location" value="${lib.dir}/one-jar-boot.jar" />
-       <available file="${one-jar.location}" property="one-jar_available" />
-       <fail unless="one-jar_available" status="1"
-       message="You need to download One-Jar-boot from 
http://prdownloads.sourceforge.net/one-jar/, put it in lib/, and rename it 
'one-jar.jar'" />
-
-
-       <target name="compile">
-               <mkdir dir="${bin.dir}" />
-
-               <replace file="${src.dir}/thaw/core/Main.java">
-                       <replacefilter token="@custom@" 
value="${svn.revision}"/>
-               </replace>
-
-
-               <javac srcdir="${src.dir}" destdir="${bin.dir}" debug="true" 
optimize="true" encoding="UTF8">
-
-                       <!-- <compilerarg value="-Xlint" /> -->
-                       <classpath>
-                               <pathelement location="${jmdns.location}"/>
-                               <pathelement location="${hsqldb.location}"/>
-                               <pathelement 
location="${bouncycastle.location}" />
-                       </classpath>
-               </javac>
-
-               <copy todir="${bin.dir}">
-                       <fileset dir="licenses" />
-                       <fileset file="readme.txt" />
-                       <fileset dir="${images.dir}" />
-
-                       <fileset dir="${src.dir}">
-                               <include name="**/*.properties" />
-                               <include name="**/*.png" /><!-- for the liquid 
lnf -->
-                       </fileset>
-               </copy>
-       </target>
-
-
-       <target name="run" depends="compile">
-               <java classname="thaw.core.Main" 
classpath="${jmdns.location}:${bouncycastle.location}:${hsqldb.location}:${bin.dir}"
 dir="${bin.dir}" fork="true" />
-       </target>
-
-
-       <target name="jar" depends="compile" description="Make the Jar" >
-               <mkdir dir="${main.dir}" />
-               <mkdir dir="${final.dir}" />
-
-               <jar jarfile="${thawNoDeps.location}" basedir="${bin.dir}" 
index="false">
-                       <manifest>
-                               <attribute name="Main-Class" 
value="thaw.core.Main" />
-                       </manifest>
-               </jar>
-
-               <jar jarfile="${final.dir}/Thaw.jar" index="false">
-                       <manifest>
-                              <attribute name="Main-Class" 
value="com.simontuffs.onejar.Boot" />
-                              <attribute name="One-Jar-Expand" 
value="expand,doc" />
-                       </manifest>
-
-                       <fileset dir=".">
-                           <include name="${main.dir}/**/*.jar" />
-                           <include name="${lib.dir}/**/*.jar" />
-                           <include name="${licenses.dir}/**/*.txt" />
-                       </fileset>
-
-                       <ZipFileSet src="${one-jar.location}">
-                           <!-- This file is extracted from the .jar by one-jar
-                                at runtime. I can't accept it :
-                                The license will included like the others
-                                and one-jar will be in the 'about' dialog like 
the others
-                                That's all -->
-                           <exclude name="doc/one-jar-license.txt" />
-                       </ZipFileSet>
-               </jar>
-
-               <delete dir="${main.dir}" />
-       </target>
-
-
-       <target name="javadoc">
-               <javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}">
-                       <fileset dir="${src.dir}" includes="**/*.java" />
-               </javadoc>
-       </target>
-
-       <target name="clean">
-               <delete dir="${bin.dir}"/>
-               <delete dir="${main.dir}"/>
-               <delete file="${final.dir}/Thaw.jar"/>
-       </target>
-
-</project>


Reply via email to