[Jfreechart-commit] SF.net SVN: jfreechart: [76] trunk/ant/build.xml

[<mu...@us...>]

Revision: 76
          http://jfreechart.svn.sourceforge.net/jfreechart/?rev=76&view=rev
Author:   mungady
Date:     2007-06-21 08:42:04 -0700 (Thu, 21 Jun 2007)

Log Message:
-----------
Updated for removal of JCommon.

Modified Paths:
--------------
    trunk/ant/build.xml

Modified: trunk/ant/build.xml
===================================================================
--- trunk/ant/build.xml	2007-06-21 15:10:59 UTC (rev 75)
+++ trunk/ant/build.xml	2007-06-21 15:42:04 UTC (rev 76)
@@ -21,23 +21,17 @@
     <target name="initialise" description="Initialise required settings.">
         <tstamp />
         <property name="jfreechart.name" value="jfreechart" />
-        <property name="jfreechart.version" value="1.0.6" />
+        <property name="jfreechart.version" value="1.2.0-pre1" />
         <property name="jfreechart-bundle-file" value="${jfreechart.name}-${jfreechart.version}-bundle.jar" />
-        <property name="jcommon.name" value="jcommon" />
-        <property name="jcommon.version" value="1.0.10" />
-        <property name="jcommon.jar" value="${basedir}/lib/${jcommon.name}-${jcommon.version}.jar"/>
         <property name="itext.name" value="itext" />
         <property name="itext.version" value="2.0.2" />
         <property name="itext.jar" value="${basedir}/lib/${itext.name}-${itext.version}.jar"/>
         <property name="builddir" value="${basedir}/build" />
         <property name="servlet.jar" value="${basedir}/lib/servlet.jar"/>
-        <property name="gnujaxp.jar" value="${basedir}/lib/gnujaxp.jar"/>
         <property name="junit.jar" value="${basedir}/lib/junit.jar"/>
         <available classname="javax.imageio.ImageIO" property="ImageIO.present"/>
         <path id="build.classpath">
-            <pathelement location="${jcommon.jar}"/>
             <pathelement location="${servlet.jar}"/>
-            <pathelement location="${gnujaxp.jar}"/>
         </path>
 
     </target>
@@ -54,13 +48,10 @@
                destdir="${basedir}/build"
                debug="on"
                deprecation="false"
-               source="1.3"
-               target="1.3">
+               source="1.4"
+               target="1.4">
             <classpath refid="build.classpath" />
-            <include name="org/jfree/**"/>
-            <exclude name="org/jfree/chart/xml/**"/>
-            <exclude name="org/jfree/chart/encoders/SunPNGEncoderAdapter.java" unless="ImageIO.present"/>
-            <exclude name="org/jfree/chart/encoders/SunJPEGEncoderAdapter.java" unless="ImageIO.present"/>        	
+            <include name="org/jfree/**"/>       	
         </javac>
 
         <!-- copy across gorilla.jpg -->
@@ -82,6 +73,11 @@
                 <include name="*.properties" />
             </fileset>
         </copy>
+        <copy todir="${basedir}/build/org/jfree/chart/ui">
+            <fileset dir="${basedir}/source/org/jfree/chart/ui">
+                <include name="*.properties" />
+            </fileset>
+        </copy>
 
         <!-- make the jar -->
         <jar jarfile="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"
@@ -102,9 +98,7 @@
         <mkdir dir="${basedir}/build" />
 
         <path id="build.experimental.classpath">
-            <pathelement location="${jcommon.jar}"/>
             <pathelement location="${servlet.jar}"/>
-            <pathelement location="${gnujaxp.jar}"/>
             <pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
         </path>
 
@@ -113,8 +107,8 @@
                destdir="${basedir}/build"
                debug="on"
                deprecation="false"
-               source="1.3"
-               target="1.3">
+               source="1.4"
+               target="1.4">
             <classpath refid="build.experimental.classpath" />
             <include name="org/jfree/experimental/**"/>
             <exclude name="org/jfree/experimental/**/junit/*"/>
@@ -171,7 +165,6 @@
         <!-- copy across README and CHANGELOG -->
         <copy file="${basedir}/README.txt" tofile="${basedir}/distribution/README.txt" />
         <copy file="${basedir}/NEWS" tofile="${basedir}/distribution/NEWS" />
-        <copy file="${basedir}/CHANGELOG.txt" tofile="${basedir}/distribution/CHANGELOG.txt" />
         <copy file="${basedir}/ChangeLog" tofile="${basedir}/distribution/ChangeLog" />
         <copy file="${basedir}/maven-jfreechart-project.xml" tofile="${basedir}/distribution/maven-jfreechart-project.xml" />
 
@@ -187,7 +180,6 @@
         <copy todir="${basedir}/distribution/source">
             <fileset dir="${basedir}/source">
               <exclude name="**/CVS/*"/>
-              <exclude name="org/jfree/chart/xml/**"/>
             </fileset>
         </copy>
 
@@ -210,11 +202,9 @@
         </copy>    	
 
         <!-- copy across lib files -->
-        <copy file="${jcommon.jar}" tofile="${basedir}/distribution/lib/${jcommon.name}-${jcommon.version}.jar" />
         <copy file="${basedir}/lib/swtgraphics2d.jar" tofile="${basedir}/distribution/lib/swtgraphics2d.jar" />
         <copy file="${basedir}/lib/jfreechart-${jfreechart.version}-swt.jar" tofile="${basedir}/distribution/lib/${jfreechart.name}-${jfreechart.version}-swt.jar" />
         <copy file="${servlet.jar}" tofile="${basedir}/distribution/lib/servlet.jar" />
-        <copy file="${gnujaxp.jar}" tofile="${basedir}/distribution/lib/gnujaxp.jar" />
         <copy file="${junit.jar}" tofile="${basedir}/distribution/lib/junit.jar" />
         <copy file="${itext.jar}" tofile="${basedir}/distribution/lib/${itext.name}-${itext.version}.jar" />
 
@@ -280,7 +270,6 @@
     <filterchain id="version.filters">
        <replacetokens>
          <token key="VERSION" value="${jfreechart.version}"/>
-         <token key="JCOMMON.VERSION" value="${jcommon.version}"/>
        </replacetokens>
     </filterchain>
     <copy file="maven-jfreechart-project.xml" tofile="distribution/project.xml">
@@ -306,8 +295,8 @@
         <mkdir dir="${basedir}/build-tests"/>
         <javac srcdir="${basedir}/tests" 
                destdir="${basedir}/build-tests" 
-               source="1.3"
-               target="1.3" 
+               source="1.4"
+               target="1.4" 
                debug="true" 
                deprecation="false"
                optimize="false">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.