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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
From: Jochen Sprickerhof <jspricke@debian.org>
Date: Thu, 24 May 2018 23:26:28 +0200
Subject: Adopt build.xml
---
build/build.properties | 3 ++-
build/build.xml | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/build/build.properties b/build/build.properties
index 94a54b1..55e067f 100644
--- a/build/build.properties
+++ b/build/build.properties
@@ -60,7 +60,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \
define.package = de.willuhn.jameica
project.nightly = releases/nightly
-project.release = releases/${system.version}
+project.release = releases
project.src = ${project.release}/src/classes
project.tmp = ${project.release}/tmp
project.javadoc = ${project.release}/javadoc
@@ -74,6 +74,7 @@ project.zipfilename.linuxarm64 = ${define.projectname}-linuxarm64-${system.ver
project.zipfilename.macos64 = ${define.projectname}-macos64-${system.version}.zip
project.zipfilename.macosaarch64 = ${define.projectname}-macos-aarch64-${system.version}.zip
+classpath.debian = jameica.jar ${define.commonlibs}
classpath.win64 = ${define.jarfilename} lib/swt/win64/swt.jar ${define.commonlibs}
classpath.linux64 = ${define.jarfilename} lib/swt/linux64/swt.jar ${define.commonlibs}
classpath.linuxarm64 = ${define.jarfilename} lib/swt/linux-arm64/swt.jar ${define.commonlibs}
diff --git a/build/build.xml b/build/build.xml
index 7be427f..f522c87 100755
--- a/build/build.xml
+++ b/build/build.xml
@@ -18,7 +18,7 @@
<echo message="JAVA : ${java.version}" />
<path id="compilepath">
- <fileset dir="lib">
+ <fileset dir="/usr/share/java">
<include name="**/*.jar" />
<!-- Datenbank-Treiber beim Compilieren nicht im Classpath verwenden -->
@@ -72,6 +72,8 @@
<attribute name="Built-Date" value="${DSTAMP}" />
<attribute name="Implementation-Title" value="${define.projectname}" />
<attribute name="Implementation-Version" value="${system.version}" />
+ <attribute name="Main-Class" value="de.willuhn.jameica.Main" />
+ <attribute name="Class-Path" value="${classpath.debian}" />
</manifest>
<fileset dir="${class.dir}" />
</jar>
@@ -393,7 +395,7 @@
</target>
- <target depends="zip,javadoc,src,sign,lib,clean" description="build an official release" name="all" />
+ <target depends="jar,javadoc" description="build an official release" name="all" />
<target depends="zip,lib,clean" description="build inofficial release" name="fast" />
<target depends="zip,javadoc,src" description="build nightly build" name="nightly">
|
