diff options
| author | Camil Staps | 2015-02-19 18:56:03 +0100 |
|---|---|---|
| committer | Camil Staps | 2015-02-19 18:56:03 +0100 |
| commit | d50ef7ea5930eae6fb79eef3c4753c3cf6b2908d (patch) | |
| tree | 61e1dc8501daa469caae9a970c99681aefc6c9c2 | |
| parent | directory structure (diff) | |
| parent | changed ant buildfile for default eclipse settings (diff) | |
Merge branch 'master' of https://github.com/camilstaps/Botleagues
| -rw-r--r-- | GameController/.gitignore | 1 | ||||
| -rw-r--r-- | GameController/src/nl/camilstaps/botleagues/GameController.java | 2 | ||||
| -rw-r--r-- | trunk/GameController/build.xml | 38 |
3 files changed, 40 insertions, 1 deletions
diff --git a/GameController/.gitignore b/GameController/.gitignore index b630aee..5bda502 100644 --- a/GameController/.gitignore +++ b/GameController/.gitignore @@ -3,6 +3,7 @@ # Directories # /build/ /bin/ +/dist/ target/ # OS Files # diff --git a/GameController/src/nl/camilstaps/botleagues/GameController.java b/GameController/src/nl/camilstaps/botleagues/GameController.java index 77eea76..1054215 100644 --- a/GameController/src/nl/camilstaps/botleagues/GameController.java +++ b/GameController/src/nl/camilstaps/botleagues/GameController.java @@ -19,7 +19,7 @@ import java.util.List; public abstract class GameController { /** The contestants in this game */ - List<Contestant> contestants = new ArrayList<>(); + List<Contestant> contestants = new ArrayList<Contestant>(); /** * Add a new contestant diff --git a/trunk/GameController/build.xml b/trunk/GameController/build.xml new file mode 100644 index 0000000..31b3d59 --- /dev/null +++ b/trunk/GameController/build.xml @@ -0,0 +1,38 @@ +<project name="GameController" default="dist" basedir="."> + <description> + Controls a Botleagues game + </description> + <!-- set global properties for this build --> + <property name="src" location="src"/> + <property name="build" location="bin"/> + <property name="dist" location="dist"/> + + <target name="init"> + <!-- Create the time stamp --> + <tstamp/> + <!-- Create the build directory structure used by compile --> + <mkdir dir="${build}"/> + </target> + + <target name="compile" depends="init" + description="compile the source " > + <!-- Compile the java code from ${src} into ${build} --> + <javac srcdir="${src}" destdir="${build}"/> + </target> + + <target name="dist" depends="compile" + description="generate the distribution" > + <!-- Create the distribution directory --> + <mkdir dir="${dist}/lib"/> + + <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file --> + <jar jarfile="${dist}/lib/MyProject-${DSTAMP}.jar" basedir="${build}"/> + </target> + + <target name="clean" + description="clean up" > + <!-- Delete the ${build} and ${dist} directory trees --> + <delete dir="${build}"/> + <delete dir="${dist}"/> + </target> +</project> |