proxool-cvs

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

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

Modified Files:
	build.xml 
Log Message:
cleaned up the way we build for each jdk

Index: build.xml
===================================================================
RCS file: /cvsroot/proxool/proxool/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** build.xml	4 Mar 2003 10:26:46 -0000	1.43
--- build.xml	5 Mar 2003 18:53:06 -0000	1.44
***************
*** 27,37 ****
  
      <!-- Currect release, e.g. 0.6 -->
!     <property name="release" value="0.7" />
  
      <!-- Currect release, e.g. 0.6 -->
!     <property name="junit-report-description" value="Unit Test Report for CVS Snapshot" />
  
      <!-- Currect release, e.g. 0.6 -->
!     <property name="junit-report-name" value="junit-cvs.html" />
  
      <!-- Log4J configuration to use for testing. See proxool-ant.properties
--- 27,37 ----
  
      <!-- Currect release, e.g. 0.6 -->
!     <property name="release" value="0.7"/>
  
      <!-- Currect release, e.g. 0.6 -->
!     <property name="junit-report-description" value="Unit Test Report for CVS Snapshot"/>
  
      <!-- Currect release, e.g. 0.6 -->
!     <property name="junit-report-name" value="junit-cvs.html"/>
  
      <!-- Log4J configuration to use for testing. See proxool-ant.properties
***************
*** 40,44 ****
  
      <!-- Classpath -->
!     <path id="source" path="${build-dir}/classes" >
          <fileset dir="lib">
              <include name="**/*.jar"/>
--- 40,44 ----
  
      <!-- Classpath -->
!     <path id="source" path="${build-dir}/classes">
          <fileset dir="lib">
              <include name="**/*.jar"/>
***************
*** 67,71 ****
              <format property="TODAY_FULL" pattern="dd-MMM-yyyy HH:mm zzz"/>
          </tstamp>
!         <mkdir dir="${build-dir}/src/java" description="make source directory" />
          <mkdir dir="${build-dir}/etc"/>
          <mkdir dir="${build-dir}/deploy"/>
--- 67,71 ----
              <format property="TODAY_FULL" pattern="dd-MMM-yyyy HH:mm zzz"/>
          </tstamp>
!         <mkdir dir="${build-dir}/src/java" description="make source directory"/>
          <mkdir dir="${build-dir}/etc"/>
          <mkdir dir="${build-dir}/deploy"/>
***************
*** 196,200 ****
          <javac srcdir="${build-dir}/src/java" destdir="${build-dir}/classes" debug="${debug}">
              <classpath refid="source"/>
! 		</javac>
          <!-- Copy dtd's and properties into the compiled classes directory. -->
          <copy todir="${build-dir}/classes">
--- 196,200 ----
          <javac srcdir="${build-dir}/src/java" destdir="${build-dir}/classes" debug="${debug}">
              <classpath refid="source"/>
!         </javac>
          <!-- Copy dtd's and properties into the compiled classes directory. -->
          <copy todir="${build-dir}/classes">
***************
*** 209,213 ****
          depends="init,build-src,compile"
          >
!         <manifest file="${build-dir}/etc/MANIFEST.MF" >
              <attribute name="Proxool-Version" value="${version}"/>
              <attribute name="Date" value="${TODAY}"/>
--- 209,213 ----
          depends="init,build-src,compile"
          >
!         <manifest file="${build-dir}/etc/MANIFEST.MF">
              <attribute name="Proxool-Version" value="${version}"/>
              <attribute name="Date" value="${TODAY}"/>
***************
*** 226,232 ****
          >
          <echo level="verbose" message="Using JDK1.2"/>
!         <copy todir="${build-dir}/src/java" preservelastmodified="yes">
!             <fileset dir="src/java" includes="**/*.java" excludes="**/Jdk14Logger.java"/>
!         </copy>
          <copy todir="${build-dir}/src/java" overwrite="yes">
              <fileset dir="src/java-jdk1.2" includes="**/*.java"/>
--- 226,230 ----
          >
          <echo level="verbose" message="Using JDK1.2"/>
!         <antcall target="build-src-common"/>
          <copy todir="${build-dir}/src/java" overwrite="yes">
              <fileset dir="src/java-jdk1.2" includes="**/*.java"/>
