diff -up jmol-14.0.3/build.xml.fedorabuild jmol-14.0.3/build.xml --- jmol-14.0.3/build.xml.fedorabuild 2013-12-30 03:27:17.000000000 +0200 +++ jmol-14.0.3/build.xml 2014-01-01 23:13:51.023979589 +0200 @@ -62,7 +62,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 --> @@ -95,13 +95,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" /> @@ -113,8 +113,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.0.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" /> @@ -438,7 +438,8 @@ all support for previous versions remove <!-- srcfiles dir="${lib.dir}" includes="Acme.jar"/ --> <!-- srcfiles dir="${lib.dir}" includes="${itext.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}"/> @@ -471,7 +472,8 @@ all support for previous versions remove <!-- 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}/${commons-cli.jar}"/> - <unjar dest="${appjars.dir}" src="${lib.dir}/JSpecView.jar"/> + <unjar dest="${appjars.dir}" src="${lib.dir}/jspecview.app.jar"/> + <unjar dest="${appjars.dir}" src="${lib.dir}/jspecview.applet.jar"/> <delete dir="${appjars.dir}/javajs" /> <delete dir="${appjars.dir}/org/jmol" /> <delete dir="${appjars.dir}/META-INF" /> @@ -1223,7 +1225,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" />