[Cdk-commits] CVS: cdk build.xml,1.168,1.169 CHANGELOG,1.226,1.227

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

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

Modified Files:
	build.xml CHANGELOG 
Log Message:
Refactored build process (closes #883519)

Index: build.xml
===================================================================
RCS file: /cvsroot/cdk/cdk/build.xml,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- build.xml	20 Jan 2004 15:09:37 -0000	1.168
+++ build.xml	24 Jan 2004 19:50:13 -0000	1.169
@@ -176,9 +176,38 @@
                 <delete dir="${reports.tests}" />
         </target>
 
+        <target name="compileDoclet" id="compileDoclet">
+            <javac srcdir="doc/javadoc/source" destdir="doc/javadoc" 
+                   includes="MakeJavaFilesFilesDoclet.java">
+                <classpath>
+                    <fileset dir="${java.ext.dirs}">
+                        <include name="tools.jar" />
+                    </fileset>
+                </classpath>
+            </javac>
+        </target>
+
+        <target name="src.star.javafiles" id="src.star.javafiles" depends="compileDoclet">
+            <javadoc private="false" public="true">
+                <classpath refid="project.class.path" />
+        
+                <doclet name="MakeJavaFilesFilesDoclet" path="${doc}/javadoc"/>
+        
+                <packageset dir="${src}">
+                    <include name="org/openscience/cdk/**"/>
+                </packageset>
+            </javadoc>
+            <move todir="${src}">
+                <fileset dir=".">
+                  <include name="*.javafiles"/>
+                </fileset>
+            </move>
+        </target>
+        
         <target id="compile" name="compile" 
             description="Compiles the CDK."
-            depends="init, info, compile-core, compile-standard, compile-extra, compile-io, 
+            depends="init, info, src.star.javafiles, 
+                     compile-core, compile-standard, compile-extra, compile-io, 
                      compile-render, compile-render-with-java3d, compile-libio,
                      compile-apps">
         </target>

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/cdk/cdk/CHANGELOG,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- CHANGELOG	21 Jan 2004 15:32:38 -0000	1.226
+++ CHANGELOG	24 Jan 2004 19:50:45 -0000	1.227
@@ -7,9 +7,11 @@
 * Added a JPanel of the periodic table
 
 Fixes:
+* cdk-* shell wrapper now accept -X java options (closes #882990)
+* Refactored build process (closes #883519)
 
 API changes:
-* Moved a number of Swing based classes to cdk.applications.swing
+* Moved a number of Swing based classes to cdk.applications.swing (addresses #847584)
 
 20040120 Release
 ------------------------------------