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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
Author: Andreas Tille <tille@debian.org>
Description: Use Debian packaged itext.jar and jogl.jar
Forwarded: not-needed
--- a/king/build.xml
+++ b/king/build.xml
@@ -69,10 +69,6 @@
<ant antfile="../driftwood/build.xml" inheritAll="false" target="compile">
<!-- inherited properties go here -->
</ant>
- <copy file="../lib/pdfbox/pdfbox-2.0.19.jar" tofile="${basedir}/pdfbox.jar" failonerror="false"/>
- <copy file="../lib/pdfbox/fontbox-2.0.19.jar" tofile="${basedir}/fontbox.jar" failonerror="false"/>
- <copy file="../lib/pdfbox/pdfbox-graphics2d/target/graphics2d-0.26-SNAPSHOT.jar" tofile="${basedir}/pdfbox-graphics2d.jar" failonerror="false"/>
- <copy file="../lib/pdfbox/commons-logging-1.2/commons-logging-1.2.jar" tofile="${basedir}/commons-logging-1.2.jar" failonerror="false"/>
<mkdir dir="${build}"/>
<javac srcdir="${src}" destdir="${build}" debug="on" debuglevel="lines,source" target="1.8" source="1.8">
<include name="**/*.java"/>
@@ -82,10 +78,10 @@
<exclude name="**/dive/"/>
<classpath>
<pathelement location="../driftwood/build"/>
- <pathelement location="pdfbox.jar"/> <!-- Required for PDF export -->
- <pathelement location="fontbox.jar"/>
- <pathelement location="pdfbox-graphics2d.jar"/>
- <pathelement location="commons-logging-1.2.jar"/>
+ <pathelement location="/usr/share/java/pdfbox2.jar"/> <!-- Required for PDF export -->
+ <pathelement location="/usr/share/java/fontbox.jar"/>
+ <pathelement location="/usr/share/java/pdfbox-graphics2d.jar"/>
+ <pathelement location="/usr/share/java/commons-logging.jar"/>
</classpath>
</javac>
</target>
@@ -109,8 +105,8 @@
<classpath>
<pathelement location="${build}"/>
<pathelement location="../driftwood/build"/>
- <pathelement location="../lib/jogl2/jogl-all.jar"/>
- <pathelement location="../lib/jogl2/gluegen-rt.jar"/>
+ <pathelement location="/usr/share/java/jogl2.jar"/>
+ <pathelement location="/usr/share/java/gluegen2-rt.jar"/>
</classpath>
</javac>
</target>
@@ -134,13 +130,6 @@
<zipfileset dir="../molikin/dist/" includes="molikin/"/>
<zipfileset dir="../rdcvis/dist/" includes="rdcvis/"/>
<zipfileset dir="../lib/" prefix="lib/">
- <include name="pdfbox/*.jar"/>
- <include name="pdfbox/pdfbox-graphics2d/target/graphics2d-0.26-SNAPSHOT.jar"/>
- <include name="pdfbox/commons-logging-1.2/commons-logging-1.2.jar"/>
- <include name="jogl2/*.jar"/>
- <include name="win64/*.jar"/>
- <include name="macosx/*.jar"/>
- <include name="linux64/*.jar"/>
</zipfileset>
</zip>
<copy todir="plugins/" preservelastmodified="true" flatten="true">
--- a/chiropraxis/build.xml
+++ b/chiropraxis/build.xml
@@ -64,10 +64,10 @@
<classpath>
<pathelement location="../driftwood/build"/>
<pathelement location="../king/build"/>
- <pathelement location="pdfbox.jar"/> <!-- Required for PDF export -->
- <pathelement location="fontbox.jar"/>
- <pathelement location="pdfbox-graphics2d.jar"/>
- <pathelement location="commons-logging-1.2.jar"/>
+ <pathelement location="/usr/share/java/pdfbox2.jar"/> <!-- Required for PDF export -->
+ <pathelement location="/usr/share/java/fontbox.jar"/>
+ <pathelement location="/usr/share/java/pdfbox-graphics2d.jar"/>
+ <pathelement location="/usr/share/java/commons-logging-1.2.jar"/>
<pathelement location="../molikin/build"/>
</classpath>
</javac>
@@ -155,7 +155,7 @@
<!-- Deploys the executable on the local MolProbity - applies to IWD's machine only -->
<target name="deploy-local-mp" description="Deploy to local MolProbity" depends="build">
<copy file="${ant.project.name}.jar" todir="${user.home}/Sites/molprobity3/lib/" overwrite="true" failonerror="false"/>
- <copy file="itext.jar" todir="${user.home}/Sites/molprobity3/lib/" overwrite="true" failonerror="false"/>
+ <copy file="/usr/share/java/itext.jar" todir="${user.home}/Sites/molprobity3/lib/" overwrite="true" failonerror="false"/>
</target>
<!-- }}} -->
</project>
--- a/extratools/build.xml
+++ b/extratools/build.xml
@@ -55,8 +55,8 @@
<pathelement location="../driftwood/build"/>
<pathelement location="../chiropraxis/build"/>
<pathelement location="../king/build"/>
- <pathelement location="../lib/junit/junit-4.13-beta-1.jar"/>
- <pathelement location="../lib/junit/hamcrest-core-1.3.jar"/>
+ <pathelement location="/usr/share/java/junit4.jar"/>
+ <pathelement location="/usr/share/java/hamcrest-core.jar"/>
</classpath>
</javac>
</target>
|
