[med-svn] [beast2-mcmc] 05/08: Revert wrong change in build.xml (due to remaining quilt patches)

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository beast2-mcmc.

commit f283606eac8b89f2063f5bb283e544cd17125672
Author: Andreas Tille <tille at debian.org>
Date:   Wed May 4 11:14:46 2016 +0200

    Revert wrong change in build.xml (due to remaining quilt patches)
---
 build.xml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index ee3e7b9..ba0e4f1 100644
--- a/build.xml
+++ b/build.xml
@@ -8,24 +8,23 @@
     </description>
 
     <!-- set global properties for this build -->
-    <property name="src" location="src" />
-    <property name="build" location="build" />
-    <property name="lib" location="lib" />
-    <property name="deblib" location="/usr/share/java" />
-    <property name="doc" location="doc" />
-    <property name="dist" location="build/dist" />
-    <property name="test" location="test" />
+    <property name="src" location="../beast2/src" />
+    <property name="build" location="../beast2/build" />
+    <property name="lib" location="../beast2/lib" />
+    <property name="doc" location="../beast2/doc" />
+    <property name="dist" location="../beast2/build/dist" />
+    <property name="test" location="../beast2/test" />
 
     <property name="main_class_BEAST" value="beast.app.beastapp.BeastMain" />
     <property name="report" value="build/junitreport" />
 
     <path id="classpath">
-        <fileset dir="${deblib}" includes="beagle.jar"/>
-        <fileset dir="${deblib}" includes="jam.jar"/>
-        <fileset dir="${deblib}" includes="colt.jar"/>
-        <fileset dir="${deblib}" includes="fest-util.jar"/>
-        <fileset dir="${deblib}" includes="junit4.jar"/>
-        <fileset dir="${deblib}" includes="antlr4-runtime.jar"/>
+        <fileset dir="${lib}" includes="beagle.jar"/>
+        <fileset dir="${lib}" includes="jam.jar"/>
+        <fileset dir="${lib}" includes="colt.jar"/>
+        <fileset dir="${lib}" includes="fest.jar"/>
+        <fileset dir="${lib}" includes="junit-4.8.2.jar"/>
+        <fileset dir="${lib}" includes="antlr-runtime-4.5.jar"/>
     </path>
 
     <!--
@@ -162,7 +161,7 @@
         <mkdir dir="${release_dir}/package/lib" />
         <copy file="${dist}/beast.src.jar" todir="${release_dir}/package/"/>
         <copy file="${dist}/beast.jar" todir="${release_dir}/package/lib/"/>
-        <copy file="version.xml" todir="${release_dir}/package/"/>
+        <copy file="../beast2/version.xml" todir="${release_dir}/package/"/>
 
         <jar jarfile="${release_dir}/package/BEAST.addon.v${version}.zip">
             <fileset dir="${release_dir}/package">
@@ -469,6 +468,9 @@
         <echo message="cp BEAST.v${version}.tgz ~/tmp"/>
     </target>
 
+    <!-- Define the appbundler task -->
+    <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="../beast2/lib/bundler/appbundler-1.0.jar"/>
+
     <!--property name="AppleSigner" value="Developer ID Application: Alexei Drummond (6M6Y6L7RUP)" /-->
     <property name="AppleSigner" value="Developer ID Application: Remco Bouckaert (LHFJWE5U63)" />    
     

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/beast2-mcmc.git