From f6b40f787c48d16d629d7ef50347b034e2d53309 Mon Sep 17 00:00:00 2001
From: philippe lhardy <pl@artisanlogiciel.net>
Date: Tue, 25 Aug 2020 22:11:55 +0200
Subject: [PATCH] depends on artgaphics-0.2.0

set artgraphicslib and distversion as properties
---
 build.xml   | 19 ++++++++++++-------
 mybuild.xml | 13 ++++++++-----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index 1ee3026..973e799 100644
--- a/build.xml
+++ b/build.xml
@@ -1,15 +1,19 @@
-<project name="artloglaby" default="dist" basedir="/home/plhardy/artisanlogiciel/code/laby_github">
-    <description>
-        simple example build file
-    </description>
+<!-- for document on apache ant see https://ant.apache.org/manual-1.9.x/index.html -->
+
+<!-- don't set basedir since it default to parent directory of this file, it is what we want -->
+<project name="artloglaby" default="dist">
+  <description>
+    2D Maze generator ( generate .stl for one 3D layer )
+  </description>
+  
   <!-- set global properties for this build -->
   <property name="src" location="java"/>
   <property name="build" location="build"/>
   <property name="dist"  location="dist"/>
-  <!-- Fill me please / todo -->
-  <property name="artgraphicslib" value="artgaphics-0.1.0"/>
+  
+  <property name="artgraphicslib" value="artgaphics-0.2.0"/>
   <property name="distversion" value="1.0"/>
-
+  
   <target name="init">
     <!-- Create the time stamp -->
     <tstamp/>
@@ -46,4 +50,5 @@
     <delete dir="${build}"/>
     <delete dir="${dist}"/>
   </target>
+
 </project>
diff --git a/mybuild.xml b/mybuild.xml
index 11304cb..973e799 100644
--- a/mybuild.xml
+++ b/mybuild.xml
@@ -10,7 +10,10 @@
   <property name="src" location="java"/>
   <property name="build" location="build"/>
   <property name="dist"  location="dist"/>
-
+  
+  <property name="artgraphicslib" value="artgaphics-0.2.0"/>
+  <property name="distversion" value="1.0"/>
+  
   <target name="init">
     <!-- Create the time stamp -->
     <tstamp/>
@@ -21,7 +24,7 @@
   <target name="compile" depends="init"
         description="compile the source " >
     <!-- Compile the java code from ${src} into ${build} -->
-    <javac srcdir="${src}" destdir="${build}" includeantruntime="false" classpath="libs/artgaphics-0.1.0.jar">
+    <javac srcdir="${src}" destdir="${build}" includeantruntime="false" classpath="libs/${artgraphicslib}.jar">
       <exclude name="org/artisanlogiciel/games/javafx/*"/>
     </javac>
   </target>
@@ -31,11 +34,11 @@
     <!-- Create the distribution directory -->
     <mkdir dir="${dist}/lib"/>
 
-    <!-- Put everything in ${build} into the artloglaby-0.1.jar file  ( ${DSTAMP} not used yet )-->
-    <jar jarfile="${dist}/lib/artloglaby-0.1.jar" basedir="${build}">
+    <!-- Put everything in ${build} into the artloglaby-${distversion}.jar file  ( ${DSTAMP} not used yet )-->
+    <jar jarfile="${dist}/lib/artloglaby-${distversion}.jar" basedir="${build}">
             <manifest>
               <attribute name="Main-Class" value="org.artisanlogiciel.games.Display"/>
-	      <attribute name="Class-Path" value="artgaphics-0.1.0.jar"/>
+	      <attribute name="Class-Path" value="${artgraphicslib}.jar"/>
             </manifest>
 	    <fileset dir="lang" includes="**" />
      </jar>