--- build.xml.orig 2021-02-05 17:54:49.000000000 -0700
+++ build.xml 2021-02-22 17:21:35.360733827 -0700
@@ -60,10 +60,10 @@ when the Jmol code is modified, is as fo
<property file="${user.home}/.jmol.build.properties" />
<!-- compile options -->
<property name="build.sysclasspath" value="ignore" />
- <property name="build.compiler" value="javac1.7" />
+ <property name="build.compiler" value="javac10+" />
<!-- for some reason, I can't get ant to use this ${java.version}
property as the value of the source parameter -->
- <property name="java.version" value="1.7" />
+ <property name="java.version" value="11" />
<property name="debug" value="on" />
<property name="deprecation" value="off" />
<property name="optimization" value="off" />
@@ -92,7 +92,7 @@ when the Jmol code is modified, is as fo
<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>
@@ -112,7 +112,7 @@ when the Jmol code is modified, is as fo
<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="inchi.jar" value="jni-inchi-0.7-jar-with-dependencies.jar" />
+ <property name="inchi.jar" value="jni-inchi.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" />
@@ -150,7 +150,6 @@ when the Jmol code is modified, is as fo
<path id="apisio-project.class.path">
<fileset dir="${lib.dir}">
<!-- include name="${vecmath.jar}" / -->
- <include name="netscape.jar" />
<include name="gnujaxp.jar" />
</fileset>
</path>
@@ -447,7 +446,7 @@ Release Note: When releasing stable vers
<mkdir dir="${classes.dir}"/>
<javac srcdir="src" destdir="${classes.dir}" encoding="UTF8"
debug="${debug}" deprecation="${deprecation}"
- optimize="${optimization}" source="1.7" target="1.7">
+ optimize="${optimization}" source="11" target="11">
<classpath refid="project.class.path" />
<exclude name="astex/**/*.java"/>
<exclude name="java_cup/**/*.java"/>
@@ -486,7 +485,7 @@ Release Note: When releasing stable vers
</fileset>
</copy>
- <property name="build.compiler" value="javac1.7" />
+ <property name="build.compiler" value="javac1.10+" />
<!--
@@ -531,7 +530,7 @@ all support for previous versions remove
<javac srcdir="src" destdir="${applet.classes.dir}"
debug="${debug}" deprecation="${deprecation}"
optimize="${optimization}"
- source="1.7" target="1.7" encoding="UTF8"
+ source="11" target="11" encoding="UTF8"
includesfile="applet.classes"
classpathref="applet-project.class.path" />
@@ -558,7 +557,7 @@ all support for previous versions remove
<mkdir dir="${apisio.classes.dir}"/>
<javac srcdir="src" destdir="${apisio.classes.dir}"
debug="${debug}" deprecation="${deprecation}"
- optimize="${optimization}" source="1.7" encoding="UTF8"
+ optimize="${optimization}" source="11" target="11" encoding="UTF8"
includesfile="apisio.classes"
classpathref="apisio-project.class.path" />
<copy todir="${apisio.classes.dir}" >
@@ -630,14 +629,13 @@ 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}/${naga.jar}"/> -->
+ <!--<unjar dest="${appjars.dir}" src="${lib.dir}/${commons-cli.jar}"/> -->
<delete dir="${appjars.dir}/javajs" />
<delete dir="${appjars.dir}/org/jmol" />
<delete dir="${appjars.dir}/org/apache/tools" />
<delete dir="${appjars.dir}/META-INF" />
<unjar dest="${appjars.dir}" src="${lib.dir}/${inchi.jar}"/>
- <move file="${appjars.dir}/META-INF/LICENSE" tofile="${appjars.dir}/META-INF/LICENSE-JNI-INCHI"/>
<delete file="${appjars.dir}/META-INF/MANIFEST.MF" />
<touch file="build/libjars.timestamp"/>
</target>
@@ -690,10 +688,10 @@ all support for previous versions remove
</jar>
- <antcall target="sign-jar-file">
+ <!--<antcall target="sign-jar-file">
<param name="sign-jar-file-dir" value="build" />
<param name="sign-jar-file-name" value="Jmol.jar" />
- </antcall>
+ </antcall>-->
<echo message="Creating JmolData.jar -- if this fails, check to see that build/Jmol.jar is not open." />
<jar destfile="build/JmolData.jar"
@@ -730,10 +728,10 @@ all support for previous versions remove
</fileset>
<fileset dir="${appjars.dir}" includes="**/cli/** **/naga/**" />
</jar>
- <antcall target="sign-jar-file">
+ <!--<antcall target="sign-jar-file">
<param name="sign-jar-file-dir" value="build" />
<param name="sign-jar-file-name" value="JmolData.jar" />
- </antcall>
+ </antcall>-->
<copy todir="build">
<fileset dir=".">
@@ -761,10 +759,10 @@ all support for previous versions remove
</fileset>
<fileset dir="${appjars.dir}" includes="**/*"/>
</jar>
- <antcall target="sign-jar-file">
+ <!--<antcall target="sign-jar-file">
<param name="sign-jar-file-dir" value="build" />
<param name="sign-jar-file-name" value="Jvxl.jar" />
- </antcall>
+ </antcall>-->
<!--
<jar destfile="ChimeToJmol.jar"
manifest="manifest/chimetojmol.txt">
@@ -805,7 +803,7 @@ all support for previous versions remove
<target name="applet-jar" id="applet-jar"
depends="applet-classes">
- <if><equals arg1="${Private.propertyFile}" arg2="none" />
+ <if><equals arg1="${Private.propertyFile}" arg2="xxx" />
<then><echo>Skipping applet-jar</echo></then><else>
<delete dir="build">
@@ -813,7 +811,6 @@ all support for previous versions remove
</delete>
<echo message="Creating JmolApplet.jar" />
- <unjar dest="${applet.classes.dir}" src="${lib.dir}/netscape.jar"/>
<jar destfile="build/JmolApplet.jar"
manifest="manifest/appletMonolithic.txt" index="true" >
@@ -1078,7 +1075,7 @@ all support for previous versions remove
</target>
<target name="signed-applet" id="signed-applet" depends="applet-jar">
- <if><equals arg1="${Private.propertyFile}" arg2="none" />
+ <if><equals arg1="${Private.propertyFile}" arg2="xxx" />
<then><echo>Skipping applet jar signing</echo></then><else>
<delete dir="build">
@@ -1314,17 +1311,17 @@ all support for previous versions remove
</indexjars>
</jar>
- <echo> signing JmolApplet*.jar</echo>
+ <!--<echo> signing JmolApplet*.jar</echo>
<antcall target="sign-jar-file">
<param name="sign-jar-file-dir" value="build" />
<param name="sign-jar-file-name" value="JmolApplet*.jar" />
- </antcall>
+ </antcall>-->
</else></if>
</target>
<target name="smiles-applet-jar" id="smiles-applet-jar"
depends="applet-classes">
- <if><equals arg1="${Private.propertyFile}" arg2="none" />
+ <if><equals arg1="${Private.propertyFile}" arg2="xxx" />
<then><echo>Skipping smiles-applet-jar</echo></then><else>
<!-- JmolSmilesApplet.jar is skipped for now because it has no HTML5 equivalent
@@ -1568,13 +1565,6 @@ all support for previous versions remove
</fileset>
</copy>
- <copy todir="build/dist/jmolapisio-${version}/${lib.dir}" >
- <fileset dir="${lib.dir}">
- <!-- include name="${vecmath.jar}"/ -->
- <include name="netscape.jar"/>
- </fileset>
- </copy>
-
<tar tarfile="build/dist/jmolapisio-${version}.tar.gz"
compression="gzip" >
<tarfileset dir="build/dist"
@@ -1854,7 +1844,7 @@ all support for previous versions remove
<mkdir dir="${test-classes.dir}"/>
<javac srcdir="test" destdir="${test-classes.dir}"
debug="off" deprecation="on"
- optimize="off" source="1.7" encoding="UTF8">
+ optimize="off" source="11" target="11" encoding="UTF8">
<classpath>
<pathelement location="build/Jmol.jar" />
<pathelement location="./jars/junit.jar" />