Merge branch 'pi' of 192.168.1.28:artisanlogiciel/code/laby

# Conflicts:
#	build.xml
#	mybuild.xml
This commit is contained in:
philippe lhardy
2020-10-15 17:33:19 +02:00
41 changed files with 2524 additions and 2300 deletions

View File

@@ -10,10 +10,10 @@
<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.2.0"/>
<property name="distversion" value="1.0"/>
<property name="distversion" value="1.1"/>
<target name="init">
<!-- Create the time stamp -->
<tstamp/>
@@ -26,6 +26,7 @@
<!-- Compile the java code from ${src} into ${build} -->
<javac srcdir="${src}" destdir="${build}" includeantruntime="false" classpath="libs/${artgraphicslib}.jar">
<exclude name="org/artisanlogiciel/games/javafx/*"/>
<compilerarg value="-Xlint:deprecation,unchecked" />
</javac>
</target>
@@ -37,8 +38,8 @@
<!-- 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="${artgraphicslib}.jar"/>
<attribute name="Main-Class" value="org.artisanlogiciel.games.maze.gui.Display"/>
<attribute name="Class-Path" value="libs/${artgraphicslib}.jar"/>
</manifest>
<fileset dir="lang" includes="**" />
</jar>
@@ -50,5 +51,4 @@
<delete dir="${build}"/>
<delete dir="${dist}"/>
</target>
</project>