From: <ha...@us...> - 2008-08-05 16:35:08
|
Revision: 9668 http://jmol.svn.sourceforge.net/jmol/?rev=9668&view=rev Author: hansonr Date: 2008-08-05 16:35:02 +0000 (Tue, 05 Aug 2008) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2008-08-05 16:31:50 UTC (rev 9667) +++ trunk/Jmol/build.xml 2008-08-05 16:35:02 UTC (rev 9668) @@ -13,7 +13,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...> - 2008-08-12 23:17:52
|
Revision: 9717 http://jmol.svn.sourceforge.net/jmol/?rev=9717&view=rev Author: hansonr Date: 2008-08-12 23:17:50 +0000 (Tue, 12 Aug 2008) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2008-08-12 23:17:06 UTC (rev 9716) +++ trunk/Jmol/build.xml 2008-08-12 23:17:50 UTC (rev 9717) @@ -13,7 +13,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-25 07:44:39
|
Revision: 11114 http://jmol.svn.sourceforge.net/jmol/?rev=11114&view=rev Author: hansonr Date: 2009-06-25 07:44:32 +0000 (Thu, 25 Jun 2009) Log Message: ----------- version=11.7.45_dev # new feature: App and applet consoles now have "edit" buttons that load scripts into a "script editor" Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2009-06-25 07:42:30 UTC (rev 11113) +++ trunk/Jmol/build.xml 2009-06-25 07:44:32 UTC (rev 11114) @@ -534,6 +534,12 @@ </fileset> </jar> + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Console.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/console/**" /> + </fileset> + </jar> + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" manifest="manifest/applet.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/popup/**" /> @@ -630,6 +636,7 @@ <!-- changes to this must be replicated below for the signed applet --> <indexjars> <!-- no export 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" /> <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Quantum.jar" /> @@ -664,6 +671,11 @@ storepass="selfSignedCertificate" alias="selfSignedCertificate" /> <delete file="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp" /> + <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Console.jar" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar" + keystore="selfSignedCertificate/selfSignedCertificate.store" + storepass="selfSignedCertificate" alias="selfSignedCertificate" /> + <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Minimize.jar" keystore="selfSignedCertificate/selfSignedCertificate.store" @@ -765,6 +777,7 @@ <include name="org/jmol/i18n/**" /> </fileset> <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_Popup.jar" /> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Quantum.jar" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-06-29 15:50:06
|
Revision: 11150 http://jmol.svn.sourceforge.net/jmol/?rev=11150&view=rev Author: hansonr Date: 2009-06-29 15:50:05 +0000 (Mon, 29 Jun 2009) Log Message: ----------- adds JmolFrameless.jar Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2009-06-29 15:01:37 UTC (rev 11149) +++ trunk/Jmol/build.xml 2009-06-29 15:50:05 UTC (rev 11150) @@ -830,6 +830,7 @@ </fileset> <fileset dir="${jmol.build.dir}"> <include name="Jmol.jar" /> + <include name="JmolFrameless.jar" /> </fileset> <fileset dir="."> <include name="jmol" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-07-01 05:39:03
|
Revision: 11166 http://jmol.svn.sourceforge.net/jmol/?rev=11166&view=rev Author: hansonr Date: 2009-07-01 05:38:42 +0000 (Wed, 01 Jul 2009) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2009-07-01 05:30:10 UTC (rev 11165) +++ trunk/Jmol/build.xml 2009-07-01 05:38:42 UTC (rev 11166) @@ -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="off" /> + <property name="debug" value="on" /> <property name="deprecation" value="off" /> <property name="optimization" value="off" /> @@ -377,11 +377,14 @@ <fileset dir="${classes.dir}" > <exclude name="**/.*" /> <exclude name="**/*.dx" /> + <exclude name="ant/**" /> + <include name="com/**" /> <exclude name="**/Test*.class" /> + <exclude name="**/jmol/jcamp/**" /> <exclude name="**/jmol/applet/*" /> + <exclude name="**/jmol/appletwrapper/*" /> <include name="**/jmol/**" /> - <include name="com/**" /> - <include name="freeware/**" /> + <exclude name="**/app/JmolData.class" /> </fileset> <fileset dir="${appjars.dir}" includes="**/*"/> <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/> @@ -393,21 +396,36 @@ <!-- 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"> + manifest="manifest/applicationData.txt"> <fileset dir="${classes.dir}" > <exclude name="**/.*" /> <exclude name="**/*.dx" /> <exclude name="**/Test*.class" /> - <exclude name="**/jmol/applet/*" /> + <exclude name="ant/**" /> + <exclude name="com/**" /> <include name="**/jmol/**" /> - <include name="com/**" /> - <include name="freeware/**" /> + <exclude name="**/jmol/_documents/**" /> + <exclude name="**/jmol/jcamp/**" /> + <exclude name="**/jmol/applet/**" /> + <exclude name="**/jmol/appletwrapper/**" /> + <exclude name="**/jmol/console/**" /> + <exclude name="**/jmol/export/**" /> + <exclude name="**/jmol/shape/**" /> + <exclude name="**/jmol/shapebio/**" /> + <exclude name="**/jmol/shapespecial/**" /> + <exclude name="**/jmol/shapesurface/**" /> + <exclude name="**/jmol/popup/**" /> + <exclude name="**/openscience/jmol/Data/**" /> + <exclude name="**/openscience/jmol/app/Jmol.class" /> + <exclude name="**/openscience/jmol/app/images/**" /> + <exclude name="**/openscience/jmol/app/jmolpanel/**" /> + <exclude name="**/openscience/jmol/app/webexport/**" /> </fileset> - <fileset dir="${appjars.dir}" includes="**/*"/> + <fileset dir="${appjars.dir}" includes="**/cli/** **/vecmath/**" /> <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/> </jar> <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar" - signedjar="${jmol.build.dir}/JmolFrameless.jar" + signedjar="${jmol.build.dir}/JmolData.jar" keystore="selfSignedCertificate/selfSignedCertificate.store" storepass="selfSignedCertificate" alias="selfSignedCertificate" /> <!-- to verify that a .jar file is signed: jarsigner -verify foo.jar --> @@ -830,7 +848,7 @@ </fileset> <fileset dir="${jmol.build.dir}"> <include name="Jmol.jar" /> - <include name="JmolFrameless.jar" /> + <include name="JmolData.jar" /> </fileset> <fileset dir="."> <include name="jmol" /> @@ -1039,11 +1057,11 @@ <delete> <fileset dir="."> <include name="Jmol.jar" /> - <include name="JmolFrameless.jar" /> + <include name="JmolData.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" /> + <include name="${jmol.build.dir}/JmolData.jar" /> </fileset> </delete> </target> @@ -1240,7 +1258,7 @@ <target name="compile-tests" id="compile-tests" depends="main"> <mkdir dir="${test-classes.dir}"/> <javac srcdir="test" destdir="${test-classes.dir}" - debug="on" deprecation="on" + debug="off" deprecation="on" optimize="off" source="1.4"> <classpath> <pathelement location="${jmol.build.dir}/Jmol.jar" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-12-09 19:24:07
|
Revision: 11885 http://jmol.svn.sourceforge.net/jmol/?rev=11885&view=rev Author: hansonr Date: 2009-12-09 19:24:00 +0000 (Wed, 09 Dec 2009) Log Message: ----------- multitouch Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2009-12-09 18:59:42 UTC (rev 11884) +++ trunk/Jmol/build.xml 2009-12-09 19:24:00 UTC (rev 11885) @@ -727,7 +727,6 @@ <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" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-05-11 20:47:57
|
Revision: 13066 http://jmol.svn.sourceforge.net/jmol/?rev=13066&view=rev Author: hansonr Date: 2010-05-11 20:47:51 +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:42 UTC (rev 13065) +++ trunk/Jmol/build.xml 2010-05-11 20:47:51 UTC (rev 13066) @@ -72,7 +72,7 @@ </classpath> </taskdef> - <target name="main" id="main" depends="init,jar,applet-jar"/> + <target name="main" id="main" depends="init,jar,applet-jar,signed-applet,smiles-applet-jar"/> <target name="all" id="all" depends="doc,main"/> @@ -409,6 +409,7 @@ 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/applicationData.txt"> @@ -443,7 +444,8 @@ 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"/> + + <delete file="${jmol.build.dir}/JmolUnsignedF.jar"/> <copy todir="${jmol.build.dir}"> <fileset dir="."> <include name="jmol" /> @@ -562,6 +564,7 @@ manifest="manifest/appletMonolithic.txt" index="true" > <fileset dir="${applet.classes.dir}" > <include name="**/*" /> + <exclude name="JmolSmiles*" /> <exclude name="org/jmol/export/**/*" /> <exclude name="org/jmol/multitouch/**/*" /> <exclude name="com/sparshui/**/*" /> @@ -731,6 +734,7 @@ manifest="manifest/appletMonolithic.txt" index="true" > <fileset dir="${applet.classes.dir}" > <include name="**/*" /> + <exclude name="JmolSmiles*" /> </fileset> <fileset dir="${appletjars.dir}" includes="**/*"/> </jar> @@ -893,7 +897,186 @@ <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --> </target> - <target name="dist" id="dist" + <target name="smiles-applet-jar" id="smiles-applet-jar" + depends="applet-classes,appletjars"> + <jar destfile="${jmol.applet.build.dir}/JmolSmilesApplet.jar" + manifest="manifest/appletSmiles.txt" index="true" > + <fileset dir="${classes.dir}" > + <include name="JmolSmiles.class"/> + </fileset> + <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/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="**/*"/> + </jar> + + <for list="${all.JmolApplet.languages}" delimiter="," + param="current.Jmol.language"> + <sequential> + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar" + manifest="manifest/applet_i18n.txt" > + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" /> + </fileset> + </jar> + </sequential> + </for> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/minimize/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Console.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/console/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/popup/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/adapter/readers/molxyz/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersCifPdb.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/adapter/readers/cifpdb/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersQuantum.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/adapter/readers/quantum/**" /> + <include name="org/jmol/quantum/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersMore.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/adapter/readers/more/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersSimple.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/adapter/readers/simple/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersXtal.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/adapter/readers/xtal/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/adapter/readers/xml/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeBio.jar" manifest="manifest/applet.txt" > + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/modelsetbio/**" /> + <include name="org/jmol/shapebio/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" manifest="manifest/applet.txt" > + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/shapespecial/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" manifest="manifest/applet.txt" > + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/jvxl/**" /> + <include name="org/jmol/shapesurface/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/smiles/**" /> + </fileset> + </jar> + + <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" manifest="manifest/applet.txt"> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/symmetry/**" /> + </fileset> + </jar> + + + <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> + <!-- changes to this must be replicated below for the signed applet --> + <jar destfile="${jmol.applet.build.dir}/JmolApplet0.jar" + index="true" > + <!-- javax/vecmath --> + <fileset dir="${appletjars.dir}" includes="**/*"/> + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/appletwrapper/*" /> + <include name="JmolApplet*.class" /> + <include name="jmol75x29x8.gif" /> + <include name="org/jmol/adapter/smarter/**" /> + <include name="org/jmol/api/**" /> + <include name="org/jmol/applet/**" /> + <include name="org/jmol/atomdata/**" /> + <include name="org/jmol/bspt/**" /> + <include name="org/jmol/g3d/**" /> + <include name="org/jmol/geodesic/**" /> + <include name="org/jmol/i18n/**" /> + <include name="org/jmol/modelset/**" /> + <include name="org/jmol/script/**" /> + <include name="org/jmol/shape/**" /> + <include name="org/jmol/util/**" /> + <include name="org/jmol/viewer/**" /> + </fileset> + + <!-- changes to this must be replicated below for the signed applet --> + <indexjars> + <!-- 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" /> + <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersCifPdb.jar" /> + <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar" /> + <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_ShapeBio.jar" /> + <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" /> + <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" /> + <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" /> + <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" /> + <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" /> + </indexjars> + </jar> + <!-- changes to this must be replicated below for the signed applet --> + <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --> + + </target> + + <target name="dist" id="dist" depends="doc,main-i18n,main,signed-applet"> <!-- first build binary distribution --> <delete dir="build/dist/jmol-${version}"/> @@ -905,6 +1088,7 @@ <fileset dir="${jmol.build.dir}"> <include name="Jmol.jar" /> <include name="JmolData.jar" /> + <include name="JmolSmiles.jar" /> </fileset> <fileset dir="."> <include name="jmol" /> @@ -1114,10 +1298,12 @@ <fileset dir="."> <include name="Jmol.jar" /> <include name="JmolData.jar" /> + <include name="JmolSmiles.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}/JmolData.jar" /> + <include name="${jmol.build.dir}/JmolSmiles.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...> - 2010-05-27 03:46:19
|
Revision: 13228 http://jmol.svn.sourceforge.net/jmol/?rev=13228&view=rev Author: hansonr Date: 2010-05-27 03:46:13 +0000 (Thu, 27 May 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-05-27 03:45:57 UTC (rev 13227) +++ trunk/Jmol/build.xml 2010-05-27 03:46:13 UTC (rev 13228) @@ -225,8 +225,13 @@ <target name="applet-classes" id="applet-classes" depends="init"> <mkdir dir="${applet.classes.dir}"/> + <copy todir="${applet.classes.dir}" > + <fileset dir="src"> + <include name="org/jmol/modelkit/images/*" /> + </fileset> + </copy> - <property name="build.compiler" value="javac1.1" /> + <property name="build.compiler" value="javac1.4" /> <!-- 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 @@ -595,6 +600,7 @@ <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/minimize/**" /> + <include name="org/jmol/modelkit/images/**" /> <include name="org/jmol/modelkit/**" /> </fileset> </jar> @@ -953,6 +959,7 @@ <fileset dir="${applet.classes.dir}"> <include name="org/jmol/minimize/**" /> <include name="org/jmol/modelkit/**" /> + <include name="org/jmol/modelkit/images/**" /> </fileset> </jar> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-06-29 21:25:13
|
Revision: 13478 http://jmol.svn.sourceforge.net/jmol/?rev=13478&view=rev Author: hansonr Date: 2010-06-29 21:25:07 +0000 (Tue, 29 Jun 2010) Log Message: ----------- Smiles needs jmol.util.TextFormat Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-06-29 21:24:28 UTC (rev 13477) +++ trunk/Jmol/build.xml 2010-06-29 21:25:07 UTC (rev 13478) @@ -930,6 +930,7 @@ <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/TextFormat.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-07-14 21:46:01
|
Revision: 13574 http://jmol.svn.sourceforge.net/jmol/?rev=13574&view=rev Author: hansonr Date: 2010-07-14 21:45:55 +0000 (Wed, 14 Jul 2010) Log Message: ----------- debug off Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2010-07-14 21:40:15 UTC (rev 13573) +++ trunk/Jmol/build.xml 2010-07-14 21:45:55 UTC (rev 13574) @@ -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.5" /> - <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: <ni...@us...> - 2011-01-29 20:26:58
|
Revision: 15067 http://jmol.svn.sourceforge.net/jmol/?rev=15067&view=rev Author: nicove Date: 2011-01-29 20:26:52 +0000 (Sat, 29 Jan 2011) Log Message: ----------- Bug fix: include tools directory in dist Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2011-01-28 17:32:28 UTC (rev 15066) +++ trunk/Jmol/build.xml 2011-01-29 20:26:52 UTC (rev 15067) @@ -1191,6 +1191,10 @@ <fileset dir="doc" /> </copy> + <copy todir="build/dist/jmol-${version}/tools" > + <fileset dir="tools" /> + </copy> + <!-- Jvxl --> <copy file="build/Jvxl.jar" tofile="build/dist/Jvxl-${jvxl_version}.jar" failonerror="false" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-08-01 23:50:42
|
Revision: 15909 http://jmol.svn.sourceforge.net/jmol/?rev=15909&view=rev Author: hansonr Date: 2011-08-01 23:50:35 +0000 (Mon, 01 Aug 2011) Log Message: ----------- ChimeToJmol stand-alone JAR Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2011-08-01 23:39:29 UTC (rev 15908) +++ trunk/Jmol/build.xml 2011-08-01 23:50:35 UTC (rev 15909) @@ -1126,6 +1126,7 @@ </fileset> <fileset dir="${jmol.build.dir}"> <include name="Jmol.jar" /> + <include name="ChimeToJmol.jar" /> <include name="JmolData.jar" /> <include name="JmolSmiles.jar" /> </fileset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-08-05 01:16:35
|
Revision: 15936 http://jmol.svn.sourceforge.net/jmol/?rev=15936&view=rev Author: hansonr Date: 2011-08-05 01:16:29 +0000 (Fri, 05 Aug 2011) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2011-08-05 00:47:11 UTC (rev 15935) +++ trunk/Jmol/build.xml 2011-08-05 01:16:29 UTC (rev 15936) @@ -941,13 +941,13 @@ <fileset dir="${applet.classes.dir}" > <include name="JmolSmiles*" /> <include name="org/jmol/smiles/**" /> - <include name="org/jmol/api/JmolNode.class" /> - <include name="org/jmol/api/JmolEdge.class" /> - <include name="org/jmol/api/JmolMolecule.class" /> <include name="org/jmol/api/SmilesMatcherInterface.class" /> <include name="org/jmol/constant/**" /> + <include name="org/jmol/util/JmolEdge.class" /> + <include name="org/jmol/util/JmolNode.class" /> + <include name="org/jmol/util/JmolMolecule.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/TextFormat.class" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-09-27 14:58:40
|
Revision: 16163 http://jmol.svn.sourceforge.net/jmol/?rev=16163&view=rev Author: hansonr Date: 2011-09-27 14:58:33 +0000 (Tue, 27 Sep 2011) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2011-09-27 14:52:17 UTC (rev 16162) +++ trunk/Jmol/build.xml 2011-09-27 14:58:33 UTC (rev 16163) @@ -593,6 +593,7 @@ <exclude name="org/jmol/multitouch/**/*" /> <exclude name="org/openscience/**/*" /> <exclude name="com/sparshui/**/*" /> + <exclude name="com/json/**/*" /> </fileset> <fileset dir="${appletjars.dir}" includes="**/*"/> </jar> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-10-11 02:32:01
|
Revision: 16315 http://jmol.svn.sourceforge.net/jmol/?rev=16315&view=rev Author: hansonr Date: 2011-10-11 02:31:55 +0000 (Tue, 11 Oct 2011) Log Message: ----------- for Jmol-Android (part of Applet build -- JmolA.jar -- not working yet) Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2011-10-11 02:30:56 UTC (rev 16314) +++ trunk/Jmol/build.xml 2011-10-11 02:31:55 UTC (rev 16315) @@ -761,9 +761,32 @@ <!-- changes to this must be replicated below for the signed applet --> <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --> + <jar destfile="${jmol.applet.build.dir}/JmolA.jar" + manifest="manifest/appletMonolithic.txt" index="true" > + <fileset dir="${applet.classes.dir}" > + <include name="**/*" /> + <exclude name="JmolSmiles*" /> + <exclude name="org/jmol/applet/**/*" /> + <exclude name="org/jmol/awt/**/*" /> + <exclude name="org/jmol/console/**/*" /> + <exclude name="org/jmol/export/**/*" /> + <exclude name="org/jmol/modelkit/**/*" /> + <exclude name="org/jmol/multitouch/**/*" /> + <exclude name="org/jmol/popup/**/*" /> + <exclude name="org/jmol/translation/**/*" /> + <exclude name="org/openscience/**/*" /> + <exclude name="com/sparshui/**/*" /> + <exclude name="com/json/**/*" /> + </fileset> + <fileset dir="${appletjars.dir}" includes="**/*"/> + </jar> + + </target> - <target name="signed-applet" id="signed-applet" depends="applet-jar"> + + + <target name="signed-applet" id="signed-applet" depends="applet-jar"> <jar destfile="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp" manifest="manifest/appletMonolithic.txt" index="true" > <fileset dir="${applet.classes.dir}" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-10-22 23:07:36
|
Revision: 16388 http://jmol.svn.sourceforge.net/jmol/?rev=16388&view=rev Author: hansonr Date: 2011-10-22 23:07:30 +0000 (Sat, 22 Oct 2011) Log Message: ----------- version=12.3.3_dev # code: refactored for Molecular Playground and Jmol Android # -- several System.out. messages present. Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2011-10-22 23:06:46 UTC (rev 16387) +++ trunk/Jmol/build.xml 2011-10-22 23:07:30 UTC (rev 16388) @@ -771,11 +771,18 @@ <exclude name="org/jmol/console/**/*" /> <exclude name="org/jmol/export/**/*" /> <exclude name="org/jmol/modelkit/**/*" /> - <exclude name="org/jmol/multitouch/**/*" /> + <exclude name="org/jmol/multitouch/jni/*" /> + <exclude name="org/jmol/multitouch/sparshui/*" /> <exclude name="org/jmol/popup/**/*" /> <exclude name="org/jmol/translation/**/*" /> <exclude name="org/openscience/**/*" /> - <exclude name="com/sparshui/**/*" /> + <!-- just need sparshUI gestureType.class --> + <exclude name="com/sparshui/client/*" /> + <exclude name="com/sparshui/common/**/**/*" /> + <exclude name="com/sparshui/cpp/*" /> + <exclude name="com/sparshui/gestures/*" /> + <exclude name="com/sparshui/inputdevice/*" /> + <exclude name="com/sparshui/server/*" /> <exclude name="com/json/**/*" /> <exclude name="JmolApplet*" /> </fileset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-05-11 04:09:45
|
Revision: 17119 http://jmol.svn.sourceforge.net/jmol/?rev=17119&view=rev Author: hansonr Date: 2012-05-11 04:09:38 +0000 (Fri, 11 May 2012) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2012-05-10 23:01:05 UTC (rev 17118) +++ trunk/Jmol/build.xml 2012-05-11 04:09:38 UTC (rev 17119) @@ -289,7 +289,8 @@ <copy todir="${applet.classes.dir}" > <fileset dir="src"> - <include name="org/jmol/minimize/forcefield/*.txt" /> + <include name="org/jmol/minimize/forcefield/uff/*.txt" /> + <include name="org/jmol/minimize/forcefield/mmff/*.txt" /> <include name="jmol75x29x8.gif" /> </fileset> </copy> @@ -628,7 +629,7 @@ <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt"> <fileset dir="${applet.classes.dir}"> - <include name="org/jmol/minimize/**" /> + <include name="org/jmol/minimize/**/**" /> <include name="org/jmol/modelkit/images/**" /> <include name="org/jmol/modelkit/**" /> </fileset> @@ -1088,7 +1089,7 @@ <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt"> <fileset dir="${applet.classes.dir}"> - <include name="org/jmol/minimize/**" /> + <include name="org/jmol/minimize/**/**" /> <include name="org/jmol/modelkit/**" /> <include name="org/jmol/modelkit/images/**" /> </fileset> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-09-30 14:54:19
|
Revision: 17595 http://jmol.svn.sourceforge.net/jmol/?rev=17595&view=rev Author: hansonr Date: 2012-09-30 14:54:13 +0000 (Sun, 30 Sep 2012) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2012-09-30 14:47:06 UTC (rev 17594) +++ trunk/Jmol/build.xml 2012-09-30 14:54:13 UTC (rev 17595) @@ -425,6 +425,7 @@ <exclude name="**/*.dx" /> <exclude name="ant/**" /> <include name="com/**" /> + <include name="javax/**" /> <exclude name="**/Test*.class" /> <exclude name="**/jmol/jcamp/**" /> <exclude name="**/jmol/applet/*" /> @@ -449,7 +450,7 @@ <exclude name="**/Test*.class" /> <exclude name="ant/**" /> <exclude name="com/**" /> - <include name="**/javax/**" /> + <include name="javax/**" /> <include name="**/jmol/**" /> <exclude name="**/jmol/_documents/**" /> <exclude name="**/jmol/applet/**" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2013-04-28 13:10:29
|
Revision: 18173 http://sourceforge.net/p/jmol/code/18173 Author: nicove Date: 2013-04-28 13:10:24 +0000 (Sun, 28 Apr 2013) Log Message: ----------- Warning Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-04-28 12:57:36 UTC (rev 18172) +++ trunk/Jmol/build.xml 2013-04-28 13:10:24 UTC (rev 18173) @@ -820,7 +820,7 @@ <!-- changes to this must be replicated below for the signed applet --> <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --> - <echo message="creating JmolLib.jar" /> + <echo message="creating JmolLib.jar" level="info" /> <jar destfile="${jmol.applet.build.dir}/JmolLib.jar" manifest="manifest/jmolLib.txt" index="true" > <fileset dir="${applet.classes.dir}" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-06-18 06:49:34
|
Revision: 18347 http://sourceforge.net/p/jmol/code/18347 Author: hansonr Date: 2013-06-18 06:49:30 +0000 (Tue, 18 Jun 2013) Log Message: ----------- JmolSmilesApplet fix Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-06-18 06:48:45 UTC (rev 18346) +++ trunk/Jmol/build.xml 2013-06-18 06:49:30 UTC (rev 18347) @@ -1276,8 +1276,8 @@ <include name="org/jmol/api/SmilesMatcherInterface.class" /> <include name="org/jmol/constant/**" /> <include name="org/jmol/util/ArrayUtil.class" /> - <include name="org/jmol/util/BitSet.class" /> - <include name="org/jmol/util/BitSetUtil.class" /> + <include name="org/jmol/util/BS.class" /> + <include name="org/jmol/util/BSUtil.class" /> <include name="org/jmol/util/JmolEdge.class" /> <include name="org/jmol/util/JmolNode.class" /> <include name="org/jmol/util/JmolMolecule.class" /> @@ -1287,9 +1287,10 @@ <include name="org/jmol/util/LoggerInterface.class" /> <include name="org/jmol/util/TextFormat.class" /> <include name="org/jmol/util/Tuple3f.class" /> - <include name="org/jmol/util/Point3f.class" /> - <include name="org/jmol/util/Vector3f.class" /> - <include name="org/jmol/util/StringXBuilder.class" /> + <include name="org/jmol/util/JmolList.class" /> + <include name="org/jmol/util/P3.class" /> + <include name="org/jmol/util/V3.class" /> + <include name="org/jmol/util/SB.class" /> </fileset> </jar> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-07-05 12:36:42
|
Revision: 18431 http://sourceforge.net/p/jmol/code/18431 Author: hansonr Date: 2013-07-05 12:36:35 +0000 (Fri, 05 Jul 2013) Log Message: ----------- adds nmr_data.txt to JAR files Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-07-04 21:54:56 UTC (rev 18430) +++ trunk/Jmol/build.xml 2013-07-05 12:36:35 UTC (rev 18431) @@ -314,6 +314,11 @@ <include name="jmol75x29x8.gif" /> </fileset> </copy> + <copy todir="${applet.classes.dir}" > + <fileset dir="src"> + <include name="org/jmol/quantum/*.txt" /> + </fileset> + </copy> <copy file="Jmol.properties" tofile="${applet.classes.dir}/org/jmol/viewer/Jmol.properties" /> <copy todir="${applet.classes.dir}" > <fileset dir="${classes.dir}"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-10-29 18:42:20
|
Revision: 18857 http://sourceforge.net/p/jmol/code/18857 Author: hansonr Date: 2013-10-29 18:42:18 +0000 (Tue, 29 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-10-29 18:42:10 UTC (rev 18856) +++ trunk/Jmol/build.xml 2013-10-29 18:42:18 UTC (rev 18857) @@ -59,6 +59,7 @@ <property name="tests.dir" value="build/unit.tests" /> <property name="javadoc.dir" value="build/javadoc" /> <property name="jmol.applet.build.dir" value="build" /> + <property name="tempjar" value="${jmol.applet.build.dir}/tempjar" /> <property name="jmol.applet.web.dir" value="appletweb" /> <property name="jmol.build.dir" value="build" /> <property name="docbook-xsl" value="docbook-xsl-1.76.1" /> @@ -69,8 +70,11 @@ <property name="commons-cli.jar" value="commons-cli-1.0.jar" /> <property name="saxon.jar" value="saxon.jar" /> <property name="saxon.main" value="com.icl.saxon.StyleSheet" /> + <property name="sign.store" value="selfSignedCertificate/selfSignedCertificate.store" /> + <property name="sign.pass" value="selfSignedCertificate" /> + <property name="sign.alias" value="selfSignedCertificate" /> - <!-- you can set this by defining it in ~/.jmol.build.properties --> + <!-- you can set this by defining it in ~/.jmol.build.properties --> <property name="keystore.name" value="Must be set by user." /> <!-- this value is required if you are building the .NET DLL, it must point to the IKVM/bin directory --> @@ -432,7 +436,7 @@ <include name="**/*.html" /> </fileset> </copy> - <jar destfile="${jmol.build.dir}/JmolUnsigned.jar" + <jar destfile="${tempjar}" manifest="manifest/application.txt"> <fileset dir="${classes.dir}" > <exclude name="**/.*" /> @@ -451,14 +455,11 @@ <fileset dir="${appjars.dir}" includes="**/*"/> <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/> </jar> - <signjar jar="${jmol.build.dir}/JmolUnsigned.jar" - signedjar="${jmol.build.dir}/Jmol.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.build.dir}/Jmol.jar" /> <!-- 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" + <jar destfile="${tempjar}" manifest="manifest/applicationData.txt"> <fileset dir="${classes.dir}" > <exclude name="**/.*" /> @@ -486,13 +487,10 @@ <fileset dir="${appjars.dir}" includes="**/cli/** **/naga/**" /> <fileset dir="src/org/jmol/translation/Jmol" includes="Messages*.class"/> </jar> - <signjar jar="${jmol.build.dir}/JmolUnsignedF.jar" - signedjar="${jmol.build.dir}/JmolData.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.build.dir}/JmolData.jar" /> <!-- 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" /> @@ -501,7 +499,7 @@ </fileset> </copy> - <jar destfile="${jmol.build.dir}/JvxlUnsigned.jar" + <jar destfile="${tempjar}" manifest="manifest/jvxl.txt"> <fileset dir="${classes.dir}" > <exclude name="**/.*" /> @@ -521,25 +519,21 @@ <fileset dir="${appjars.dir}" includes="**/*"/> </jar> - <signjar jar="${jmol.build.dir}/JvxlUnsigned.jar" - signedjar="${jmol.build.dir}/Jvxl.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - <delete file="${jmol.build.dir}/JvxlUnsigned.jar"/> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.build.dir}/Jvxl.jar" /> - <jar destfile="${jmol.build.dir}/ChimeToJmolUnsigned.jar" + <jar destfile="${tempjar}" manifest="manifest/chimetojmol.txt"> <fileset dir="${classes.dir}" > <include name="org/openscience/chimetojmol/*" /> </fileset> </jar> - <signjar jar="${jmol.build.dir}/ChimeToJmolUnsigned.jar" - signedjar="${jmol.build.dir}/ChimeToJmol.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - <delete file="${jmol.build.dir}/ChimeToJmolUnsigned.jar"/> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.build.dir}/ChimeToJmol.jar" /> + <delete file="{tempjar}" /> + </target> <target name="apis-jar" id="apis-jar" depends="init,apisio-classes"> @@ -799,7 +793,7 @@ <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> <!-- changes to this must be replicated below for the signed applet --> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0.jar" + <jar destfile="${jmol.applet.build.dir}/JmolApplet0.jar" manifest="manifest/applet0.txt" index="true" > <!-- javax/vecmath --> <fileset dir="${appletjars.dir}" includes="**/*"/> @@ -860,10 +854,8 @@ <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" /> </indexjars> </jar> - <!-- changes to this must be replicated below for the signed applet --> - <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --> - <echo message="creating JmolLib.jar" level="info" /> + <echo message="creating JmolLib.jar" level="info" /> <jar destfile="${jmol.applet.build.dir}/JmolLib.jar" manifest="manifest/jmolLib.txt" index="true" > <fileset dir="${applet.classes.dir}" > @@ -902,8 +894,8 @@ </target> <target name="signed-applet" id="signed-applet" depends="applet-jar"> - <jar destfile="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp" - manifest="manifest/appletMonolithic.txt" index="true" > + <jar destfile="${tempjar}" + manifest="manifest/appletMonolithicSigned.txt" index="true" > <fileset dir="${applet.classes.dir}" > <include name="**/*" /> <exclude name="JmolSmiles*" /> @@ -911,152 +903,11 @@ </fileset> <fileset dir="${appletjars.dir}" includes="**/*"/> </jar> - <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - <delete file="${jmol.applet.build.dir}/JmolAppletSigned.jar.temp" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Console.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Image.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Image.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Minimize.jar" - 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> - </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_Navigate.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Navigate.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Parallel.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Parallel.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Popup.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned.jar" /> - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersCif.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersCif.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersPdb.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersPdb.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMolXyz.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersMore.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMore.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersQuantum.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersQuantum.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersPyMOL.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersPyMOL.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersSimple.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersSimple.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersXtal.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXtal.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXml.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ScriptExt.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ScriptExt.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ShapeBio.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeBio.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSpecial.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Spectrum.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Spectrum.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - - <for list="${all.JmolApplet.languages}" delimiter="," - param="current.Jmol.language"> - <sequential> - <signjar jar="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar" - signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n_@{current.Jmol.language}.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - </sequential> - </for> - - <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> - <!-- this one must be treated specially because of jar indexing - we cannot simply rename the jar file, because the index has - the old name (JmolApplet?.jar) inside it --> - <jar destfile="${jmol.applet.build.dir}/JmolAppletSigned0.jar" - manifest="manifest/applet0.txt" + <jar destfile="${tempjar}" + manifest="manifest/appletSigned0.txt" index="true"> <!-- javax/vecmath --> <fileset dir="${appletjars.dir}" includes="**/*"/> @@ -1114,137 +965,172 @@ <fileset dir="${jmol.applet.build.dir}" includes="JmolAppletSigned0_i18n_*.jar" /> </indexjars> </jar> - <signjar jar="${jmol.applet.build.dir}/JmolAppletSigned0.jar" - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --> - - <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> - <!-- this one must be treated specially because of jar indexing - we cannot simply rename the jar file, because the index has - the old name (JmolApplet?.jar) inside it --> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0.jar" /> - <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --> - - <!-- huh? Why this? - <for list="${all.JmolApplet.languages}" delimiter="," param="current.Jmol.language"> <sequential> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_i18n_@{current.Jmol.language}.jar" - manifest="manifest/applet_i18n.txt" > - <fileset dir="${applet.classes.dir}"> - <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" /> - </fileset> + <jar destfile="${tempjar}" + manifest="manifest/applet_i18nSigned.txt" > + <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/translation/JmolApplet/@{current.Jmol.language}/**" /> + </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_i18n_@{current.Jmol.language}.jar" /> </sequential> </for> - --> - - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Console.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/console/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Image.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/dialog/**" /> <include name="org/jmol/image/**" /> </fileset> </jar> - - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" manifest="manifest/applet.txt"> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Image.jar"/> + + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/minimize/**/**" /> <include name="org/jmol/modelkit/**" /> <include name="org/jmol/modelkit/images/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Minimize.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Navigate.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" + manifest="manifest/appletSigned.txt" index="true" > + <fileset dir="${applet.classes.dir}" > + <include name="org/jmol/multitouch/**" /> + <include name="com/sparshui/**" /> + </fileset> + </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_MultiTouch.jar"/> + + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/navigate/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Navigate.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Parallel.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/parallel/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Parallel.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/popup/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Popup.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/adapter/readers/molxyz/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMolXyz.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersCif.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/adapter/readers/cif/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersCif.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersPdb.jar" manifest="manifest/applet.txt"> + + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/adapter/readers/pdb/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersPdb.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersQuantum.jar" manifest="manifest/applet.txt"> + + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> + <include name="org/jmol/adapter/readers/more/**" /> + <include name="org/jmol/io2/**" /> + </fileset> + </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersMore.jar"/> + + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> + <fileset dir="${applet.classes.dir}"> <include name="org/jmol/adapter/readers/quantum/**" /> <include name="org/jmol/quantum/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersQuantum.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersPyMOL.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/adapter/readers/pymol/**" /> <include name="org/jmol/rendercgo/**" /> <include name="org/jmol/shapecgo/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersPyMOL.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersMore.jar" manifest="manifest/applet.txt"> - <fileset dir="${applet.classes.dir}"> - <include name="org/jmol/adapter/readers/more/**" /> - <include name="org/jmol/io2/**" /> - </fileset> - </jar> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersSimple.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/adapter/readers/simple/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersSimple.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersXtal.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/adapter/readers/xtal/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXtal.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ReadersXml.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/adapter/readers/xml/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ReadersXml.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ScriptExt.jar" manifest="manifest/applet.txt" > + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt" > <fileset dir="${applet.classes.dir}"> <include name="org/jmol/scriptext/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ScriptExt.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeBio.jar" manifest="manifest/applet.txt" > + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt" > <fileset dir="${applet.classes.dir}"> <include name="org/jmol/modelsetbio/**" /> <include name="org/jmol/dssx/**" /> @@ -1252,104 +1138,55 @@ <include name="org/jmol/renderbio/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeBio.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" manifest="manifest/applet.txt" > + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt" > <fileset dir="${applet.classes.dir}"> <include name="org/jmol/shapespecial/**" /> <include name="org/jmol/renderspecial/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSpecial.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" manifest="manifest/applet.txt" > + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt" > <fileset dir="${applet.classes.dir}"> <include name="org/jmol/jvxl/**" /> <include name="org/jmol/shapesurface/**" /> <include name="org/jmol/rendersurface/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_ShapeSurface.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/smiles/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Smiles.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Spectrum.jar" manifest="manifest/applet.txt"> + + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/spectrum/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Spectrum.jar"/> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" manifest="manifest/applet.txt"> + <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> <fileset dir="${applet.classes.dir}"> <include name="org/jmol/symmetry/**" /> </fileset> </jar> + <signjar jar="${tempjar}" keystore="${sign.store}" storepass="${sign.pass}" alias="${sign.alias}" + signedjar="${jmol.applet.build.dir}/JmolAppletSigned0_Symmetry.jar"/> - <!-- vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv --> - <!-- changes to this must be replicated below for the signed applet --> - <jar destfile="${jmol.applet.build.dir}/JmolApplet0.jar" - index="true" > - <!-- javax/vecmath --> - <fileset dir="${appletjars.dir}" includes="**/*"/> - <fileset dir="${applet.classes.dir}"> - <include name="JmolApplet*.class" /> - <include name="jmol75x29x8.gif" /> - <include name="javajs/api/**" /> - <include name="javajs/awt/**" /> - <include name="javajs/util/**" /> - <include name="org/jmol/adapter/smarter/**" /> - <include name="org/jmol/api/**" /> - <include name="org/jmol/applet/**" /> - <include name="org/jmol/atomdata/**" /> - <include name="org/jmol/awt/**" /> - <include name="org/jmol/bspt/**" /> - <include name="org/jmol/constant/**" /> - <include name="org/jmol/g3d/**" /> - <include name="org/jmol/geodesic/**" /> - <include name="org/jmol/i18n/**" /> - <include name="org/jmol/java/**" /> - <include name="org/jmol/modelset/**" /> - <include name="org/jmol/render/**" /> - <include name="org/jmol/script/**" /> - <include name="org/jmol/scriptext/**" /> - <include name="org/jmol/shape/**" /> - <include name="org/jmol/thread/**" /> - <include name="org/jmol/util/**" /> - <include name="org/jmol/io/**" /> - <exclude name="org/jmol/util/BitSet32.class" /> - <include name="org/jmol/viewer/**" /> - </fileset> + <delete file="{tempjar}" /> - <!-- changes to this must be replicated below for the signed applet --> - <indexjars> - <!-- 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_Image.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Minimize.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Navigate.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Parallel.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Popup.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersCif.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersPdb.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ReadersMolXyz.jar" /> - <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_ReadersPyMOL.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_ShapeBio.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSpecial.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_ShapeSurface.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Smiles.jar" /> - <pathelement path="${jmol.applet.build.dir}/JmolApplet0_Symmetry.jar" /> - <fileset dir="${jmol.applet.build.dir}" includes="JmolApplet0_i18n_*.jar" /> - </indexjars> - </jar> - - - <!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ --> </target> <target name="smiles-applet-jar" id="smiles-applet-jar" @@ -1361,11 +1198,17 @@ </fileset> <fileset dir="${applet.classes.dir}" > <include name="JmolSmiles*" /> - <include name="org/jmol/smiles/**" /> + <include name="javajs/util/ArrayUtil.class" /> + <include name="javajs/util/List.class" /> + <include name="javajs/util/T3.class" /> + <include name="javajs/util/P3.class" /> + <include name="javajs/util/V3.class" /> + <include name="javajs/util/SB.class" /> + <include name="javajs/util/ParserJS.class" /> <include name="org/jmol/api/SmilesMatcherInterface.class" /> <include name="org/jmol/constant/**" /> - <include name="org/jmol/util/ArrayUtil.class" /> - <include name="org/jmol/util/BS.class" /> + <include name="org/jmol/java/BS.class" /> + <include name="org/jmol/smiles/**" /> <include name="org/jmol/util/BSUtil.class" /> <include name="org/jmol/util/JmolEdge.class" /> <include name="org/jmol/util/JmolNode.class" /> @@ -1374,12 +1217,7 @@ <include name="org/jmol/util/Elements.class" /> <include name="org/jmol/util/Logger.class" /> <include name="org/jmol/util/LoggerInterface.class" /> - <include name="org/jmol/util/TextFormat.class" /> - <include name="org/jmol/util/Tuple3f.class" /> - <include name="org/jmol/util/JmolList.class" /> - <include name="org/jmol/util/P3.class" /> - <include name="org/jmol/util/V3.class" /> - <include name="org/jmol/util/SB.class" /> + <include name="org/jmol/util/Txt.class" /> </fileset> </jar> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2013-11-01 00:23:04
|
Revision: 18891 http://sourceforge.net/p/jmol/code/18891 Author: hansonr Date: 2013-11-01 00:23:01 +0000 (Fri, 01 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-01 00:21:33 UTC (rev 18890) +++ trunk/Jmol/build.xml 2013-11-01 00:23:01 UTC (rev 18891) @@ -1152,8 +1152,7 @@ <include name="org/jmol/thread/**" /> <include name="org/jmol/util/**" /> <include name="org/jmol/io/**" /> - <exclude name="org/jmol/util/BitSet32.class" /> - <include name="org/jmol/viewer/**" /> + <include name="org/jmol/viewer/**" /> </fileset> <indexjars> <pathelement path="${jmol.applet.build.dir}/JmolAppletSigned0_Console.jar" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2013-11-05 21:43:04
|
Revision: 18912 http://sourceforge.net/p/jmol/code/18912 Author: nicove Date: 2013-11-05 21:43:01 +0000 (Tue, 05 Nov 2013) Log Message: ----------- Refactoring for jar signing to allow for an other certificate instead of the self-signed one Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-05 21:14:54 UTC (rev 18911) +++ trunk/Jmol/build.xml 2013-11-05 21:43:01 UTC (rev 18912) @@ -863,7 +863,7 @@ </indexjars> </jar> <if> - <available file="resouces/certificate/Jmol.p12" /> + <available file="resources/certificate/Jmol.p12" /> <then> <signjar keystore="resources/certificate/Jmol.p12" storetype="pkcs12" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2013-11-06 17:27:28
|
Revision: 18916 http://sourceforge.net/p/jmol/code/18916 Author: nicove Date: 2013-11-06 17:27:25 +0000 (Wed, 06 Nov 2013) Log Message: ----------- Refactoring for jar signing to allow for an other certificate instead of the self-signed one Modified Paths: -------------- trunk/Jmol/build.xml Modified: trunk/Jmol/build.xml =================================================================== --- trunk/Jmol/build.xml 2013-11-06 15:15:15 UTC (rev 18915) +++ trunk/Jmol/build.xml 2013-11-06 17:27:25 UTC (rev 18916) @@ -940,7 +940,7 @@ </jar> <antcall target="sign-jar-file"> <param name="sign-jar-file-src" value="${tempjar}" /> - <param name="sign-jar-file-dest" value="${jmol.build.dir}/JmolAppletSigned.jar" /> + <param name="sign-jar-file-dest" value="${jmol.applet.build.dir}/JmolAppletSigned.jar" /> </antcall> <echo message="Creating JmolAppletsigned0xxx.jar" /> @@ -1002,7 +1002,7 @@ </jar> <antcall target="sign-jar-file"> <param name="sign-jar-file-src" value="${tempjar}" /> - <param name="sign-jar-file-dest" value="${jmol.applet.build.dir}/JmolAppletSigned0_Multitouch.jar" /> + <param name="sign-jar-file-dest" value="${jmol.applet.build.dir}/JmolAppletSigned0_MultiTouch.jar" /> </antcall> <jar destfile="${tempjar}" manifest="manifest/appletSigned.txt"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |