[Cdk-commits] CVS: cdk jmol.xml,1.19,1.20

[Egon W. <eg...@us...>]

Update of /cvsroot/cdk/cdk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19444

Modified Files:
	jmol.xml 
Log Message:
Defined CDK classes for Jmol HEAD applet

Index: jmol.xml
===================================================================
RCS file: /cvsroot/cdk/cdk/jmol.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jmol.xml	17 Feb 2004 08:57:35 -0000	1.19
+++ jmol.xml	28 Feb 2004 14:44:27 -0000	1.20
@@ -34,13 +34,32 @@
     
   <target name="initAgain">
     <copy file="dist/jar/jmolappletcdk.jar" tofile="./jmolappletcdk.jar"/>
+    <copy file="dist/jar/jmol2appletcdk.jar" tofile="./jmol2appletcdk.jar"/>
     <ant antfile="build.xml" target="clean"/>
     <ant antfile="build.xml" target="init"/>
     <move file="./jmolappletcdk.jar" tofile="dist/jar/jmolappletcdk.jar"/>
+    <move file="./jmol2appletcdk.jar" tofile="dist/jar/jmol2appletcdk.jar"/>
   </target>  
     
   <target name="compile-applet">
+  <javac srcdir="${src}" destdir="${build}" optimize="${optimization}" 
+           debug="${debug}" deprecation="${deprecation}" target="1.1"
+           includesfile="${src}/jmol-applet-b6.javafiles">
+      <classpath refid="project.class.path" />
+    </javac>
+    <!-- some classes need to be overwritten with patches files -->
+    <delete>
+        <fileset dir="${build}" includes="org/openscience/cdk/tools/LoggingTool.java" />
+        <fileset dir="${build}" includes="org/openscience/cdk/tools/AtomTypeFactory.java" />
+    </delete>
+    <javac srcdir="${src}" destdir="${build}" optimize="${optimization}" 
+           debug="${debug}" deprecation="${deprecation}" target="1.1"
+           includes="jmol-applet/**/*.java">
+        <classpath refid="project.class.path" />
+    </javac>
+  </target>
 
+  <target name="compile-applet-jmol2">
     <javac srcdir="${src}" destdir="${build}" optimize="${optimization}" 
            debug="${debug}" deprecation="${deprecation}" target="1.1"
            includesfile="${src}/jmol-applet.javafiles">
@@ -99,8 +118,8 @@
   <target name="dist-applet" depends="compile-applet">
     <ant antfile="build.xml" target="dist.init"/>
     
-    <copy file="${src}/jmol-applet.javafiles" tofile="${src}/jmol-applet.classes"/>
-    <replace file="${src}/jmol-applet.classes" token=".java" value=".class"/>
+    <copy file="${src}/jmol-applet-b6.javafiles" tofile="${src}/jmol-applet-b6.classes"/>
+    <replace file="${src}/jmol-applet-b6.classes" token=".java" value=".class"/>
 
     <jar jarfile="${dist}/jar/jmolappletcdk.jar">
       <fileset dir="${build}">
@@ -117,6 +136,27 @@
     </jar>
   </target>
   
+  <target name="dist-applet-jmol2" depends="compile-applet-jmol2">
+    <ant antfile="build.xml" target="dist.init"/>
+    
+    <copy file="${src}/jmol-applet.javafiles" tofile="${src}/jmol-applet.classes"/>
+    <replace file="${src}/jmol-applet.classes" token=".java" value=".class"/>
+
+    <jar jarfile="${dist}/jar/jmol2appletcdk.jar">
+      <fileset dir="${build}">
+        <!-- Put only required class files in the jar -->
+        <includesfile name="${src}/jmol-applet.classes" />
+      </fileset>
+      <fileset dir="${src}">
+        <!-- These config and data files are also needed -->
+        <include name="**/jmol_atomtypes.txt" />
+        <include name="org/openscience/cdk/io/cml/data/**" />
+        <include name="org/openscience/cdk/config/log4j.properties" />
+        <include name="org/openscience/cdk/config/isotopes.xml" />
+      </fileset>
+    </jar>
+  </target>
+  
   <target name="dist-jmol2" depends="compile-jmol2">
     <ant antfile="build.xml" target="dist.init"/>
     
@@ -138,6 +178,6 @@
     </jar>
   </target>
   
-  <target name="dist-all" depends="init, dist-applet, initAgain, dist, dist-jmol2"/>
+  <target name="dist-all" depends="init, dist-applet, dist-applet-jmol2, initAgain, dist, dist-jmol2"/>
   
 </project>