Update of /cvsroot/proxool/proxool
In directory sc8-pr-cvs1:/tmp/cvs-serv533
Modified Files:
build.xml
Log Message:
cleaning up
Index: build.xml
===================================================================
RCS file: /cvsroot/proxool/proxool/build.xml,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** build.xml 11 Mar 2003 14:58:30 -0000 1.49
--- build.xml 12 Mar 2003 15:59:34 -0000 1.50
***************
*** 23,31 ****
<property name="debug" value="true"/>
- <!-- Current version e.g. 0.6.* -->
- <property name="version" value="0.7.*"/>
-
<!-- Currect release, e.g. 0.6 -->
! <property name="release" value="0.7"/>
<!-- Currect release, e.g. 0.6 -->
--- 23,28 ----
<property name="debug" value="true"/>
<!-- Currect release, e.g. 0.6 -->
! <property name="release" value="0.7.1"/>
<!-- Currect release, e.g. 0.6 -->
***************
*** 182,186 ****
name="build-src"
description="Gathers the source code together ready for compiling"
! depends="init,evaluate-properties"
>
<antcall target="build-src-jdk1.2"/>
--- 179,183 ----
name="build-src"
description="Gathers the source code together ready for compiling"
! depends="clean,init,evaluate-properties"
>
<antcall target="build-src-jdk1.2"/>
***************
*** 189,192 ****
--- 186,208 ----
<antcall target="build-src-jdk1.5"/>
<antcall target="build-src-test"/>
+ <antcall target="version-stamp"/>
+
+ </target>
+
+ <target
+ name="version-stamp"
+ if="version"
+ >
+ <replace
+ file="${build-dir}/src/java/org/logicalcobwebs/proxool/Version.java"
+ token="VERSION = null"
+ value='VERSION = "${release}"'
+ />
+
+ <replace
+ file="${build-dir}/src/java/org/logicalcobwebs/proxool/Version.java"
+ token="BUILD_DATE = null"
+ value='BUILD_DATE = "${TODAY}"'
+ />
</target>
***************
*** 213,217 ****
>
<manifest file="${build-dir}/etc/MANIFEST.MF">
! <attribute name="Proxool-Version" value="${version}"/>
<attribute name="Date" value="${TODAY}"/>
</manifest>
--- 229,233 ----
>
<manifest file="${build-dir}/etc/MANIFEST.MF">
! <attribute name="Proxool-Version" value="${release}"/>
<attribute name="Date" value="${TODAY}"/>
</manifest>
***************
*** 266,270 ****
<copy todir="${build-dir}/src/java" preservelastmodified="yes">
<fileset dir="src/java" includes="**/*.java"/>
- <fileset dir="src/java-sandbox" includes="**/*.java"/>
</copy>
</target>
--- 282,285 ----
***************
*** 307,310 ****
--- 322,326 ----
depends="clean,init,build-test,deleteTestDb"
>
+ <!--
<java fork="yes" classpathref="source" classname="junit.textui.TestRunner" >
<sysproperty key="log4jPath" value="${log4jPath}"/>
***************
*** 312,315 ****
--- 328,342 ----
<jvmarg line="${jvmargs}"/>
</java>
+ -->
+ <junit fork="true" printsummary="yes">
+ <classpath refid="source"/>
+ <sysproperty key="log4jPath" value="${log4jPath}"/>
+ <batchtest todir="${build-dir}/reports">
+ <fileset dir="src/java-test"
+ includes="**/*Test.java"
+ excludes="**/GlobalTest.java,**/AbstractProxoolTest.java"
+ />
+ </batchtest>
+ </junit>
</target>
***************
*** 365,372 ****
<target
name="javadoc"
! description="Produce Javadoc API"
depends="init,build-src,compile">
- <!-- Full documentation for use by developers -->
<javadoc
destdir="${build-dir}/api-dev"
--- 392,419 ----
<target
name="javadoc"
! description="Produce Javadoc API for users"
! depends="init,build-src,compile">
!
! <javadoc
! sourcepath="src/java"
! destdir="${build-dir}/api"
! packagenames="org.logicalcobwebs.*"
! doctitle="Proxool API}"
! windowtitle="Proxool API}"
! public="true"
! />
!
! <!-- Copy dtd's over to the doc. -->
! <copy todir="${build-dir}/api">
! <fileset dir="src/java" includes="**/*.dtd"/>
! </copy>
!
! </target>
!
! <target
! name="javadoc-dev"
! description="Produce Javadoc API for developers"
depends="init,build-src,compile">
<javadoc
destdir="${build-dir}/api-dev"
***************
*** 381,400 ****
</javadoc>
- <!-- Simple documentation for use by users -->
- <javadoc
- sourcepath="src/java"
- destdir="${build-dir}/api"
- packagenames="org.logicalcobwebs.*"
- doctitle="Proxool API}"
- windowtitle="Proxool API}"
- public="true"
- />
<!-- Copy dtd's over to the doc. -->
- <copy todir="${build-dir}/api">
- <fileset dir="src/java" includes="**/*.dtd"/>
- </copy>
<copy todir="${build-dir}/api-dev">
<fileset dir="src/java" includes="**/*.dtd"/>
</copy>
</target>
--- 428,436 ----
</javadoc>
<!-- Copy dtd's over to the doc. -->
<copy todir="${build-dir}/api-dev">
<fileset dir="src/java" includes="**/*.dtd"/>
</copy>
+
</target>
|
