git://source.jalview.org
/
jabaws.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4ad110e
)
JWS-114 Set JAVA_TARGET as a property and fixed the LIBRARY_PATH
author
Fábio Madeira
<fmmarquesmadeira@dundee.ac.uk>
Mon, 10 Apr 2017 11:29:14 +0000
(12:29 +0100)
committer
Fábio Madeira
<fmmarquesmadeira@dundee.ac.uk>
Tue, 11 Apr 2017 11:24:54 +0000
(12:24 +0100)
build.xml
patch
|
blob
|
history
diff --git
a/build.xml
b/build.xml
index
dd75c89
..
1458d21
100644
(file)
--- a/
build.xml
+++ b/
build.xml
@@
-2,7
+2,8
@@
<project default="build-all" name="Build Java Bioinformatics Analysis Web Services" basedir=".">
<project default="build-all" name="Build Java Bioinformatics Analysis Web Services" basedir=".">
- <property name="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx24-amd64"/>
+ <property name="LD_LIBRARY_PATH" value="/gridware/sge/lib/lx-amd64"/>
+ <property name="JAVA_TARGET" value="1.7"/>
<!-- Distributive file names-->
<property name="distdir" value="website/archive"/>
<!-- Distributive file names-->
<property name="distdir" value="website/archive"/>
@@
-120,27
+121,27
@@
<!-- copy files to class path-->
<copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
<!-- Complile the datamodel first -->
<!-- copy files to class path-->
<copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
<!-- Complile the datamodel first -->
- <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.8" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+ <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
</javac>
<!-- Complile the engines -->
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
</javac>
<!-- Complile the engines -->
- <javac srcdir="${basedir}/engine" destdir="${classes}" target="1.8" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+ <javac srcdir="${basedir}/engine" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
</javac>
<!-- Complile the runners -->
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
</javac>
<!-- Complile the runners -->
- <javac srcdir="${basedir}/runner" destdir="${classes}" target="1.8" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+ <javac srcdir="${basedir}/runner" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
</javac>
<!-- Complile the webservices -->
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
</javac>
<!-- Complile the webservices -->
- <javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.8" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+ <javac srcdir="${basedir}/webservices" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
</javac>
<!-- Complile the tests -->
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
</javac>
<!-- Complile the tests -->
- <javac srcdir="${basedir}/testsrc" destdir="${classes}" target="1.8" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
+ <javac srcdir="${basedir}/testsrc" destdir="${classes}" target="${JAVA_TARGET}" debug="on" encoding="UTF-8" verbose="false" nowarn="true" >
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
<classpath refid="test.classpath" />
<compilerarg value="-Xlint:unchecked"/>
<classpath refid="project.classpath" />
<classpath refid="test.classpath" />
@@
-162,23
+163,23
@@
<!-- copy files to class path-->
<copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
<!-- Complile the datamodel first -->
<!-- copy files to class path-->
<copy file="${basedir}/log/log4j.properties" tofile="${classes}/log4j.properties" />
<!-- Complile the datamodel first -->
- <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="1.8" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+ <javac srcdir="${basedir}/datamodel" destdir="${classes}" target="${JAVA_TARGET}" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
<compilerarg value="-Xlint:-unchecked" />
<classpath refid="project.classpath" />
</javac>
<!-- Complile the engines -->
<compilerarg value="-Xlint:-unchecked" />
<classpath refid="project.classpath" />
</javac>
<!-- Complile the engines -->
- <javac srcdir="${basedir}/engine" destdir="${classes}" target="1.8" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+ <javac srcdir="${basedir}/engine" destdir="${classes}" target="${JAVA_TARGET}" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
<compilerarg value="-Xlint:all" />
<compilerarg value="-Xlint:-unchecked" />
<classpath refid="project.classpath" />
</javac>
<!-- Complile the runners -->
<compilerarg value="-Xlint:all" />
<compilerarg value="-Xlint:-unchecked" />
<classpath refid="project.classpath" />
</javac>
<!-- Complile the runners -->
- <javac srcdir="${basedir}/runner" destdir="${classes}" target="1.8" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+ <javac srcdir="${basedir}/runner" destdir="${classes}" target="${JAVA_TARGET}" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
<compilerarg value="-Xlint:-unchecked" />
<classpath refid="project.classpath" />
</javac>
<!-- Complile the webservices -->
<compilerarg value="-Xlint:-unchecked" />
<classpath refid="project.classpath" />
</javac>
<!-- Complile the webservices -->
- <javac srcdir="${basedir}/webservices" destdir="${classes}" target="1.8" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
+ <javac srcdir="${basedir}/webservices" destdir="${classes}" target="${JAVA_TARGET}" debug="off" optimize="on" encoding="UTF-8" verbose="false" nowarn="true">
<compilerarg value="-Xlint:-unchecked" />
<classpath refid="project.classpath" />
</javac>
<compilerarg value="-Xlint:-unchecked" />
<classpath refid="project.classpath" />
</javac>