Thread: Fix for ANT ane 'make clean'

Fix for ANT ane 'make clean'

From
Bruce Momjian
Date:
I was finding that 'make clean' was failing with java ant.

This patch fixes the problem by using filesets with <delete>.  Without
it, the build/ and jars/ directories were not be deleted.

Applied to CVS.

--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 853-3000
  +  If your life is a hard drive,     |  830 Blythe Avenue
  +  Christ can be your backup.        |  Drexel Hill, Pennsylvania 19026
Index: contrib/retep/build.xml
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/contrib/retep/build.xml,v
retrieving revision 1.6
diff -c -r1.6 build.xml
*** contrib/retep/build.xml    2001/05/16 17:09:25    1.6
--- contrib/retep/build.xml    2001/05/17 03:20:48
***************
*** 35,42 ****

    <!-- This target removes any class files from the build directory -->
    <target name="clean">
!     <delete dir="${dest}" />
!     <delete dir="${jars}" />
    </target>

    <!-- Builds the XML Tools -->
--- 35,44 ----

    <!-- This target removes any class files from the build directory -->
    <target name="clean">
!     <delete>
!     <fileset dir="${dest}" />
!     <fileset dir="${jars}" />
!     </delete>
    </target>

    <!-- Builds the XML Tools -->
Index: src/interfaces/jdbc/build.xml
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/build.xml,v
retrieving revision 1.10
diff -c -r1.10 build.xml
*** src/interfaces/jdbc/build.xml    2001/05/16 17:09:26    1.10
--- src/interfaces/jdbc/build.xml    2001/05/17 03:21:03
***************
*** 83,90 ****

    <!-- This target removes any class files from the build directory -->
    <target name="clean">
!     <delete dir="${dest}" />
!     <delete dir="${jars}" />
      <delete file="${package}/Driver.java" />
    </target>

--- 83,92 ----

    <!-- This target removes any class files from the build directory -->
    <target name="clean">
!     <delete>
!     <fileset dir="${dest}" />
!         <fileset dir="${jars}" />
!     </delete>
      <delete file="${package}/Driver.java" />
    </target>