[Jmol-commits] CVS: Jmol apisio.classes,NONE,1.1 build.xml,1.135,1.136

[Daniel L. <dle...@us...>]

Update of /cvsroot/jmol/Jmol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31416

Modified Files:
	build.xml 
Added Files:
	apisio.classes 
Log Message:
Adding .classes for apis-jar and io-jar. Building these jars without compiling the whole Jmol source. Commenting out the copying of the samples directory into dist(-full).

--- NEW FILE: apisio.classes ---
org/jmol/viewer/Viewer.java
org/jmol/api/*.java
org/jmol/g3d/*.java
org/jmol/adapter/smarter/*.java

Index: build.xml
===================================================================
RCS file: /cvsroot/jmol/Jmol/build.xml,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- build.xml	8 Feb 2005 20:52:25 -0000	1.135
+++ build.xml	9 Feb 2005 03:37:42 -0000	1.136
@@ -23,6 +23,7 @@
   <property name="tests.classes.dir" value="build/classes-tests" />
   <property name="appletjars.dir" value="build/appletjars" />
   <property name="applet.classes.dir" value="build/applet-classes" />
+  <property name="apisio.classes.dir" value="build/apisio-classes" />
   <property name="tests.dir" value="build/unit.tests" />
   <property name="javadoc.dir" value="javadoc" />
   <property name="docbook-xsl" value="docbook-xsl-1.67.2" />
@@ -47,6 +48,14 @@
     </fileset>
   </path>
   
+  <path id="apisio-project.class.path">
+    <fileset dir="${lib.dir}">
+      <include name="vecmath1.2-1.14.jar" />
+      <include name="netscape.jar" />
+      <include name="gnujaxp.jar" />
+    </fileset>
+  </path>
+
   <target name="main" id="main" depends="init,jar,applet-jar"/>
   
   <target name="all" id="all" depends="doc,main"/>
@@ -207,6 +216,20 @@
     </copy>
   </target>
 
+  <target name="apisio-classes" id="apisio-classes" depends="init">
+    <mkdir dir="${apisio.classes.dir}"/>
+    <javac srcdir="src" destdir="${apisio.classes.dir}"
+	   debug="${debug}" deprecation="${deprecation}"
+	   optimize="${optimization}" source="1.4"
+	   includesfile="apisio.classes"
+	   classpathref="apisio-project.class.path" />
+    <copy todir="${classes.dir}" >
+      <fileset dir="src">
+	<include name="**/g3d/*.html" />
+      </fileset>
+    </copy>
+  </target>
+
   <target name="check.cdkjars" id="check.cdkjars">
     <uptodate property="cdkjars.uptodate" targetfile="${appjars.dir}/org/openscience/cdk">
       <srcfiles dir="${lib.dir}" includes="jmol2cdk.jar"/>
@@ -281,9 +304,9 @@
     </jar>
   </target>
 
-  <target name="apis-jar" id="apis-jar" depends="init,classes">
+  <target name="apis-jar" id="apis-jar" depends="init,apisio-classes">
     <jar jarfile="jmolApis.jar">
-      <fileset dir="${classes.dir}" >
+      <fileset dir="${apisio.classes.dir}" >
 	<include name="org/jmol/api/**" />
       </fileset>
       <fileset dir="." >
@@ -292,9 +315,9 @@
     </jar>
   </target>
 
-  <target name="io-jar" id="io-jar" depends="init,classes">
+  <target name="io-jar" id="io-jar" depends="init,apisio-classes">
     <jar jarfile="jmolIO.jar">
-      <fileset dir="${classes.dir}" >
+      <fileset dir="${apisio.classes.dir}" >
 	<include name="org/jmol/adapter/smarter/**" />
       </fileset>
       <fileset dir="." >
@@ -497,11 +520,12 @@
       </fileset>
     </copy>
 
-    <copy todir="build/dist/jmol-${version}/samples" >
+    <!-- remove if really obsolete - for now only uncommented -->
+    <!-- <copy todir="build/dist/jmol-${version}/samples" >
       <fileset dir="samples">
 	<exclude name="**/CVS"/>
       </fileset>
-    </copy>
+    </copy> -->
 
     <copy   file="build/doc/JmolDevelopersGuide.html"
 	    tofile="build/dist/jmol-${version}/doc/JmolDevelopersGuide.html" />