1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
|
From: Ole Streicher <olebole@debian.org>
Date: Thu, 2 Mar 2017 16:19:37 +0100
Subject: Use starlink-ttools.jar as main jar for STILTS,
and add topcat to the classpath
This creates a circular classpath reference in the manifest:
starlink-ttools.jar has starlink-topcat.jar
starlink-topcat.jar has starlink-tttools.jar
We will see how this works for topcat build ;-)
---
build.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/build.xml b/build.xml
index 1d15d35..d35a9e4 100644
--- a/build.xml
+++ b/build.xml
@@ -239,6 +239,7 @@
<pathelement location="${dist.lib.pkg}/starlink-registry.jar"/>
<pathelement location="${dist.lib.pkg}/starlink-vo.jar"/>
<pathelement location="${dist.lib.pkg}/starlink-task.jar"/>
+ <pathelement location="${dist.lib.pkg}/starlink-topcat.jar"/>
<pathelement location="${dist.lib.pkg}/starlink-dpac.jar"/>
<pathelement location="${dist.lib.pkg}/jel.jar"/>
<pathelement location="${dist.lib.pkg}/adql.jar"/>
@@ -622,6 +623,7 @@
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Class-Path" value="${jar.class.path}"/>
+ <attribute name="Main-Class" value="uk.ac.starlink.ttools.Stilts"/>
</manifest>
</jar>
|