[libpostgresql-jdbc-java] 76/128: Respect the ${srcdir} property for all source file references in ant script.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag REL9_3_1100
in repository libpostgresql-jdbc-java.

commit 44f23f9af74000412e7183177e30f5df2bbc580e
Author: Bryan Varner <bvarner at polarislabs.com>
Date:   Fri Jun 21 11:39:35 2013 -0400

    Respect the ${srcdir} property for all source file references in ant script.
    
    This makes it possible to restructure the build (in the future?) so that source and artifact files (.java and .class) are not intermingled in the same directories on disk.
---
 build.xml | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/build.xml b/build.xml
index 20ba56e..245f4e3 100644
--- a/build.xml
+++ b/build.xml
@@ -198,7 +198,7 @@
 
   <target name="check_driver">
     <uptodate targetfile="${package}/Driver.java" property="driver.uptodate">
-      <srcfiles dir=".">
+      <srcfiles dir="${srcdir}">
       <include name="${package}/Driver.java.in"/>
       <include name="${package}/ds/PGSimpleDataSource.java.in"/>
       <include name="${package}/ds/PGPoolingDataSource.java.in"/>
@@ -313,33 +313,33 @@
     <!-- Put a check for the current version here -->
 
     <!-- now copy and filter the file -->
-    <copy file="${package}/Driver.java.in"
+    <copy file="${srcdir}/${package}/Driver.java.in"
           overwrite="true"
-          tofile="${package}/Driver.java"
+          tofile="${srcdir}/${package}/Driver.java"
           filtering="yes" />
-    <copy file="${package}/ds/PGPoolingDataSource.java.in"
+    <copy file="${srcdir}/${package}/ds/PGPoolingDataSource.java.in"
           overwrite="true"
-          tofile="${package}/ds/PGPoolingDataSource.java"
+          tofile="${srcdir}/${package}/ds/PGPoolingDataSource.java"
           filtering="yes" />
-    <copy file="${package}/ds/PGSimpleDataSource.java.in"
+    <copy file="${srcdir}/${package}/ds/PGSimpleDataSource.java.in"
           overwrite="true"
-          tofile="${package}/ds/PGSimpleDataSource.java"
+          tofile="${srcdir}/${package}/ds/PGSimpleDataSource.java"
           filtering="yes" />
-    <copy file="${package}/ds/PGPooledConnection.java.in"
+    <copy file="${srcdir}/${package}/ds/PGPooledConnection.java.in"
           overwrite="true"
-          tofile="${package}/ds/PGPooledConnection.java"
+          tofile="${srcdir}/${package}/ds/PGPooledConnection.java"
           filtering="yes" />
-    <copy file="${package}/ds/PGConnectionPoolDataSource.java.in"
+    <copy file="${srcdir}/${package}/ds/PGConnectionPoolDataSource.java.in"
           overwrite="true"
-          tofile="${package}/ds/PGConnectionPoolDataSource.java"
+          tofile="${srcdir}/${package}/ds/PGConnectionPoolDataSource.java"
           filtering="yes" />
-    <copy file="${package}/xa/PGXADataSource.java.in"
+    <copy file="${srcdir}/${package}/xa/PGXADataSource.java.in"
           overwrite="true"
-          tofile="${package}/xa/PGXADataSource.java"
+          tofile="${srcdir}/${package}/xa/PGXADataSource.java"
           filtering="yes" />
-    <copy file="${package}/ssl/MakeSSL.java.in"
+    <copy file="${srcdir}/${package}/ssl/MakeSSL.java.in"
           overwrite="true"
-          tofile="${package}/ssl/MakeSSL.java"
+          tofile="${srcdir}/${package}/ssl/MakeSSL.java"
           filtering="yes" />
 
   <echo message="Configured build for the ${edition} edition driver." />
@@ -363,13 +363,13 @@
   <target name="clean">
     <delete quiet="true" dir="${builddir}" />
     <delete quiet="true" dir="${jardir}" />
-    <delete quiet="true" file="${package}/Driver.java" />
-    <delete quiet="true" file="${package}/ds/PGPoolingDataSource.java" />
-    <delete quiet="true" file="${package}/ds/PGSimpleDataSource.java" />
-    <delete quiet="true" file="${package}/ds/PGPooledConnection.java" />
-    <delete quiet="true" file="${package}/ds/PGConnectionPoolDataSource.java" />
-    <delete quiet="true" file="${package}/xa/PGXADataSource.java" />
-    <delete quiet="true" file="${package}/ssl/MakeSSL.java" />
+    <delete quiet="true" file="${srcdir}/${package}/Driver.java" />
+    <delete quiet="true" file="${srcdir}/${package}/ds/PGPoolingDataSource.java" />
+    <delete quiet="true" file="${srcdir}/${package}/ds/PGSimpleDataSource.java" />
+    <delete quiet="true" file="${srcdir}/${package}/ds/PGPooledConnection.java" />
+    <delete quiet="true" file="${srcdir}/${package}/ds/PGConnectionPoolDataSource.java" />
+    <delete quiet="true" file="${srcdir}/${package}/xa/PGXADataSource.java" />
+    <delete quiet="true" file="${srcdir}/${package}/ssl/MakeSSL.java" />
   </target>
 
   <!-- This compiles and executes the JUnit tests -->
@@ -460,7 +460,7 @@
         <pathelement path="${builddir}" />
         <pathelement path="${java.class.path}" />
       </classpath>
-      <fileset dir="${package}">
+      <fileset dir="${srcdir}/${package}">
         <include name="copy/*.java" />
         <include name="geometric/*.java" />
         <include name="largeobject/*.java" />
@@ -486,7 +486,7 @@
         <pathelement path="${builddir}" />
         <pathelement path="${java.class.path}" />
       </classpath>
-      <fileset dir="${package}">
+      <fileset dir="${srcdir}/${package}">
         <include name="**/*.java"/>
 	<exclude name="jdbc3/Jdbc3*.java" unless="jdbc3" />
 	<exclude name="jdbc3g/Jdbc3g*.java" unless="jdbc3g" />

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git