From: <ha...@us...> - 2013-11-18 15:09:03
|
Revision: 18970 http://sourceforge.net/p/jmol/code/18970 Author: hansonr Date: 2013-11-18 15:08:59 +0000 (Mon, 18 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-18 15:00:27 UTC (rev 18969) +++ trunk/Jmol/build.xml 2013-11-18 15:08:59 UTC (rev 18970) @@ -1196,11 +1196,9 @@ </signjar> </else> </if> - <!-- - <echo> re-packaging appletweb/dist.zip with signed files</echo> - + <echo> re-packaging appletweb/dist.zip with signed files</echo> <delete dir="build/js" /> - <unzip dest="build/js" src="appletweb/jsmol.zip" /> + <unzip dest="build/js" src="appletfiles/jsmol_nojars.zip" /> <copy todir="build/js/jsmol/java" > <fileset dir="build"> <include name="JmolApplet*.jar" /> @@ -1209,10 +1207,8 @@ <include name="JSpecViewApplet*.jar" /> </fileset> </copy> - <zip zipfile="appletweb/jsmol-java.zip" basedir="build/js" + <zip zipfile="appletweb/jsmol.zip" basedir="build/js" includes="**/*" /> - - --> </target> <target name="smiles-applet-jar" id="smiles-applet-jar" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-22 14:07:09
|
Revision: 18996 http://sourceforge.net/p/jmol/code/18996 Author: hansonr Date: 2013-11-22 14:07:04 +0000 (Fri, 22 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-22 13:46:52 UTC (rev 18995) +++ trunk/Jmol/build.xml 2013-11-22 14:07:04 UTC (rev 18996) @@ -734,13 +734,13 @@ <include name="org/jmol/parallel/**" /> </fileset> </jar> - +<!-- <jar destfile="build/JmolApplet0_Spectrum.jar" manifest="manifest/applet.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/spectrum/**" /> </fileset> </jar> - +--> <jar destfile="build/JmolApplet0_Symmetry.jar" manifest="manifest/applet.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/symmetry/**" /> @@ -803,8 +803,9 @@ <pathelement path="build/JmolApplet0_ShapeSpecial.jar" /> <pathelement path="build/JmolApplet0_ShapeSurface.jar" /> <pathelement path="build/JmolApplet0_Smiles.jar" /> - +<!-- <pathelement path="build/JmolApplet0_Spectrum.jar" /> + --> <pathelement path="build/JmolApplet0_Symmetry.jar" /> <fileset dir="build" includes="JmolApplet0_i18n_*.jar" /> </indexjars> @@ -1014,13 +1015,15 @@ <include name="org/jmol/smiles/**" /> </fileset> </jar> - + +<!-- <jar destfile="build/JmolAppletSigned0_Spectrum.jar" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/spectrum/**" /> </fileset> </jar> - +--> + <jar destfile="build/JmolAppletSigned0_Symmetry.jar" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/symmetry/**" /> @@ -1079,7 +1082,9 @@ <pathelement path="build/JmolAppletSigned0_ShapeSpecial.jar" /> <pathelement path="build/JmolAppletSigned0_ShapeSurface.jar" /> <pathelement path="build/JmolAppletSigned0_Smiles.jar" /> + <!-- <pathelement path="build/JmolAppletSigned0_Spectrum.jar" /> + --> <pathelement path="build/JmolAppletSigned0_Symmetry.jar" /> <fileset dir="build" includes="JmolAppletSigned0_i18n_*.jar" /> </indexjars> @@ -1128,6 +1133,10 @@ <include name="org/jmol/util/Txt.class" /> </fileset> </jar> + <antcall target="sign-jar-file"> + <param name="sign-jar-file-dir" value="build" /> + <param name="sign-jar-file-name" value="JmolSmilesApplet.jar" /> + </antcall> </target> <!-- target name="dist" id="dist" @@ -1396,22 +1405,12 @@ <delete dir="${appjars.dir}"/> <delete dir="build/dist"/> <delete> - <fileset dir="."> - <include name="Jmol.jar" /> - <include name="JmolData.jar" /> - <include name="JmolSmiles.jar" /> - <include name="JmolApplet*.jar" /> - <include name="build/Jmol.jar" /> - <include name="build/JmolApplet*.jar" /> - <include name="build/JmolData.jar" /> - <include name="build/JmolSmiles.jar" /> + <fileset dir="build"> + <include name="*.jar" /> </fileset> </delete> </target> - <target name="xclean" id="xclean"> - </target> - <target name="spotless" id="spotless" depends="clean,spotless-i18n"> <delete dir="build"/> <delete dir="${javadoc.dir}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-22 14:47:34
|
Revision: 18997 http://sourceforge.net/p/jmol/code/18997 Author: hansonr Date: 2013-11-22 14:47:31 +0000 (Fri, 22 Nov 2013) Log Message: ----------- Developer note from Bob Hanson, 11/2013 The Jmol project uses resources from two other projects, JSmol and JSpecView. You can modify Jmol without those projects, but both of these projects share code from Jmol and, though separate projects, provide the files in Jmol for final distribution. Required checkouts include: svn+ssh://svn.code.sf.net/p/jsmol/code, Trunk:trunk svn+ssh://svn.code.sf.net/p/jspecview/svn:dev2/JSpecView svn+ssh://svn.code.sf.net/p/jspecview/svn:dev2/JSpecViewLib Relevant files created in this project by build scripts in those projects include: appletfiles/JSmol_nojars.zip appletfiles/JSpecViewApplet.jar appletfiles/JSpecViewAppletSigned.jar jars/JSpecView.jar Jmol/JSmol_nojars.zip is created using: JSmol/build_01_fromjmol.xml JSmol/build_02_fromjspecview.xml JSmol/build_03b_tojs.xml JSpecView*.jar files are created using JSpecviewLib/build.xml JSpecview/build.xml Note that if you modify Jmol source without also running the JSmol build scripts, particularly build_01_fromjmol.xml, then the HTML5 version of Jmol will not reflect your modifications. The overall sequence for full HTML5 code creation when the Jmol or JSpecView code is modified, is as follows: 1) Do all coding modifications in the Jmol and JSpecView projects. Never modify JSmol/src. 2) Build JSpecViewLib and JSpecView if there are changes there. The JSpecView*.jar files will be copied into this project. 3) Build JSmol using the build_01.., build_02.., build_03b.. JSmol_nojava.zip will be created and copied to this project. 4) Use this build.xml to create and trusted-sign all the jar files and create appletweb/jsmol.zip Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-22 14:07:04 UTC (rev 18996) +++ trunk/Jmol/build.xml 2013-11-22 14:47:31 UTC (rev 18997) @@ -2,6 +2,52 @@ <!-- DocumentId $Id$ --> +<!-- + +Developer note from Bob Hanson, 11/2013 + +The Jmol project uses resources from two other projects, JSmol and JSpecView. +You can modify Jmol without those projects, but both of these projects share code +from Jmol and, though separate projects, provide the files in Jmol for final distribution. + +Required checkouts include: + +svn+ssh://svn.code.sf.net/p/jsmol/code, Trunk:trunk +svn+ssh://svn.code.sf.net/p/jspecview/svn:dev2/JSpecView +svn+ssh://svn.code.sf.net/p/jspecview/svn:dev2/JSpecViewLib + +Relevant files created in this project by build scripts in those projects include: + + appletfiles/JSmol_nojars.zip + appletfiles/JSpecViewApplet.jar + appletfiles/JSpecViewAppletSigned.jar + jars/JSpecView.jar + +Jmol/JSmol_nojars.zip is created using: + + JSmol/build_01_fromjmol.xml + JSmol/build_02_fromjspecview.xml + JSmol/build_03b_tojs.xml + +JSpecView*.jar files are created using + + JSpecviewLib/build.xml + JSpecview/build.xml + +Note that if you modify Jmol source without also running the JSmol build scripts, particularly +build_01_fromjmol.xml, then the HTML5 version of Jmol will not reflect your modifications. + +The overall sequence for full HTML5 code creation +when the Jmol or JSpecView code is modified, is as follows: + +1) Do all coding modifications in the Jmol and JSpecView projects. Never modify JSmol/src. +2) Build JSpecViewLib and JSpecView if there are changes there. + The JSpecView*.jar files will be copied into this project. +3) Build JSmol using the build_01.., build_02.., build_03b.. + JSmol_nojava.zip will be created and copied to this project. +4) Use this build.xml to create and trusted-sign all the jar files and create appletweb/jsmol.zip + + --> <!-- Contributions --> <!-- <for list ...> construct needs ant-contrib.jar --> @@ -1099,10 +1145,28 @@ <param name="sign-jar-file-name" value="JSpecViewApplet*.jar" /> </antcall> + <echo> re-packaging appletweb/dist.zip with signed files</echo> + <delete dir="build/js" /> + <unzip dest="build/js" src="appletfiles/jsmol_nojars.zip" /> + <copy todir="build/js/jsmol/java" > + <fileset dir="build"> + <include name="JmolApplet*.jar" /> + </fileset> + <fileset dir="appletfiles"> + <include name="JSpecViewApplet*.jar" /> + </fileset> + </copy> + <zip zipfile="appletweb/jsmol.zip" basedir="build/js" + includes="**/*" /> + + </target> <target name="smiles-applet-jar" id="smiles-applet-jar" depends="applet-classes"> + + <!-- JmolSmilesApplet.jar is skipped for now because it has no HTML5 equivalent + <echo message="Creating JmolSmilesApplet.jar" /> <jar destfile="build/JmolSmilesApplet.jar" manifest="manifest/appletSmiles.txt" index="true" > @@ -1137,7 +1201,10 @@ <param name="sign-jar-file-dir" value="build" /> <param name="sign-jar-file-name" value="JmolSmilesApplet.jar" /> </antcall> + + --> </target> + <!-- target name="dist" id="dist" depends="main-i18n,main,signed-applet" @@ -1147,21 +1214,7 @@ depends="doc,main-i18n,main,signed-applet"> - <echo> re-packaging appletweb/dist.zip with signed files</echo> - <delete dir="build/js" /> - <unzip dest="build/js" src="appletfiles/jsmol_nojars.zip" /> - <copy todir="build/js/jsmol/java" > - <fileset dir="build"> - <include name="JmolApplet*.jar" /> - </fileset> - <fileset dir="appletfiles"> - <include name="JSpecViewApplet*.jar" /> - </fileset> - </copy> - <zip zipfile="appletweb/jsmol.zip" basedir="build/js" - includes="**/*" /> - <!-- first build binary distribution --> <delete dir="build/dist/jmol-${version}"/> <mkdir dir="build/dist/jmol-${version}"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-22 18:52:57
|
Revision: 19000 http://sourceforge.net/p/jmol/code/19000 Author: hansonr Date: 2013-11-22 18:52:54 +0000 (Fri, 22 Nov 2013) Log Message: ----------- prevents main from running twice; but only by removing dist dependencies. Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-22 18:52:05 UTC (rev 18999) +++ trunk/Jmol/build.xml 2013-11-22 18:52:54 UTC (rev 19000) @@ -1211,8 +1211,14 @@ Bob's computer chokes on doc --> <target name="dist" id="dist" - depends="doc,main-i18n,main,signed-applet"> + depends="doc"> + <!-- + + Bob had problems with Eclipse Juno repeating the entire + signing process twice here and crashing (io error in jarsigner) + close to the end of the second round. --> + <!-- first build binary distribution --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-22 19:12:44
|
Revision: 19001 http://sourceforge.net/p/jmol/code/19001 Author: hansonr Date: 2013-11-22 19:12:34 +0000 (Fri, 22 Nov 2013) Log Message: ----------- adds Private.storetype Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-22 18:52:54 UTC (rev 19000) +++ trunk/Jmol/build.xml 2013-11-22 19:12:34 UTC (rev 19001) @@ -96,7 +96,7 @@ <input message="private property file:" addproperty="Private.propertyFile" defaultValue="none" /> <if><available file="${Private.propertyFile}" /><then> <property file="${Private.propertyFile}" /> - <echo>using ${Private.propertyFile} ${Private.keystore}</echo> + <echo>using ${Private.propertyFile} ${Private.keystore} ${Private.storetype}</echo> </then></if> <property name="tests.source.dir" value="source-tests" /> <property name="lib.dir" value="jars" /> @@ -1694,6 +1694,7 @@ <if><available file="${Private.propertyFile}" /><then> <echo>using keystore="${Private.keystore}" alias="${Private.alias}"</echo> <signjar keystore="${Private.keystore}" + storetype="${Private.storetype}" storepass="${Private.storepass}" keypass="${Private.keypass}" alias="${Private.alias}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-24 03:51:37
|
Revision: 19007 http://sourceforge.net/p/jmol/code/19007 Author: hansonr Date: 2013-11-24 03:51:35 +0000 (Sun, 24 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-24 03:51:00 UTC (rev 19006) +++ trunk/Jmol/build.xml 2013-11-24 03:51:35 UTC (rev 19007) @@ -116,7 +116,8 @@ <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" /> - <property name="selfsign.pass" value="selfSignedCertificate" /> + <property name="selfsign.storetype" value="jks" /> + <property name="selfsign.storepass" value="selfSignedCertificate" /> <property name="selfsign.alias" value="selfSignedCertificate" /> @@ -1716,7 +1717,8 @@ </then></elseif><else> <echo>using self-signed certificate</echo> <signjar keystore="${selfsign.store}" - storepass="${selfsign.pass}" + storepass="${selfsign.storepass}" + type="${selfsign.storetype}" alias="${selfsign.alias}"> <fileset dir="${sign-jar-file-dir}" > <include name="${sign-jar-file-name}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-24 17:21:05
|
Revision: 19008 http://sourceforge.net/p/jmol/code/19008 Author: hansonr Date: 2013-11-24 17:21:01 +0000 (Sun, 24 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-24 03:51:35 UTC (rev 19007) +++ trunk/Jmol/build.xml 2013-11-24 17:21:01 UTC (rev 19008) @@ -1718,7 +1718,6 @@ <echo>using self-signed certificate</echo> <signjar keystore="${selfsign.store}" storepass="${selfsign.storepass}" - type="${selfsign.storetype}" alias="${selfsign.alias}"> <fileset dir="${sign-jar-file-dir}" > <include name="${sign-jar-file-name}" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-24 17:26:15
|
Revision: 19009 http://sourceforge.net/p/jmol/code/19009 Author: hansonr Date: 2013-11-24 17:26:12 +0000 (Sun, 24 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-24 17:21:01 UTC (rev 19008) +++ trunk/Jmol/build.xml 2013-11-24 17:26:12 UTC (rev 19009) @@ -1717,6 +1717,7 @@ </then></elseif><else> <echo>using self-signed certificate</echo> <signjar keystore="${selfsign.store}" + storetype="${selfsign.storetype}" storepass="${selfsign.storepass}" alias="${selfsign.alias}"> <fileset dir="${sign-jar-file-dir}" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-25 00:02:53
|
Revision: 19013 http://sourceforge.net/p/jmol/code/19013 Author: hansonr Date: 2013-11-25 00:02:50 +0000 (Mon, 25 Nov 2013) Log Message: ----------- Java 1.6 Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-24 23:59:25 UTC (rev 19012) +++ trunk/Jmol/build.xml 2013-11-25 00:02:50 UTC (rev 19013) @@ -61,10 +61,10 @@ <property file="${user.home}/.jmol.build.properties" /> <!-- compile options --> <property name="build.sysclasspath" value="ignore" /> - <property name="build.compiler" value="javac1.5" /> + <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 --> - <property name="java.version" value="1.5" /> + <property name="java.version" value="1.6" /> <property name="debug" value="off" /> <property name="deprecation" value="off" /> <property name="optimization" value="off" /> @@ -276,7 +276,7 @@ <mkdir dir="${classes.dir}"/> <javac srcdir="src" destdir="${classes.dir}" encoding="UTF8" debug="${debug}" deprecation="${deprecation}" - optimize="${optimization}" source="1.5" target="1.5"> + optimize="${optimization}" source="1.6" target="1.6"> <classpath refid="project.class.path" /> <!-- removed all CDK based code, use BioClipse instead --> <exclude name="org/openscience/jmol/app/JmolEditBus.java"/> @@ -318,8 +318,13 @@ </fileset> </copy> - <property name="build.compiler" value="javac1.5" /> - <!-- mth 20040713 ... with the Sun Java 1.5 compiler the default + <property name="build.compiler" value="javac1.6" /> + + <!-- + +bh 20131124 changed to 1.6, 1.6 + +mth 20040713 ... with the Sun Java 1.5 compiler the default source code version is 1.5. And one cannot generate code for a 1.1 virtual machine from 1.5 source. Therefore, in order to compile for the 1.1 jvm, we need to specify that the source @@ -357,7 +362,7 @@ <javac srcdir="src" destdir="${applet.classes.dir}" debug="${debug}" deprecation="${deprecation}" optimize="${optimization}" - source="1.5" target="1.5" encoding="UTF8" + source="1.6" target="1.6" encoding="UTF8" includesfile="applet.classes" classpathref="applet-project.class.path" /> @@ -387,7 +392,7 @@ <mkdir dir="${apisio.classes.dir}"/> <javac srcdir="src" destdir="${apisio.classes.dir}" debug="${debug}" deprecation="${deprecation}" - optimize="${optimization}" source="1.5" encoding="UTF8" + optimize="${optimization}" source="1.6" encoding="UTF8" includesfile="apisio.classes" classpathref="apisio-project.class.path" /> <copy todir="${apisio.classes.dir}" > @@ -1518,7 +1523,7 @@ excludepackagenames="org.jmol.jcamp.*"> <classpath refid="project.class.path" /> <link href="http://download.oracle.com/javase/6/docs/api/" /> - <link href="http://download.java.net/media/java3d/javadoc/1.5.0/" /> + <link href="http://download.java.net/media/java3d/javadoc/1.6.0/" /> <tag name="j2sIgnore" enabled="false" /> <tag name="j2sIgnoreSuperConstructor" enabled="false" /> <tag name="j2sOverride" enabled="false" /> @@ -1678,7 +1683,7 @@ <mkdir dir="${test-classes.dir}"/> <javac srcdir="test" destdir="${test-classes.dir}" debug="off" deprecation="on" - optimize="off" source="1.5" encoding="UTF8"> + optimize="off" source="1.6" encoding="UTF8"> <classpath> <pathelement location="build/Jmol.jar" /> <pathelement location="./jars/junit.jar" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-26 03:54:20
|
Revision: 19023 http://sourceforge.net/p/jmol/code/19023 Author: hansonr Date: 2013-11-26 03:54:17 +0000 (Tue, 26 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-26 03:53:58 UTC (rev 19022) +++ trunk/Jmol/build.xml 2013-11-26 03:54:17 UTC (rev 19023) @@ -44,9 +44,10 @@ 2) Build JSpecViewLib and JSpecView if there are changes there. The JSpecView*.jar files will be copied into this project. 3) Build JSmol using the build_01.., build_02.., build_03b.. - JSmol_nojava.zip will be created and copied to this project. -4) Use this build.xml to create and trusted-sign all the jar files and create appletweb/jsmol.zip + JSmol_nojars.zip will be created and copied to this project. +4) Use buildjsmolzip.xml to create appletweb/jsmol.zip from JSmol_nojars.zip +Note that I have had trouble with signjar ramdomly stopping. --> <!-- Contributions --> @@ -1148,21 +1149,6 @@ <param name="sign-jar-file-name" value="JmolApplet*.jar" /> </antcall> - <echo> re-packaging appletweb/jsmol.zip with signed files</echo> - <delete dir="build/js" /> - <unzip dest="build/js" src="appletfiles/jsmol_nojars.zip" /> - <copy todir="build/js/jsmol/java" > - <fileset dir="build"> - <include name="JmolApplet*.jar" /> - </fileset> - <fileset dir="appletfiles"> - <include name="JSpecViewApplet*.jar" /> - </fileset> - </copy> - <zip zipfile="appletweb/jsmol.zip" basedir="build/js" - includes="**/*" /> - - </target> <target name="smiles-applet-jar" id="smiles-applet-jar" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2014-04-01 19:56:34
|
Revision: 19569 http://sourceforge.net/p/jmol/code/19569 Author: hansonr Date: 2014-04-01 19:56:30 +0000 (Tue, 01 Apr 2014) Log Message: ----------- missing export directory in JmolAppletSigned0.jar Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2014-04-01 19:56:24 UTC (rev 19568) +++ trunk/Jmol/build.xml 2014-04-01 19:56:30 UTC (rev 19569) @@ -121,8 +121,9 @@ <property name="selfsign.storetype" value="jks" /> <property name="selfsign.storepass" value="selfSignedCertificate" /> <property name="selfsign.alias" value="selfSignedCertificate" /> - <property name="tsa.url" value="http://timestamp.globalsign.com/scripts/timestamp.dll" /> - <!-- was http://tsa.starfieldtech.com/, which stopped working 3/27/14 --> + <property name="tsa.url" value="http://tsa.starfieldtech.com/" /> + + <!-- http://timestamp.globalsign.com/scripts/timestamp.dll or http://tsa.starfieldtech.com/, which stopped working 3/27/14 --> <!-- you can set this by defining it in ~/.jmol.build.properties --> @@ -1103,6 +1104,7 @@ <include name="org/jmol/awt/**" /> <include name="org/jmol/bspt/**" /> <include name="org/jmol/c/**" /> + <include name="org/jmol/export/**" /> <include name="org/jmol/g3d/**" /> <include name="org/jmol/geodesic/**" /> <include name="org/jmol/i18n/**" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2014-04-09 12:11:18
|
Revision: 19624 http://sourceforge.net/p/jmol/code/19624 Author: hansonr Date: 2014-04-09 12:11:12 +0000 (Wed, 09 Apr 2014) Log Message: ----------- replacement Time Stamp Authority; replacing http://tsa.starfieldtech.com with http://timestamp.globalsign.com/scripts/timestamp.dll Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2014-04-09 02:35:31 UTC (rev 19623) +++ trunk/Jmol/build.xml 2014-04-09 12:11:12 UTC (rev 19624) @@ -45,8 +45,10 @@ jsmol.zip will be created and copied to appletweb/. Note that I have had trouble with signjar ramdomly stopping with an IOException. -I just do it a second time, and it works. +I just do it a second time, and it works. +[This tracked down to http://tsa.starfieldtech.com on Apr 9, 2014] + Bob Hanson ha...@st... 11/26/2013 --> @@ -121,9 +123,9 @@ <property name="selfsign.storetype" value="jks" /> <property name="selfsign.storepass" value="selfSignedCertificate" /> <property name="selfsign.alias" value="selfSignedCertificate" /> - <property name="tsa.url" value="http://tsa.starfieldtech.com/" /> + <property name="tsa.url" value="http://timestamp.globalsign.com/scripts/timestamp.dll" /> - <!-- http://timestamp.globalsign.com/scripts/timestamp.dll or http://tsa.starfieldtech.com/, which stopped working 3/27/14 --> + <!-- http://timestamp.globalsign.com/scripts/timestamp.dll or http://tsa.starfieldtech.com/, which stopped working 3/27/14 and again on 4/8/14 --> <!-- you can set this by defining it in ~/.jmol.build.properties --> @@ -1692,7 +1694,7 @@ <!-- tools --> <target name="sign-jar-file" > <if><available file="${Private.propertyFile}" /><then> - <echo>using keystore="${Private.keystore}" alias="${Private.alias}"</echo> + <echo>using keystore="${Private.keystore}" alias="${Private.alias} tsa=${tsa.url}"</echo> <signjar keystore="${Private.keystore}" storetype="${Private.storetype}" storepass="${Private.storepass}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2014-04-15 00:38:43
|
Revision: 19646 http://sourceforge.net/p/jmol/code/19646 Author: hansonr Date: 2014-04-15 00:38:39 +0000 (Tue, 15 Apr 2014) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2014-04-14 23:44:58 UTC (rev 19645) +++ trunk/Jmol/build.xml 2014-04-15 00:38:39 UTC (rev 19646) @@ -116,7 +116,7 @@ <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="commons-cli.jar" value="commons-cli-1.2.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" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2014-09-06 21:47:22
|
Revision: 19981 http://sourceforge.net/p/jmol/code/19981 Author: hansonr Date: 2014-09-06 21:47:19 +0000 (Sat, 06 Sep 2014) Log Message: ----------- ___Jmol... ==> Jmol.___Jmol... Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2014-09-06 21:45:41 UTC (rev 19980) +++ trunk/Jmol/build.xml 2014-09-06 21:47:19 UTC (rev 19981) @@ -81,12 +81,12 @@ <comment value="#" /> </striplinecomments> <linecontains> - <contains value="___" /> + <contains value="Jmol.___" /> </linecontains> </filterchain> </copy> <property file="Jmol.properties" prefix="Jmol.properties" /> - <property name="version" value="${Jmol.properties.___JmolVersion}" /> + <property name="version" value="${Jmol.properties.Jmol.___JmolVersion}" /> <propertyregex property="version" override = "true" input="${version}" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2023-11-06 18:33:11
|
Revision: 22580 http://sourceforge.net/p/jmol/code/22580 Author: hansonr Date: 2023-11-06 18:33:09 +0000 (Mon, 06 Nov 2023) Log Message: ----------- Jmol.___JmolVersion="16.1.45" // (legacy) also 16.1.46 (swingJS) bug fix: GaussianReader misreading high-level spherical MO data (9G, 11H, 13I) new feature: x = spacegroup("ITA/155.1") - provides detailed information about general positions, generators, and Wyckoff positions for all space groups and their additional ITA settings as found using https://www.cryst.ehu.es/cgi-bin/cryst/programs/nph-getgen - retrieves the first JSON structure in org/jmol/symmetry/sg/json/ita_155.json new feature: LOAD =aflowpro/155.2 - loads the second AFLOW prototype in spacegroup 155 at https://www.aflowlib.org/prototype-encyclopedia - full listing of thes AFLOW codes codes employed is in - https://github.com/BobHanson/Jmol-SwingJS/tree/master/src/org/jmol/symmetry/sg/json/aflow_structures.json new feature: UNITCELL RHOMBOHEDRAL and UNITCELL TRIGONAL (or HEXAGONAL - same) - allows switching back and forth between rhombohedral and hexagonal unit cells. - does not change the space group (assumes currently rhombohedral if trigonal or hexangonal is chosen and vice versa) - does not check to see that this is reasonable - applies for rhombohedral: UNITCELL "2/3a+1/3b+1/3c,-1/3a+1/3b+1/3c,-1/3a-2/3b+1/3c" - applies for trigonal: UNITCELL "a-b,b-c,a+b+c" new feature: MODELKIT ADD <elem> WYCKOFF <Aa-z> - adds an atom in a representative position for the given Wyckoff position. - generates all symmetry-equivalent atoms. - for example: modelkit add C wyckoff d - the "seed" position is at the relatively arbitrary position of (2.3/5, 2.3/7, 2.3/9). - this point is projected onto the specified Wyckoff position element (point, line, or plane). - after generation, this point can be moved within the confines of the Wyckoff position constraint using SET PICKING DRAGATOM Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2023-11-06 17:48:32 UTC (rev 22579) +++ trunk/Jmol/build.xml 2023-11-06 18:33:09 UTC (rev 22580) @@ -460,6 +460,7 @@ --> <include name="**/Data/*" /> <include name="**/*.txt" /> + <include name="**/*.json" /> </fileset> </copy> <copy file="Jmol.properties" tofile="${classes.dir}/org/jmol/viewer/Jmol.properties" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2008-09-22 10:29:21
|
Revision: 9919 http://jmol.svn.sourceforge.net/jmol/?rev=9919&view=rev Author: hansonr Date: 2008-09-22 10:29:19 +0000 (Mon, 22 Sep 2008) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2008-09-22 04:11:38 UTC (rev 9918) +++ trunk/Jmol/build.xml 2008-09-22 10:29:19 UTC (rev 9919) @@ -11,7 +11,7 @@ <!-- 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.4" /> - <property name="debug" value="on" /> + <property name="debug" value="off" /> <property name="deprecation" value="off" /> <property name="optimization" value="off" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-06-27 23:47:09
|
Revision: 11139 http://jmol.svn.sourceforge.net/jmol/?rev=11139&view=rev Author: hansonr Date: 2009-06-27 23:47:07 +0000 (Sat, 27 Jun 2009) Log Message: ----------- adds JmolFrameless.jar Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2009-06-27 23:46:16 UTC (rev 11138) +++ trunk/Jmol/build.xml 2009-06-27 23:47:07 UTC (rev 11139) @@ -391,6 +391,27 @@ keystore="selfSignedCertificate/selfSignedCertificate.store" storepass="selfSignedCertificate" alias="selfSignedCertificate" /> <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar --> + <delete file="${jmol.build.dir}/JmolUnsigned.jar"/> + <jar destfile="${jmol.build.dir}/JmolUnsignedF.jar" + manifest="manifest/applicationFrameless.txt"> + <fileset dir="${classes.dir}" > + <exclude name="**/.*" /> + <exclude name="**/*.dx" /> + <exclude name="**/Test*.class" /> + <exclude name="**/jmol/applet/*" /> + <include name="**/jmol/**" /> + <include name="com/**" /> + <include name="freeware/**" /> + </fileset> + <fileset dir="${appjars.dir}" includes="**/*"/> + <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/> + </jar> + <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar" + signedjar="${jmol.build.dir}/JmolFrameless.jar" + keystore="selfSignedCertificate/selfSignedCertificate.store" + storepass="selfSignedCertificate" alias="selfSignedCertificate" /> + <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar --> + <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/> <copy todir="${jmol.build.dir}"> <fileset dir="."> <include name="jmol" /> @@ -398,7 +419,6 @@ <include name="jmol.sh" /> </fileset> </copy> - <delete file="${jmol.build.dir}/JmolUnsigned.jar"/> <jar destfile="${jmol.build.dir}/JvxlUnsigned.jar" manifest="manifest/jvxl.txt"> @@ -1018,9 +1038,11 @@ <delete> <fileset dir="."> <include name="Jmol.jar" /> + <include name="JmolFrameless.jar" /> <include name="JmolApplet*.jar" /> <include name="${jmol.build.dir}/Jmol.jar" /> <include name="${jmol.applet.build.dir}/JmolApplet*.jar" /> + <include name="${jmol.build.dir}/JmolFrameless.jar" /> </fileset> </delete> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-11-30 01:42:15
|
Revision: 11812 http://jmol.svn.sourceforge.net/jmol/?rev=11812&view=rev Author: hansonr Date: 2009-11-30 01:42:07 +0000 (Mon, 30 Nov 2009) Log Message: ----------- version=11.9.10_dev SparshUI multitouch (simulated) # new feature: app command parameter [-M or --multitouch] "sparshui" or "sparshui-simulated" # applet jmolSetCallback("multiTouchSparshUI", "true") # applet jmolSetCallback("multiTouchSparshUI-simulated", "true") # with those variables set, Jmol will load the multitouch package and start # an integrated SparshUI server (if none is already started). In addition, # with the -simulated flag, Jmol simulates multitouch using CTRL-LEFT drag (twice) # This incorporation of SparshUI also demonstrates the on-the-fly loading # of a client gesture into the SparshUI system using an extension of the # SparshUI protocol that allows delivery of a class name rather than a SparshUI # gesture ordinal. # # code: ActionManagerMT - for multitouch # code: preliminary org.jmol.multitouch package # code: preliminary com.sparshui package (I've been assured this is LGPL # despite the GPL license in the direcory) Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2009-11-29 23:07:03 UTC (rev 11811) +++ trunk/Jmol/build.xml 2009-11-30 01:42:07 UTC (rev 11812) @@ -549,6 +549,8 @@ <fileset dir="${applet.classes.dir}" > <include name="**/*" /> <exclude name="org/jmol/export/**/*" /> + <exclude name="org/jmol/multitouch/**/*" /> + <exclude name="com/sparshui/**/*" /> </fileset> <fileset dir="${appletjars.dir}" includes="**/*"/> </jar> @@ -673,7 +675,7 @@ <!-- changes to this must be replicated below for the signed applet --> <indexjars> - <!-- no export here - this is the unsigned applet --> + <!-- no export or multitouch here - this is the unsigned applet --> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Console.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" /> @@ -719,6 +721,20 @@ keystore="selfSignedCertificate/selfSignedCertificate.store" storepass="selfSignedCertificate" alias="selfSignedCertificate" /> + <jar destfile="${jmol.applet.build.dir}/JmolApplet_MultiTouch.jar.temp" + manifest="manifest/appletMonolithic.txt" index="true" > + <fileset dir="${applet.classes.dir}" > + <include name="org/jmol/multitouch/**" /> + <include name="com/sparshui/**" /> + </fileset> + <fileset dir="${appletjars.dir}" includes="**/*"/> + </jar> + <signjar jar="${jmol.applet.build.dir}/JmolApplet_MultiTouch.jar.temp" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_MultiTouch.jar" + keystore="selfSignedCertificate/selfSignedCertificate.store" + storepass="selfSignedCertificate" alias="selfSignedCertificate" /> + <delete file="${jmol.applet.build.dir}/JmolApplet_MultiTouch.jar.temp" /> + <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Popup.jar" keystore="selfSignedCertificate/selfSignedCertificate.store" @@ -818,6 +834,7 @@ <indexjars> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Minimize.jar" /> + <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_MultiTouch.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Popup.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Quantum.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersCifPdb.jar" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-10 20:55:45
|
Revision: 12592 http://jmol.svn.sourceforge.net/jmol/?rev=12592&view=rev Author: hansonr Date: 2010-03-10 20:55:06 +0000 (Wed, 10 Mar 2010) Log Message: ----------- Xtal readers missing from signedApplet0 set Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-03-10 19:55:51 UTC (rev 12591) +++ trunk/Jmol/build.xml 2010-03-10 20:55:06 UTC (rev 12592) @@ -870,6 +870,7 @@ <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMore.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersQuantum.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXml.jar" /> + <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXtal.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeBio.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSpecial.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-03-10 20:58:38
|
Revision: 12593 http://jmol.svn.sourceforge.net/jmol/?rev=12593&view=rev Author: hansonr Date: 2010-03-10 20:58:30 +0000 (Wed, 10 Mar 2010) Log Message: ----------- Simple readers missing from signedApplet0 set Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-03-10 20:55:06 UTC (rev 12592) +++ trunk/Jmol/build.xml 2010-03-10 20:58:30 UTC (rev 12593) @@ -704,8 +704,8 @@ <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersMore.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersQuantum.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersSimple.jar" /> + <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersXtal.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeBio.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" /> @@ -869,6 +869,7 @@ <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMolXyz.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMore.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersQuantum.jar" /> + <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersSimple.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXml.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXtal.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeBio.jar" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-04-29 12:36:09
|
Revision: 12982 http://jmol.svn.sourceforge.net/jmol/?rev=12982&view=rev Author: hansonr Date: 2010-04-29 12:35:57 +0000 (Thu, 29 Apr 2010) Log Message: ----------- base version 1.5 Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-04-29 12:29:19 UTC (rev 12981) +++ trunk/Jmol/build.xml 2010-04-29 12:35:57 UTC (rev 12982) @@ -7,10 +7,10 @@ <property file="${user.home}/.jmol.build.properties" /> <!-- compile options --> <property name="build.sysclasspath" value="ignore" /> - <property name="build.compiler" value="javac1.4" /> + <property name="build.compiler" value="javac1.5" /> <!-- 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.4" /> + <property name="java.version" value="1.5" /> <property name="debug" value="off" /> <property name="deprecation" value="off" /> <property name="optimization" value="off" /> @@ -193,7 +193,7 @@ <mkdir dir="${classes.dir}"/> <javac srcdir="src" destdir="${classes.dir}" debug="${debug}" deprecation="${deprecation}" - optimize="${optimization}" source="1.4"> + optimize="${optimization}" source="1.5"> <classpath refid="project.class.path" /> <!-- removed all CDK based code, use BioClipse instead --> <exclude name="org/openscience/jmol/app/JmolEditBus.java"/> @@ -246,13 +246,20 @@ changed source="1.3" target="1.1" to source="1.4" target="1.4" +bob 2010.04.29 + in order to allow for faster BitSet methods +changed source="1.4" target="1.4" + to source="1.5" target="1.5" + +all support for previous versions removed + --> <javac srcdir="src" destdir="${applet.classes.dir}" debug="${debug}" deprecation="${deprecation}" optimize="${optimization}" - source="1.4" target="1.4" + source="1.5" target="1.5" includesfile="applet.classes" classpathref="applet-project.class.path" /> @@ -286,7 +293,7 @@ <mkdir dir="${apisio.classes.dir}"/> <javac srcdir="src" destdir="${apisio.classes.dir}" debug="${debug}" deprecation="${deprecation}" - optimize="${optimization}" source="1.4" + optimize="${optimization}" source="1.5" includesfile="apisio.classes" classpathref="apisio-project.class.path" /> <copy todir="${apisio.classes.dir}" > @@ -1308,7 +1315,7 @@ <mkdir dir="${test-classes.dir}"/> <javac srcdir="test" destdir="${test-classes.dir}" debug="off" deprecation="on" - optimize="off" source="1.4"> + optimize="off" source="1.5"> <classpath> <pathelement location="${jmol.build.dir}/Jmol.jar" /> <pathelement location="./jars/junit.jar" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-05-11 21:41:03
|
Revision: 13067 http://jmol.svn.sourceforge.net/jmol/?rev=13067&view=rev Author: hansonr Date: 2010-05-11 21:40:56 +0000 (Tue, 11 May 2010) Log Message: ----------- version=12.0.RC11_dev # refactoring with JmolNode, JmolEdge, and Elements # new feature: JmolSmilesApplet.jar -- just checks SMILES strings Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-05-11 20:47:51 UTC (rev 13066) +++ trunk/Jmol/build.xml 2010-05-11 21:40:56 UTC (rev 13067) @@ -898,7 +898,7 @@ </target> <target name="smiles-applet-jar" id="smiles-applet-jar" - depends="applet-classes,appletjars"> + depends="applet-classes"> <jar destfile="${jmol.applet.build.dir}/JmolSmilesApplet.jar" manifest="manifest/appletSmiles.txt" index="true" > <fileset dir="${classes.dir}" > @@ -907,16 +907,22 @@ <fileset dir="${applet.classes.dir}" > <include name="JmolSmiles*" /> <include name="org/jmol/smiles/**" /> - <include name="org/jmol/api/JmolNode*" /> - <include name="org/jmol/api/JmolEdge*" /> - <include name="org/jmol/api/SmilesMatcherInterface*" /> + <include name="org/jmol/api/JmolNode.class" /> + <include name="org/jmol/api/JmolEdge.class" /> + <include name="org/jmol/api/SmilesMatcherInterface.class" /> <include name="org/jmol/util/Parser.class" /> <include name="org/jmol/util/DefaultLogger.class" /> <include name="org/jmol/util/Logger.class" /> <include name="org/jmol/util/LoggerInterface.class" /> <include name="org/jmol/util/Elements.class" /> </fileset> - <fileset dir="${appletjars.dir}" includes="**/*"/> + <fileset dir="${appletjars.dir}"> + <include name="javax/vecmath/*3f*" /> + <include name="javax/vecmath/*3d*" /> + <include name="javax/vecmath/Point4f*" /> + <include name="javax/vecmath/Tuple4f*" /> + <exclude name="javax/vecmath/Matrix*" /> + </fileset> </jar> <for list="${all.JmolApplet.languages}" delimiter="," This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-05-16 00:32:40
|
Revision: 13096 http://jmol.svn.sourceforge.net/jmol/?rev=13096&view=rev Author: hansonr Date: 2010-05-16 00:32:33 +0000 (Sun, 16 May 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-05-15 22:57:26 UTC (rev 13095) +++ trunk/Jmol/build.xml 2010-05-16 00:32:33 UTC (rev 13096) @@ -910,11 +910,12 @@ <include name="org/jmol/api/JmolNode.class" /> <include name="org/jmol/api/JmolEdge.class" /> <include name="org/jmol/api/SmilesMatcherInterface.class" /> - <include name="org/jmol/util/Parser.class" /> - <include name="org/jmol/util/DefaultLogger.class" /> + <include name="org/jmol/util/Elements.class" /> + <!-- + <include name="org/jmol/util/DefaultLogger.class" /> <include name="org/jmol/util/Logger.class" /> <include name="org/jmol/util/LoggerInterface.class" /> - <include name="org/jmol/util/Elements.class" /> + --> </fileset> <fileset dir="${appletjars.dir}"> <include name="javax/vecmath/*3f*" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-05-19 15:17:15
|
Revision: 13139 http://jmol.svn.sourceforge.net/jmol/?rev=13139&view=rev Author: hansonr Date: 2010-05-19 15:17:09 +0000 (Wed, 19 May 2010) Log Message: ----------- ?? Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-05-19 15:15:32 UTC (rev 13138) +++ trunk/Jmol/build.xml 2010-05-19 15:17:09 UTC (rev 13139) @@ -252,6 +252,12 @@ changed source="1.4" target="1.4" to source="1.5" target="1.5" + +bob 2010.05.19 + +changed just the applet classes back to: + + source="1.4" target="1.4" all support for previous versions removed @@ -259,7 +265,7 @@ <javac srcdir="src" destdir="${applet.classes.dir}" debug="${debug}" deprecation="${deprecation}" optimize="${optimization}" - source="1.5" target="1.5" + source="1.4" target="1.4" includesfile="applet.classes" classpathref="applet-project.class.path" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-05-21 12:36:54
|
Revision: 13167 http://jmol.svn.sourceforge.net/jmol/?rev=13167&view=rev Author: hansonr Date: 2010-05-21 12:36:48 +0000 (Fri, 21 May 2010) Log Message: ----------- Application source/target Java 1.5 Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-05-21 12:35:11 UTC (rev 13166) +++ trunk/Jmol/build.xml 2010-05-21 12:36:48 UTC (rev 13167) @@ -193,7 +193,7 @@ <mkdir dir="${classes.dir}"/> <javac srcdir="src" destdir="${classes.dir}" debug="${debug}" deprecation="${deprecation}" - optimize="${optimization}" source="1.5"> + optimize="${optimization}" source="1.5" target="1.5"> <classpath refid="project.class.path" /> <!-- removed all CDK based code, use BioClipse instead --> <exclude name="org/openscience/jmol/app/JmolEditBus.java"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |