[Proxool-cvs] proxool build.xml,1.22,1.23

[<bil...@us...>]

Update of /cvsroot/proxool/proxool
In directory sc8-pr-cvs1:/tmp/cvs-serv21116

Modified Files:
	build.xml 
Log Message:
new version approach

Index: build.xml
===================================================================
RCS file: /cvsroot/proxool/proxool/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** build.xml	16 Jan 2003 12:00:35 -0000	1.22
--- build.xml	21 Jan 2003 10:56:40 -0000	1.23
***************
*** 26,32 ****
      <property name="debug" value="false"/>
  
!     <!-- Current version -->
      <property name="version" value="0.6.*"/>
  
      <!-- Log4J configuration to use for testing. See proxool-ant.properties
      file for more infomation. -->
--- 26,35 ----
      <property name="debug" value="false"/>
  
!     <!-- Current version e.g. 0.6.* -->
      <property name="version" value="0.6.*"/>
  
+     <!-- Currect release, e.g. 0.6 -->
+     <property name="release" value="0.6" />
+ 
      <!-- Log4J configuration to use for testing. See proxool-ant.properties
      file for more infomation. -->
***************
*** 34,45 ****
  
      <!-- Classpath -->
!     <path id="classpath" path="${build-dir}/classes" >
          <fileset dir="lib">
              <include name="**/*.jar"/>
          </fileset>
      </path>
  
      <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
!         <classpath refid="classpath"/>
      </taskdef>
  
--- 37,56 ----
  
      <!-- Classpath -->
!     <path id="source" path="${build-dir}/classes" >
          <fileset dir="lib">
              <include name="**/*.jar"/>
          </fileset>
      </path>
+     <path id="binary">
+         <fileset dir="lib">
+             <include name="**/*.jar"/>
+         </fileset>
+         <fileset dir="jar">
+             <include name="**/*.jar"/>
+         </fileset>
+     </path>
  
      <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
!         <classpath refid="source"/>
      </taskdef>
  
***************
*** 137,146 ****
          <antcall target="build-src-test"/>
  
-         <replace
-             file="${build-dir}/src/java/org/logicalcobwebs/proxool/Version.java"
-             token="RELEASE = null"
-             value='RELEASE = "${version} (${TODAY})"'
-             />
- 
      </target>
  
--- 148,151 ----
***************
*** 151,155 ****
          >
          <javac srcdir="${build-dir}/src/java" destdir="${build-dir}/classes" debug="${debug}">
!             <classpath refid="classpath"/>
  		</javac>
          <!-- Copy dtd's into the compiled classes directory. -->
--- 156,160 ----
          >
          <javac srcdir="${build-dir}/src/java" destdir="${build-dir}/classes" debug="${debug}">
!             <classpath refid="source"/>
  		</javac>
          <!-- Copy dtd's into the compiled classes directory. -->
***************
*** 169,173 ****
          </manifest>
          <jar
!             jarfile="${build-dir}/proxool-${version}.jar"
              basedir="${build-dir}/classes"
              manifest="${build-dir}/etc/MANIFEST.MF"
--- 174,178 ----
          </manifest>
          <jar
!             jarfile="${build-dir}/proxool-${release}.jar"
              basedir="${build-dir}/classes"
              manifest="${build-dir}/etc/MANIFEST.MF"
***************
*** 222,226 ****
          depends="init,build-test"
          >
!         <java fork="yes" classpathref="classpath" classname="junit.textui.TestRunner" >
              <sysproperty key="log4jPath" value="${log4jPath}" />
              <sysproperty key="script" value="src/java-test/org/logicalcobwebs/proxool/script.xml" />
--- 227,231 ----
          depends="init,build-test"
          >
!         <java fork="yes" classpathref="source" classname="junit.textui.TestRunner" >
              <sysproperty key="log4jPath" value="${log4jPath}" />
              <sysproperty key="script" value="src/java-test/org/logicalcobwebs/proxool/script.xml" />
***************
*** 259,262 ****
--- 264,283 ----
          <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>
+ 
+     <target
+         name="source-version"
+         description="Outputs the source version"
+         depends="init,compile"
+         >
+         <java classpathref="source" classname="org.logicalcobwebs.proxool.Version" />
+     </target>
+ 
+     <target
+         name="binary-version"
+         description="Outputs the source version"
+         depends="init"
+         >
+         <java classpathref="binary" classname="org.logicalcobwebs.proxool.Version" />
      </target>