Menu
▾
▴
[Jcharts-cvs] krysalis-jcharts build.xml,1.5,1.6
|
From: <nat...@us...> - 2003-08-30 15:45:19
|
Update of /cvsroot/jcharts/krysalis-jcharts
In directory sc8-pr-cvs1:/tmp/cvs-serv31650
Modified Files:
build.xml
Log Message:
got war task working so can run servlet demos again
Index: build.xml
===================================================================
RCS file: /cvsroot/jcharts/krysalis-jcharts/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.xml 28 Aug 2003 02:04:52 -0000 1.5
--- build.xml 30 Aug 2003 15:45:15 -0000 1.6
***************
*** 8,12 ****
= environment variables needed:
=
- = J2EE_HOME - if you want to compile the example servlets
= TOMCAT_HOME - if you want to automatically build and deploy on TOMCAT
=============================================================================================-->
--- 8,11 ----
***************
*** 14,38 ****
<project name="Krysalis-jCharts" default="compile" basedir=".">
! <property environment="environment" />
! <property name="project.name" value="krysalis-jCharts" />
! <property name="project.version" value="1.0.0" />
! <property name="jar.jCharts" value="${project.name}-${project.version}.jar" />
! <property name="zip.jCharts" value="${project.name}-${project.version}.zip" />
! <property name="servletExamples" value="jChartsServletExamples" />
! <property name="servletExamples.war" value="${servletExamples}.war" />
! <property name="dir.release" value="delete_me/${project.name}-${project.version}" />
! <property name="dir.src" value="src/java" />
! <property name="dir.build" value="delete_me" />
! <property name="dir.javadocs" value="${dir.release}/javadocs" />
! <property name="batik.classpath" value="lib/batik-svggen.jar;lib/batik-dom.jar;lib/batik-awt-util.jar" />
! <property name="demo.classpath" value="${jar.jCharts};${environment.J2EE_HOME}/lib/j2ee.jar" />
--- 13,39 ----
<project name="Krysalis-jCharts" default="compile" basedir=".">
! <property environment="environment"/>
! <property name="project.name" value="krysalis-jCharts"/>
! <property name="project.version" value="1.0.0"/>
! <property name="jar.jCharts" value="${project.name}-${project.version}.jar"/>
! <property name="zip.jCharts" value="${project.name}-${project.version}.zip"/>
! <property name="servletExamples" value="jChartsServletExamples"/>
! <property name="servletExamples.war" value="${servletExamples}.war"/>
! <property name="dir.release" value="delete_me/${project.name}-${project.version}"/>
! <property name="dir.src" value="src/java"/>
! <property name="dir.build" value="delete_me"/>
! <property name="dir.javadocs" value="${dir.release}/javadocs"/>
! <property name="batik.classpath" value="lib/batik-svggen.jar;lib/batik-dom.jar;lib/batik-awt-util.jar"/>
! <property name="j2ee.classpath" value="lib/servlet_2_2.jar"/>
!
! <property name="demo.classpath" value="${jar.jCharts};${environment.J2EE_HOME}/lib/j2ee.jar"/>
***************
*** 40,51 ****
<target name="prepare">
<tstamp/>
! <delete dir="${dir.build}" />
! <mkdir dir="${dir.build}" />
</target>
! <!--===============================================================================-->
<target name="compile" depends="prepare">
! <javac classpath="${batik.classpath};${environment.J2EE_HOME}/lib/j2ee.jar" srcdir="${dir.src}" destdir="${dir.build}" />
</target>
--- 41,52 ----
<target name="prepare">
<tstamp/>
! <delete dir="${dir.build}"/>
! <mkdir dir="${dir.build}"/>
</target>
! <!--=== Compiles **ALL** the source ===============================================================-->
<target name="compile" depends="prepare">
! <javac classpath="${batik.classpath};${j2ee.classpath}" srcdir="${dir.src}" destdir="${dir.build}"/>
</target>
***************
*** 55,67 ****
<target name="compile13" depends="prepare">
<javac classpath="${batik.classpath};${environment.J2EE_HOME}/lib/j2ee.jar"
! srcdir="${dir.src}"
! destdir="${dir.build}"
! fork="yes"
! executable="${environment.JAVA13_HOME}/bin/javac">
! <exclude name="**/encoders/JPEGEncoder.java" />
! <exclude name="**/encoders/PNGEncoder.java" />
! <exclude name="**/encoders/ServletEncoderHelper.java" />
! <exclude name="**/test/*" />
</javac>
</target>
--- 56,68 ----
<target name="compile13" depends="prepare">
<javac classpath="${batik.classpath};${environment.J2EE_HOME}/lib/j2ee.jar"
! srcdir="${dir.src}"
! destdir="${dir.build}"
! fork="yes"
! executable="${environment.JAVA13_HOME}/bin/javac">
! <exclude name="**/encoders/JPEGEncoder.java"/>
! <exclude name="**/encoders/PNGEncoder.java"/>
! <exclude name="**/encoders/ServletEncoderHelper.java"/>
! <exclude name="**/test/*"/>
</javac>
</target>
***************
*** 70,79 ****
<!--===============================================================================-->
<target name="test" depends="compile">
! <java classname="org.krysalis.jcharts.test.ChartTestDriver">
! <arg value="" />
! <classpath>
! <pathelement path="${dir.build}"/>
! <pathelement path="../lib"/>
! </classpath>
</java>
</target>
--- 71,80 ----
<!--===============================================================================-->
<target name="test" depends="compile">
! <java classname="org.krysalis.jcharts.test.ChartTestDriver">
! <arg value=""/>
! <classpath>
! <pathelement path="${dir.build}"/>
! <pathelement path="../lib"/>
! </classpath>
</java>
</target>
***************
*** 84,93 ****
<!-- generates the samples used on the web site. -->
<target name="websiteSamples" depends="compile">
! <java classname="org.krysalis.jcharts.demo.samples.Sample">
! <arg value="./src/documentation/resources/images" />
! <classpath>
! <pathelement path="${dir.build}"/>
! <pathelement path="../lib"/>
! </classpath>
</java>
</target>
--- 85,94 ----
<!-- generates the samples used on the web site. -->
<target name="websiteSamples" depends="compile">
! <java classname="org.krysalis.jcharts.demo.samples.Sample">
! <arg value="./src/documentation/resources/images"/>
! <classpath>
! <pathelement path="${dir.build}"/>
! <pathelement path="../lib"/>
! </classpath>
</java>
</target>
***************
*** 96,106 ****
<!--===============================================================================-->
<target name="jar" depends="compile">
! <delete file="${jar.jCharts}" />
<jar jarfile="${jar.jCharts}">
! <fileset dir="${dir.build}" >
! <exclude name="**/simpleservlet/**" />
! <exclude name="**/designer/**" />
! <exclude name="**/userGuide/**" />
! <exclude name="**/samples/**" />
</fileset>
</jar>
--- 97,107 ----
<!--===============================================================================-->
<target name="jar" depends="compile">
! <delete file="${jar.jCharts}"/>
<jar jarfile="${jar.jCharts}">
! <fileset dir="${dir.build}">
! <exclude name="**/simpleservlet/**"/>
! <exclude name="**/designer/**"/>
! <exclude name="**/userGuide/**"/>
! <exclude name="**/samples/**"/>
</fileset>
</jar>
***************
*** 110,125 ****
<!--===============================================================================-->
<target name="javadocs">
! <delete dir="${dir.javadocs}" />
! <mkdir dir="${dir.javadocs}" />
<javadoc sourcepath="${dir.src}"
! classpath="${batik.classpath};${environment.J2EE_HOME}/lib/j2ee.jar"
! destdir="${dir.javadocs}"
! packagenames="org.krysalis.jcharts.*"
! excludepackagenames="javax.*,org.krysalis.jcharts.designer.*,org.krysalis.jcharts.demo.*"
! author="true"
! private="true"
! version="true"
! windowtitle="${project.name}-${project.version} API"
! doctitle="${project.name}-${project.version}">
</javadoc>
</target>
--- 111,126 ----
<!--===============================================================================-->
<target name="javadocs">
! <delete dir="${dir.javadocs}"/>
! <mkdir dir="${dir.javadocs}"/>
<javadoc sourcepath="${dir.src}"
! classpath="${batik.classpath};${environment.J2EE_HOME}/lib/j2ee.jar"
! destdir="${dir.javadocs}"
! packagenames="org.krysalis.jcharts.*"
! excludepackagenames="javax.*,org.krysalis.jcharts.designer.*,org.krysalis.jcharts.demo.*"
! author="true"
! private="true"
! version="true"
! windowtitle="${project.name}-${project.version} API"
! doctitle="${project.name}-${project.version}">
</javadoc>
</target>
***************
*** 131,136 ****
<target name="release" depends="jar">
! <delete dir="${dir.release}" />
! <mkdir dir="${dir.release}" />
--- 132,137 ----
<target name="release" depends="jar">
! <delete dir="${dir.release}"/>
! <mkdir dir="${dir.release}"/>
***************
*** 140,149 ****
<!--======== jCharts.jar ==============================================-->
! <move file="${jar.jCharts}" todir="${dir.release}" />
<!--======== jCharts source ===========================================-->
<copy todir="${dir.release}/${dir.src}">
<fileset dir="../${dir.src}">
! <include name="**/*.java" />
</fileset>
</copy>
--- 141,150 ----
<!--======== jCharts.jar ==============================================-->
! <move file="${jar.jCharts}" todir="${dir.release}"/>
<!--======== jCharts source ===========================================-->
<copy todir="${dir.release}/${dir.src}">
<fileset dir="../${dir.src}">
! <include name="**/*.java"/>
</fileset>
</copy>
***************
*** 152,157 ****
<copy todir="${dir.release}/demo">
<fileset dir="../demo">
! <include name="**/*.java" />
! <include name="**/*.xml" />
</fileset>
</copy>
--- 153,158 ----
<copy todir="${dir.release}/demo">
<fileset dir="../demo">
! <include name="**/*.java"/>
! <include name="**/*.xml"/>
</fileset>
</copy>
***************
*** 159,169 ****
<!--======== servlet examples war =====================================-->
! <move file="${servletExamples.war}" todir="${dir.release}" />
<!--======== servlet examples source ==================================-->
<copy todir="${dir.release}/${dir.servletsApp}">
<fileset dir="../demo/simpleServlet/">
! <exclude name="**/*.class" />
! <exclude name="**/*.jar" />
</fileset>
</copy>
--- 160,170 ----
<!--======== servlet examples war =====================================-->
! <move file="${servletExamples.war}" todir="${dir.release}"/>
<!--======== servlet examples source ==================================-->
<copy todir="${dir.release}/${dir.servletsApp}">
<fileset dir="../demo/simpleServlet/">
! <exclude name="**/*.class"/>
! <exclude name="**/*.jar"/>
</fileset>
</copy>
***************
*** 176,185 ****
<!--======== build directory ===========================================-->
! <mkdir dir="${dir.release}/build" />
! <copy file="build.xml" todir="${dir.release}/build" />
<!--======== docs directory ============================================-->
<copy todir="${dir.release}/docs">
! <fileset dir="../docs" />
</copy>
--- 177,186 ----
<!--======== build directory ===========================================-->
! <mkdir dir="${dir.release}/build"/>
! <copy file="build.xml" todir="${dir.release}/build"/>
<!--======== docs directory ============================================-->
<copy todir="${dir.release}/docs">
! <fileset dir="../docs"/>
</copy>
***************
*** 187,234 ****
<!--======== lib directory ============================================-->
<copy todir="${dir.release}/lib">
! <fileset dir="../lib" />
</copy>
<!--======== make the ZIP file =========================================-->
! <delete file="${zip.jCharts}" />
<zip zipfile="${zip.jCharts}">
! <fileset dir="${dir.release}/.." />
</zip>
! <delete dir="${dir.release}/.." />
</target>
- <!--== Target no longer needed ===================================================-->
- <!--== Target no longer needed ===================================================-->
- <!--== Target no longer needed ===================================================-->
- <target name="compileExamples" depends="jar">
- <javac classpath="${demo.classpath}" srcdir="../${dir.servletsApp}/WEB-INF/classes" />
- </target>
-
<!--===============================================================================-->
<!--===============================================================================-->
<!--===============================================================================-->
! <target name="packageExamples" depends="compileExamples">
! <delete file="${servletExamples.war}" />
!
! <!-- copy file="${jar.jCharts}" todir="../${dir.servletsApp}/WEB-INF/lib" /-->
<war warfile="${servletExamples.war}" webxml="${dir.src}/org/krysalis/jcharts/demo/simpleservlet/web.xml">
! <fileset dir="${dir.src}/org/krysalis/jcharts/demo/simpleservlet/" >
! <exclude name="*.java" />
! <exclude name="web.xml" />
</fileset>
! <lib dir="lib" />
! <classes dir="${build.dir}/**/simpleServlet/*.class"/>
</war>
</target>
! <target name="deployTomcat" depends="packageExamples">
! <delete dir="${environment.TOMCAT_HOME}/webapps/${servletExamples}" />
! <delete file="${environment.TOMCAT_HOME}/webapps/${servletExamples.war}" />
! <copy file="${servletExamples.war}" todir="${environment.TOMCAT_HOME}/webapps" />
</target>
--- 188,231 ----
<!--======== lib directory ============================================-->
<copy todir="${dir.release}/lib">
! <fileset dir="../lib"/>
</copy>
<!--======== make the ZIP file =========================================-->
! <delete file="${zip.jCharts}"/>
<zip zipfile="${zip.jCharts}">
! <fileset dir="${dir.release}/.."/>
</zip>
! <delete dir="${dir.release}/.."/>
</target>
<!--===============================================================================-->
<!--===============================================================================-->
<!--===============================================================================-->
! <target name="war" depends="jar">
! <delete file="${servletExamples.war}"/>
<war warfile="${servletExamples.war}" webxml="${dir.src}/org/krysalis/jcharts/demo/simpleservlet/web.xml">
! <fileset dir="${dir.src}/org/krysalis/jcharts/demo/simpleservlet/">
! <exclude name="*.java"/>
! <exclude name="web.xml"/>
</fileset>
! <lib dir=".">
! <include name="${jar.jCharts}"/>
! </lib>
! <classes dir="${dir.build}">
! <include name="**/simpleservlet/*.class"/>
! </classes>
</war>
</target>
!
! <target name="deployTomcat" depends="war">
! <delete dir="${environment.TOMCAT_HOME}/webapps/${servletExamples}"/>
! <delete file="${environment.TOMCAT_HOME}/webapps/${servletExamples.war}"/>
! <copy file="${servletExamples.war}" todir="${environment.TOMCAT_HOME}/webapps"/>
</target>
|
