diff -up jmol-14.2.12_2015.01.22/build.xml.fedorabuild jmol-14.2.12_2015.01.22/build.xml
--- jmol-14.2.12_2015.01.22/build.xml.fedorabuild 2015-01-23 05:14:29.000000000 +0100
+++ jmol-14.2.12_2015.01.22/build.xml 2015-02-02 23:48:08.698051895 +0100
@@ -64,7 +64,7 @@ Bob Hanson hansonr@stolaf.edu 11/26/2013
<!-- pull developer-specific settings from their home directory -->
<property file="${user.home}/.jmol.build.properties" />
<!-- compile options -->
- <property name="build.sysclasspath" value="ignore" />
+ <property name="build.sysclasspath" value="last" />
<property name="build.compiler" value="javac1.6" />
<!-- for some reason, I can't get ant to use this ${java.version}
property as the value of the source parameter -->
@@ -97,13 +97,13 @@ Bob Hanson hansonr@stolaf.edu 11/26/2013
<echo message="version=${version}" />
<property name="jvxl_version" value="0.1" />
- <input message="private property file:" addproperty="Private.propertyFile" defaultValue="none" />
+ <!--<input message="private property file:" addproperty="Private.propertyFile" defaultValue="none" />-->
<if><available file="${Private.propertyFile}" /><then>
<property file="${Private.propertyFile}" />
<echo>using ${Private.keystore} ${Private.storetype}</echo>
</then></if>
<property name="tests.source.dir" value="source-tests" />
- <property name="lib.dir" value="jars" />
+ <property name="lib.dir" value="/usr/share/java" />
<property name="plugin.dir" value="plugin-jars" />
<property name="appjars.dir" value="build/appjars" />
<property name="classes.dir" value="build/classes" />
@@ -115,8 +115,8 @@ Bob Hanson hansonr@stolaf.edu 11/26/2013
<property name="jmol.applet.web.dir" value="appletweb" />
<property name="docbook-xsl" value="docbook-xsl-1.76.1" />
<property name="docbook-xml" value="docbook-xml-4.4" />
- <property name="naga.jar" value="naga-3_0.jar" />
- <property name="commons-cli.jar" value="commons-cli-1.2.jar" />
+ <property name="naga.jar" value="naga.jar" />
+ <property name="commons-cli.jar" value="commons-cli.jar" />
<property name="saxon.jar" value="saxon.jar" />
<property name="saxon.main" value="com.icl.saxon.StyleSheet" />
<property name="selfsign.store" value="ca-cert/selfSignedCertificate/selfSignedCertificate.store" />
@@ -436,7 +436,8 @@ all support for previous versions remove
<uptodate targetfile="${appjars.dir}">
<srcfiles dir="${lib.dir}" includes="${naga.jar}"/>
<srcfiles dir="${lib.dir}" includes="${commons-cli.jar}"/>
- <srcfiles dir="${lib.dir}" includes="JSpecView.jar"/>
+ <srcfiles dir="${lib.dir}" includes="jspecview.app.jar"/>
+ <srcfiles dir="${lib.dir}" includes="jspecview.applet.jar"/>
</uptodate>
<uptodate targetfile="build/libjars.timestamp"
srcfile="${appjars.dir}"/>
@@ -467,9 +468,9 @@ all support for previous versions remove
<!-- unjar dest="${appjars.dir}" src="${lib.dir}/${vecmath.jar}"/ -->
<!-- unjar dest="${appjars.dir}" src="${lib.dir}/Acme.jar"/ -->
<!-- unjar dest="${appjars.dir}" src="${lib.dir}/${itext.jar}"/ -->
- <unjar dest="${appjars.dir}" src="${lib.dir}/${naga.jar}"/>
- <unjar dest="${appjars.dir}" src="${lib.dir}/${commons-cli.jar}"/>
- <unjar dest="${appjars.dir}" src="${lib.dir}/JSpecView.jar"/>
+ <!-- <unjar dest="${appjars.dir}" src="${lib.dir}/${naga.jar}"/> -->
+ <!-- <unjar dest="${appjars.dir}" src="${lib.dir}/${commons-cli.jar}"/>
+ <unjar dest="${appjars.dir}" src="${lib.dir}/JSpecView.jar"/> -->
<delete dir="${appjars.dir}/javajs" />
<delete dir="${appjars.dir}/org/jmol" />
<delete dir="${appjars.dir}/META-INF" />
@@ -1226,7 +1227,8 @@ all support for previous versions remove
<include name="JmolLib.jar" />
</fileset>
<fileset dir="jars">
- <include name="JSpecView.jar" />
+ <include name="jspecview.app.jar" />
+ <include name="jspecview.applet.jar" />
</fileset>
<fileset dir=".">
<include name="jmol" />