mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug 1048328 - Fix build.xml & debian scripts

This commit is contained in:
jean_lepropre 2004-10-24 09:31:54 +00:00
parent 6e594251ec
commit c7fc03b06c
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.xml
View File

@ -33,7 +33,7 @@
</copy>
</target>
<target name="copy-jar-files" depends="init">
<target name="copy-jar-files" depends="init" unless="nojars">
<mkdir dir="${freecol.build.dir}/jars"/>
<copy todir="${freecol.build.dir}/jars">
<fileset dir="${basedir}/jars">
@ -60,9 +60,12 @@
<antcall target="copy-sound-files"/>
</target>
<target name="build" depends="init,compile,copy-jar-files">
<target name="build" depends="init,compile">
<!-- Copy the data files unless the "nodata" property has been defined -->
<antcall target="copy-data-files"/>
<!-- Copy the jar files unless the "nojars" property has been defined -->
<antcall target="copy-jar-files"/>
<copy todir="${freecol.build.dir}">
<fileset dir="${freecol.src.dir}" includes="**/*.properties"

4
packaging/debian/freecol.sh
View File

@ -27,9 +27,9 @@ if [ "$JAVA_HOME" ] ; then
done
if [ "$FOUND" == "true" ]; then
$JAVACMD -jar /usr/share/java/freecol.jar "$@"
$JAVACMD -cp /usr/share/java/freecol.jar:/usr/share/java/higlayout.jar net.sf.freecol.FreeCol "$@"
else
$JAVACMD -jar /usr/share/java/freecol.jar "$@" --freecol-data /usr/share/freecol/data
$JAVACMD -cp /usr/share/java/freecol.jar:/usr/share/java/higlayout.jar net.sf.freecol.FreeCol "$@" --freecol-data /usr/share/freecol/data
fi
else

4
packaging/debian/rules
View File

@ -14,7 +14,7 @@ JAVA_HOME_DIRS := /usr/local/lib/jdk /usr/local/lib/j2sdk1.4.2 /usr/local/lib/j2
ANT_HOME := /usr/share/ant1.6
DEB_ANT_BUILD_TARGET := package javadoc
DEB_ANT_CLEAN_TARGET := clean
DEB_ANT_ARGS += -Dnodata=true
DEB_ANT_ARGS += -Dnodata=true -Dnojars=true
DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
SOFTWARE := freecol
@ -24,4 +24,6 @@ install/freecol::
install -m 644 FreeCol.jar debian/$(cdbs_curpkg)/usr/share/java/$(SOFTWARE)-$(VERSION).jar
ln -s $(SOFTWARE)-$(VERSION).jar debian/$(cdbs_curpkg)/usr/share/java/$(SOFTWARE).jar
install debian/$(SOFTWARE).sh debian/$(cdbs_curpkg)/usr/bin/$(SOFTWARE)
install -m 644 jars/higlayout.jar debian/$(cdbs_curpkg)/usr/share/java/higlayout-1.0.jar
ln -s higlayout-1.0.jar debian/$(cdbs_curpkg)/usr/share/java/higlayout.jar
cp -r data/ debian/$(cdbs_curpkg)/usr/share/freecol/