aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/build.xml181
-rw-r--r--build/newbuild.xml112
-rw-r--r--build/oldbuild.xml75
3 files changed, 184 insertions, 184 deletions
diff --git a/build/build.xml b/build/build.xml
index ce3d166..2bbfd65 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1,75 +1,112 @@
-<?xml version="1.0"?>
-<project name="cardbase" default="deploy" basedir="..">
+<?xml version="1.0"?>
+<project name="cardbasenew" default="test" basedir="..">
+
+ <property name="main.build.dir" value="build/main" />
+ <property name="main.src.dir" value="src" />
+ <property name="main-class" value="eu.equalparts.cardbase.cli.CardbaseCLI" />
+
+ <property name="test.build.dir" value="build/test" />
+ <property name="test.src.dir" value="test" />
+
+ <property name="build.dir" location="build" />
+ <property name="dist.dir" location="dist" />
+ <property name="lib.dir" value="lib" />
+ <property name="test.lib.dir" value="lib/junit" />
+
+ <property name="res.dir" value="res" />
+
+ <property name="jar.name" value="cardbase" />
+
+ <path id="classpath.base" >
+ <fileset dir="${basedir}/">
+ <include name="${res.dir}/*" />
+
+ <include name="${lib.dir}/*.jar" />
+ <exclude name="${lib.dir}/*sources.jar"/>
+ <exclude name="${lib.dir}/*javadoc.jar"/>
+ </fileset>
+ </path>
+
+ <path id="classpath.test">
+ <fileset dir="${basedir}/">
+ <include name="${lib.dir}/junit/*.jar" />
+ <exclude name="${lib.dir}/junit/*sources.jar"/>
+ <exclude name="${lib.dir}/junit/*javadoc.jar"/>
+ </fileset>
+ <pathelement location="${main.build.dir}"/>
+ <path refid="classpath.base" />
+ </path>
+
+ <target name="test" depends="run, clean" />
+
+ <target name="compile" depends="clean">
+ <mkdir dir="${main.build.dir}"/>
+ <javac srcdir="${main.src.dir}" destdir="${main.build.dir}" includeantruntime="false">
+ <classpath refid="classpath.base"/>
+ </javac>
+ <copy todir="${main.build.dir}">
+ <fileset dir="${res.dir}" excludes=""/>
+ </copy>
+ </target>
+
+ <target name="build" depends="compile">
+ <mkdir dir="${test.build.dir}"/>
+ <javac srcdir="${test.src.dir}" destdir="${test.build.dir}" includeantruntime="false">
+ <classpath refid="classpath.test"/>
+ </javac>
+ <copy todir="${test.build.dir}">
+ <fileset dir="${test.src.dir}" excludes="**.java"/>
+ </copy>
+ <echo message="Build done" />
+ </target>
- <property name="jar.name" value="cardbase" />
- <property name="src.dir" location="src" />
- <property name="bin.dir" location="tmpbin" />
- <property name="build.dir" location="build" />
- <property name="dist.dir" location="dist" />
- <property name="lib.dir" value="lib" />
- <property name="res.dir" value="res" />
- <property name="test.src.dir" value="test" />
- <property name="main-class" value="eu.equalparts.cardbase.cli.CardbaseCLI" />
-
- <!-- Clean up temporary directories -->
- <target name="clean" description="clean up">
- <delete dir="${bin.dir}" />
- <delete dir="${dist.dir}" />
- </target>
-
- <!-- Initialise temporary directories -->
- <target name="init">
- <mkdir dir="${bin.dir}" />
- </target>
-
- <!-- External libraries classpath, we don't need sources and javadoc -->
- <path id="classpath">
- <fileset dir="${basedir}/">
- <include name="${res.dir}/*" />
-
- <include name="${lib.dir}/*.jar" />
- <exclude name="${lib.dir}/*sources.jar"/>
- <exclude name="${lib.dir}/*javadoc.jar"/>
- </fileset>
- </path>
-
- <!-- Compile project including external libraries and copy resource files across as well -->
- <target name="compile" depends="init" description="compile the source">
- <javac includeantruntime="false" srcdir="${src.dir}" destdir="${bin.dir}" classpathref="classpath" />
-
- <copy todir="${bin.dir}">
- <fileset dir="${res.dir}" excludes=""/>
- </copy>
- </target>
-
- <!-- Create the jar and declare the ext libraries in manifest.mf file -->
- <target name="jar" depends="compile" >
-
- <mkdir dir="${dist.dir}" />
-
- <jar jarfile="${dist.dir}/${jar.name}.jar" basedir="${bin.dir}">
-
- <zipgroupfileset dir="${lib.dir}" includes="*.jar" excludes="*sources.jar, *javadoc.jar" />
-
- <manifest>
- <attribute name="Main-Class" value="${main-class}" />
- <attribute name="Class-Path" value="${classpath.name}" />
- </manifest>
- </jar>
- <delete dir="${bin.dir}" />
- </target>
-
- <!-- Concatenate a the jar to a pre-set header and chmod 755 it -->
- <target name="shebang" depends="deploy" >
- <concat destfile="${dist.dir}/${jar.name}" binary="yes">
- <fileset dir="${build.dir}" includes="header"/>
- <fileset dir="${dist.dir}" includes="${jar.name}.jar"/>
- </concat>
-
- <chmod file="${dist.dir}/${jar.name}" perm="755"/>
- </target>
-
- <!-- Produce a standalone, runnable jar -->
- <target name="deploy" depends="clean, compile, jar" />
+ <!-- Test and build all files -->
+ <!-- To run this: use "ant" (default) or "ant run" -->
+ <target name="run" depends="build">
+ <junit printsummary="on" haltonfailure="no">
+ <classpath>
+ <path refid="classpath.test" />
+ <pathelement location="${test.build.dir}"/>
+ </classpath>
+ <formatter type="brief" usefile="false" />
+ <batchtest>
+ <fileset dir="${test.src.dir}" includes="**/*Test*.java" />
+ </batchtest>
+ </junit>
+ </target>
+
+ <!-- delete all class files -->
+ <!-- To run this: use "ant clean" -->
+ <target name="clean">
+ <delete dir="${main.build.dir}" />
+ <delete dir="${test.build.dir}" />
+ <echo message="clean done" />
+ </target>
+
+ <!-- Create the jar and declare the ext libraries in manifest.mf file -->
+ <target name="jar" depends="compile" >
+ <mkdir dir="${dist.dir}" />
+
+ <jar jarfile="${dist.dir}/${jar.name}.jar" basedir="${main.build.dir}">
+ <zipgroupfileset dir="${lib.dir}" includes="*.jar" excludes="*sources.jar, *javadoc.jar" />
+ <manifest>
+ <attribute name="Main-Class" value="${main-class}" />
+ <attribute name="Class-Path" value="${classpath.base.name}" />
+ </manifest>
+ </jar>
+ </target>
+
+ <!-- Produce a standalone, runnable jar -->
+ <target name="deploy" depends="compile, jar" />
+
+ <!-- Concatenate the jar to a pre-set header and chmod 755 it -->
+ <target name="shebang" depends="deploy" >
+ <concat destfile="${dist.dir}/${jar.name}" binary="yes">
+ <fileset dir="${build.dir}" includes="header"/>
+ <fileset dir="${dist.dir}" includes="${jar.name}.jar"/>
+ </concat>
+ <chmod file="${dist.dir}/${jar.name}" perm="755"/>
+ </target>
+
</project> \ No newline at end of file
diff --git a/build/newbuild.xml b/build/newbuild.xml
deleted file mode 100644
index 2bbfd65..0000000
--- a/build/newbuild.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-<project name="cardbasenew" default="test" basedir="..">
-
- <property name="main.build.dir" value="build/main" />
- <property name="main.src.dir" value="src" />
- <property name="main-class" value="eu.equalparts.cardbase.cli.CardbaseCLI" />
-
- <property name="test.build.dir" value="build/test" />
- <property name="test.src.dir" value="test" />
-
- <property name="build.dir" location="build" />
- <property name="dist.dir" location="dist" />
- <property name="lib.dir" value="lib" />
- <property name="test.lib.dir" value="lib/junit" />
-
- <property name="res.dir" value="res" />
-
- <property name="jar.name" value="cardbase" />
-
- <path id="classpath.base" >
- <fileset dir="${basedir}/">
- <include name="${res.dir}/*" />
-
- <include name="${lib.dir}/*.jar" />
- <exclude name="${lib.dir}/*sources.jar"/>
- <exclude name="${lib.dir}/*javadoc.jar"/>
- </fileset>
- </path>
-
- <path id="classpath.test">
- <fileset dir="${basedir}/">
- <include name="${lib.dir}/junit/*.jar" />
- <exclude name="${lib.dir}/junit/*sources.jar"/>
- <exclude name="${lib.dir}/junit/*javadoc.jar"/>
- </fileset>
- <pathelement location="${main.build.dir}"/>
- <path refid="classpath.base" />
- </path>
-
- <target name="test" depends="run, clean" />
-
- <target name="compile" depends="clean">
- <mkdir dir="${main.build.dir}"/>
- <javac srcdir="${main.src.dir}" destdir="${main.build.dir}" includeantruntime="false">
- <classpath refid="classpath.base"/>
- </javac>
- <copy todir="${main.build.dir}">
- <fileset dir="${res.dir}" excludes=""/>
- </copy>
- </target>
-
- <target name="build" depends="compile">
- <mkdir dir="${test.build.dir}"/>
- <javac srcdir="${test.src.dir}" destdir="${test.build.dir}" includeantruntime="false">
- <classpath refid="classpath.test"/>
- </javac>
- <copy todir="${test.build.dir}">
- <fileset dir="${test.src.dir}" excludes="**.java"/>
- </copy>
- <echo message="Build done" />
- </target>
-
- <!-- Test and build all files -->
- <!-- To run this: use "ant" (default) or "ant run" -->
- <target name="run" depends="build">
- <junit printsummary="on" haltonfailure="no">
- <classpath>
- <path refid="classpath.test" />
- <pathelement location="${test.build.dir}"/>
- </classpath>
- <formatter type="brief" usefile="false" />
- <batchtest>
- <fileset dir="${test.src.dir}" includes="**/*Test*.java" />
- </batchtest>
- </junit>
- </target>
-
- <!-- delete all class files -->
- <!-- To run this: use "ant clean" -->
- <target name="clean">
- <delete dir="${main.build.dir}" />
- <delete dir="${test.build.dir}" />
- <echo message="clean done" />
- </target>
-
- <!-- Create the jar and declare the ext libraries in manifest.mf file -->
- <target name="jar" depends="compile" >
- <mkdir dir="${dist.dir}" />
-
- <jar jarfile="${dist.dir}/${jar.name}.jar" basedir="${main.build.dir}">
- <zipgroupfileset dir="${lib.dir}" includes="*.jar" excludes="*sources.jar, *javadoc.jar" />
- <manifest>
- <attribute name="Main-Class" value="${main-class}" />
- <attribute name="Class-Path" value="${classpath.base.name}" />
- </manifest>
- </jar>
- </target>
-
- <!-- Produce a standalone, runnable jar -->
- <target name="deploy" depends="compile, jar" />
-
- <!-- Concatenate the jar to a pre-set header and chmod 755 it -->
- <target name="shebang" depends="deploy" >
- <concat destfile="${dist.dir}/${jar.name}" binary="yes">
- <fileset dir="${build.dir}" includes="header"/>
- <fileset dir="${dist.dir}" includes="${jar.name}.jar"/>
- </concat>
-
- <chmod file="${dist.dir}/${jar.name}" perm="755"/>
- </target>
-
-</project> \ No newline at end of file
diff --git a/build/oldbuild.xml b/build/oldbuild.xml
new file mode 100644
index 0000000..ce3d166
--- /dev/null
+++ b/build/oldbuild.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<project name="cardbase" default="deploy" basedir="..">
+
+ <property name="jar.name" value="cardbase" />
+ <property name="src.dir" location="src" />
+ <property name="bin.dir" location="tmpbin" />
+ <property name="build.dir" location="build" />
+ <property name="dist.dir" location="dist" />
+ <property name="lib.dir" value="lib" />
+ <property name="res.dir" value="res" />
+ <property name="test.src.dir" value="test" />
+ <property name="main-class" value="eu.equalparts.cardbase.cli.CardbaseCLI" />
+
+ <!-- Clean up temporary directories -->
+ <target name="clean" description="clean up">
+ <delete dir="${bin.dir}" />
+ <delete dir="${dist.dir}" />
+ </target>
+
+ <!-- Initialise temporary directories -->
+ <target name="init">
+ <mkdir dir="${bin.dir}" />
+ </target>
+
+ <!-- External libraries classpath, we don't need sources and javadoc -->
+ <path id="classpath">
+ <fileset dir="${basedir}/">
+ <include name="${res.dir}/*" />
+
+ <include name="${lib.dir}/*.jar" />
+ <exclude name="${lib.dir}/*sources.jar"/>
+ <exclude name="${lib.dir}/*javadoc.jar"/>
+ </fileset>
+ </path>
+
+ <!-- Compile project including external libraries and copy resource files across as well -->
+ <target name="compile" depends="init" description="compile the source">
+ <javac includeantruntime="false" srcdir="${src.dir}" destdir="${bin.dir}" classpathref="classpath" />
+
+ <copy todir="${bin.dir}">
+ <fileset dir="${res.dir}" excludes=""/>
+ </copy>
+ </target>
+
+ <!-- Create the jar and declare the ext libraries in manifest.mf file -->
+ <target name="jar" depends="compile" >
+
+ <mkdir dir="${dist.dir}" />
+
+ <jar jarfile="${dist.dir}/${jar.name}.jar" basedir="${bin.dir}">
+
+ <zipgroupfileset dir="${lib.dir}" includes="*.jar" excludes="*sources.jar, *javadoc.jar" />
+
+ <manifest>
+ <attribute name="Main-Class" value="${main-class}" />
+ <attribute name="Class-Path" value="${classpath.name}" />
+ </manifest>
+ </jar>
+ <delete dir="${bin.dir}" />
+ </target>
+
+ <!-- Concatenate a the jar to a pre-set header and chmod 755 it -->
+ <target name="shebang" depends="deploy" >
+ <concat destfile="${dist.dir}/${jar.name}" binary="yes">
+ <fileset dir="${build.dir}" includes="header"/>
+ <fileset dir="${dist.dir}" includes="${jar.name}.jar"/>
+ </concat>
+
+ <chmod file="${dist.dir}/${jar.name}" perm="755"/>
+ </target>
+
+ <!-- Produce a standalone, runnable jar -->
+ <target name="deploy" depends="clean, compile, jar" />
+
+</project> \ No newline at end of file