***************
*** 235,238 ****
--- 233,248 ----
  
      <target
+         name="build-src-common"
+         depends="init"
+         >
+         <copy todir="${build-dir}/src/java" preservelastmodified="yes">
+             <fileset
+                 dir="src/java"
+                 includes="**/*.java"
+                 excludes="**/Jdk14Logger.java,**/ProxyCallableStatement.java,**/ProxyConnection.java,**/ProxyDatabaseMetData.java,**/ProxyFactory.java,**/ProxyPreparedStatement.java,**/ShutdownHook.java,**/StatsRoller.java"/>
+         </copy>
+     </target>
+ 
+     <target
          name="build-src-jdk1.3"
          depends="init"
***************
*** 293,299 ****
          depends="clean,init,build-test,deleteTestDb"
          >
!         <java fork="yes" classpathref="source" classname="junit.textui.TestRunner" >
!             <sysproperty key="log4jPath" value="${log4jPath}" />
!             <arg value="org.logicalcobwebs.proxool.GlobalTest" />
          </java>
      </target>
--- 303,309 ----
          depends="clean,init,build-test,deleteTestDb"
          >
!         <java fork="yes" classpathref="source" classname="junit.textui.TestRunner">
!             <sysproperty key="log4jPath" value="${log4jPath}"/>
!             <arg value="org.logicalcobwebs.proxool.GlobalTest"/>
          </java>
      </target>
***************
*** 305,311 ****
          >
  
!         <junit fork="true" printsummary="yes" >
              <classpath refid="source"/>
!             <sysproperty key="log4jPath" value="${log4jPath}" />
              <batchtest todir="${build-dir}/reports">
                  <fileset dir="src/java-test"
--- 315,321 ----
          >
  
!         <junit fork="true" printsummary="yes">
              <classpath refid="source"/>
!             <sysproperty key="log4jPath" value="${log4jPath}"/>
              <batchtest todir="${build-dir}/reports">
                  <fileset dir="src/java-test"
***************
*** 314,331 ****
                      />
              </batchtest>
!             <formatter type="xml" />
          </junit>
  
  
          <junitreport>
!             <fileset dir="${build-dir}/reports" >
!                 <include name="TEST-*.xml" />
              </fileset>
!             <report format="noframes" todir="${build-dir}/reports" />
          </junitreport>
  
          <move
              file="${build-dir}/reports/junit-noframes.html"
!             tofile="${build-dir}/reports/${junit-report-name}" />
  
          <replace
--- 324,341 ----
                      />
              </batchtest>
!             <formatter type="xml"/>
          </junit>
  
  
          <junitreport>
!             <fileset dir="${build-dir}/reports">
!                 <include name="TEST-*.xml"/>
              </fileset>
!             <report format="noframes" todir="${build-dir}/reports"/>
          </junitreport>
  
          <move
              file="${build-dir}/reports/junit-noframes.html"
!             tofile="${build-dir}/reports/${junit-report-name}"/>
  
          <replace
***************
*** 349,356 ****
              windowtitle="Proxool Developer's API}"
              private="true"
!         >
!             <sourcepath path="src/java" />
!             <sourcepath path="src/java-test" />
!             <sourcepath path="src/java-sandbox" />
          </javadoc>
  
--- 359,366 ----
              windowtitle="Proxool Developer's API}"
              private="true"
!             >
!             <sourcepath path="src/java"/>
!             <sourcepath path="src/java-test"/>
!             <sourcepath path="src/java-sandbox"/>
          </javadoc>
  
***************
*** 363,370 ****
              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>
  
--- 373,384 ----
              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>
  
***************
*** 374,378 ****
          depends="init,compile"
          >
!         <java classpathref="source" classname="org.logicalcobwebs.proxool.Version" />
      </target>
  
--- 388,392 ----
          depends="init,compile"
          >
!         <java classpathref="source" classname="org.logicalcobwebs.proxool.Version"/>
      </target>
  
***************
*** 382,386 ****
          depends="init"
          >
!         <java classpathref="binary" classname="org.logicalcobwebs.proxool.Version" />
      </target>
  
--- 396,400 ----
          depends="init"
          >
!         <java classpathref="binary" classname="org.logicalcobwebs.proxool.Version"/>
      </target>