Update of /cvsroot/jprojecttimer/jprojecttimer
In directory usw-pr-cvs1:/tmp/cvs-serv13764
Modified Files:
MANIFEST README build.xml
Log Message:
jdom.jar is included correctly in jprojecttimer.jar
build.xml uses variables
(Patches by Tim O'Brien)
Index: MANIFEST
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/MANIFEST,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MANIFEST 2001/03/20 22:17:37 1.1.1.1
--- MANIFEST 2002/01/26 16:32:21 1.2
***************
*** 1,2 ****
--- 1,4 ----
Manifest-Version: 1.0
Main-Class: de.cgarbs.apps.jprojecttimer.JProjectTimer
+ Class-Path: ./lib/jdom.jar
+
Index: README
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/README,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** README 2002/01/25 21:55:50 1.7
--- README 2002/01/26 16:32:21 1.8
***************
*** 39,43 ****
* Tim O'Brien <to...@di...>
! submission of build.xml, suggestion of using ant
* Jochen Luell <jo...@lu...>
--- 39,43 ----
* Tim O'Brien <to...@di...>
! code submissions, build.xml
* Jochen Luell <jo...@lu...>
Index: build.xml
===================================================================
RCS file: /cvsroot/jprojecttimer/jprojecttimer/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml 2002/01/25 21:55:50 1.1
--- build.xml 2002/01/26 16:32:21 1.2
***************
*** 7,62 ****
<property environment="env"/>
<target name="init">
<tstamp/>
- <property name="version" value="0.0.6-pre1"/>
</target>
<target name="prepare" depends="init">
! <mkdir dir="classes"/>
! <mkdir dir="docs/javadoc"/>
</target>
<target name="compile" depends="prepare">
! <javac debug="on" optimize="off" srcdir="." destdir="classes" excludes="**/Makefile">
! <classpath>
! <pathelement location="lib/jdom.jar"/>
! <pathelement path="${env.CLASSPATH}"/>
! </classpath>
</javac>
! <copy todir="classes">
! <fileset dir="." includes="*.properties"/>
! <fileset dir="lib/" includes="*"/>
</copy>
</target>
<target name="jar" depends="compile">
! <jar jarfile="JProjectTimer-${version}.jar" basedir="classes" manifest="MANIFEST"/>
</target>
<target name="javadoc" depends="prepare">
<javadoc Public="yes" Use="yes" packagenames="de.cgarbs.*"
! sourcepath="."
! destdir="docs/javadoc" Author="Yes" Version="Yes">
! <!--<link href="http://java.sun.com/products/jdk/1.3/docs/api"/>-->
</javadoc>
</target>
! <target name="run" depends="compile">
! <java classname="de.cgarbs.apps.jprojecttimer.JProjectTimer"
fork="yes"
! failonerror="yes">
! <classpath>
! <pathelement location="jprojecttimer.jar"/>
! <pathelement path="${env.CLASSPATH}"/>
! </classpath>
! </java>
</target>
<target name="clean" depends="init">
! <delete dir="classes"/>
! <delete dir="docs/javadoc"/>
! <delete file="jprojecttimer.jar"/>
</target>
</project>
--- 7,74 ----
<property environment="env"/>
+ <!-- Global Properties -->
+ <property name="project.name" value="JProjectTimer"/>
+ <property name="project.version" value="0.0.6-pre1"/>
+
+ <!-- Directory properties -->
+ <property name="base.dir" value="."/>
+ <property name="lib.dir" value="${base.dir}/lib"/>
+ <property name="classes.dir" value="${base.dir}/classes"/>
+ <property name="docs.dir" value="${base.dir}/docs"/>
+ <property name="javadoc.dir" value="${docs.dir}/javadoc"/>
+
+ <!-- A Common classpath for both compiling and executing -->
+ <path id="classpath">
+ <pathelement location="${lib.dir}/jdom.jar"/>
+ <pathelement location="${project.name}-${project.version}.jar"/>
+ </path>
+
<target name="init">
<tstamp/>
</target>
<target name="prepare" depends="init">
! <mkdir dir="${classes.dir}"/>
! <mkdir dir="${docs.dir}"/>
! <mkdir dir="${javadoc.dir}"/>
</target>
<target name="compile" depends="prepare">
! <javac debug="on" optimize="off" srcdir="."
! destdir="${classes.dir}" excludes="**/Makefile">
! <classpath refid="classpath"/>
</javac>
! <copy todir="${classes.dir}">
! <fileset dir="${base.dir}" includes="*.properties"/>
</copy>
</target>
<target name="jar" depends="compile">
! <jar jarfile="${project.name}-${project.version}.jar"
! basedir="${classes.dir}" manifest="MANIFEST"/>
</target>
<target name="javadoc" depends="prepare">
<javadoc Public="yes" Use="yes" packagenames="de.cgarbs.*"
! sourcepath="${base.dir}"
! destdir="${javadoc.dir}" Author="Yes" Version="Yes">
! <classpath refid="classpath"/>
</javadoc>
</target>
! <target name="run" depends="jar">
! <java jar="${project.name}-${project.version}.jar"
fork="yes"
! failonerror="yes"/>
</target>
<target name="clean" depends="init">
! <delete dir="${classes.dir}"/>
! <delete dir="${javadoc.dir}"/>
! <delete file="${project.name}-${project.version}.jar"/>
</target>
</project>
+
+
|
