Commit 20bf3312 authored by Markus Koschany's avatar Markus Koschany

Imported Upstream version 0.10.7+dfsg

parent 5483cfee
......@@ -24,7 +24,7 @@
<property name="freecol.metaserver.jar.file" value="${basedir}/FreeCol-metaserver.jar"/>
<property name="freecol.overview.file" value="${freecol.src.dir}/overview.html"/>
<property name="test" value="AllTests"/>
<property name="miglayout.jar" value="jars/miglayout-3.7.3.1-swing.jar"/>
<property name="miglayout.jar" value="jars/miglayout-4.0-swing.jar"/>
<property name="cli.jar" value="jars/commons-cli-1.1.jar"/>
<property name="cortado.jar" value="jars/cortado-0.6.0.jar"/>
<!--
......@@ -46,12 +46,9 @@
<pathelement location="${basedir}/${cli.jar}"/>
<!-- Cortado Video Applet -->
<pathelement location="${basedir}/${cortado.jar}"/>
</path>
<path id="soundlibs.classpath">
<pathelement location="${basedir}/jars/jogg-0.0.7.jar"/>
<pathelement location="${basedir}/jars/jorbis-0.0.15.jar"/>
<pathelement location="${basedir}/jars/tritonus_share.jar"/>
<pathelement location="${basedir}/jars/vorbisspi1.0.3.jar"/>
<!-- JOgg/JOrbis libraries -->
<pathelement location="${basedir}/jars/jogg-0.0.7.jar"/>
<pathelement location="${basedir}/jars/jorbis-0.0.15.jar"/>
</path>
<path id="junit.classpath">
<pathelement location="${basedir}/test/lib/junit.jar" />
......@@ -67,7 +64,6 @@
<pathelement location="${freecol.build.dir}" />
<path refid="junit.classpath"/>
<path refid="libraries.classpath" />
<path refid="soundlibs.classpath" />
</path>
<condition property="isOsUnixLike">
......@@ -131,8 +127,8 @@
deprecation="off"
source="${java.target.version}"
target="${java.target.version}"
includeantruntime="false"
/>
includeantruntime="false">
</javac>
</target>
<target name="build" depends="init,compile" description="Compiles the source files.">
......@@ -141,18 +137,37 @@
</copy>
</target>
<target name="manifest" description="Creates the Manifest file.">
<target name="svnproperties" unless="svn.Revision"
description="Creates the svn properties file using svn">
<exec executable="svn" failifexecutionfails="false"
output="${basedir}/build/svn.properties">
<arg value="info"/>
<arg value="."/>
</exec>
<property prefix="svn" file="build/svn.properties"/>
</target>
<target name="gitproperties" unless="svn.Revision"
description="Creates the svn properties file using git">
<exec executable="git" failifexecutionfails="false"
output="${basedir}/build/svn.properties">
<arg value="svn"/>
<arg value="info"/>
<arg value="."/>
</exec>
<property prefix="svn" file="build/svn.properties"/>
</target>
<target name="manifest" depends="svnproperties,gitproperties"
description="Creates the Manifest file.">
<manifest file="${basedir}/src/MANIFEST.MF">
<attribute name="Created-By" value="FreeCol Team"/>
<attribute name="Main-Class" value="net.sf.freecol.FreeCol"/>
<attribute name="Class-Path" value="${stax.jar} ${woodstox.jar} jars/jogg-0.0.7.jar jars/jorbis-0.0.15.jar jars/tritonus_share.jar jars/vorbisspi1.0.3.jar ${miglayout.jar} ${cli.jar} ${cortado.jar}"/>
<attribute name="Revision" value="${svn.Revision}"/>
<attribute name="Product-Name" value="FreeCol"/>
<attribute name="Package-Title" value="FreeCol"/>
<attribute name="Package-Version" value="${svn.Revision}"/>
<attribute name="Package-Vendor" value="FreeCol Team"/>
</manifest>
</target>
......@@ -244,11 +259,13 @@
<fileset dir="${basedir}" includes="FreeCol.jar"/>
<fileset dir="${freecol.packaging.dir}/common" includes="COPYING"/>
<fileset dir="${freecol.packaging.dir}/common" includes="README"/>
<fileset dir="${freecol.packaging.dir}/common" includes="freecol"/>
<fileset dir="${freecol.packaging.dir}/common" includes="freecol.cmd"/>
<fileset dir="${freecol.packaging.dir}/common" includes="freecol.xpm"/>
<fileset dir="${basedir}" includes="data/**" excludes="**/.svn/**"/>
<fileset dir="${basedir}" includes="jars/**" excludes="**/.svn/**"/>
</copy>
<copy file="${freecol.packaging.dir}/common/freecol.sh"
tofile="${freecol.release.dir}/base/${freecol.name}/freecol"/>
</target>
<target name="prepareSourceFiles" depends="initDist">
......
No preview for this file type
No preview for this file type
This diff is collapsed.
This diff is collapsed.