Resolve a number of oddities in the Java build. First, remove the weird

redirections between the build files, which didn't work completely.  Now
you just go to the directory of your choice and run make.  Clean up the
build files to have a logical order, fix the unnecessary rebuilds, prevent
the deleting targets from removing files they're not responsible for.  Ant
1.3 does not have a bug.  It deletes directories just fine if you follow
the documentation.

diff --git a/build.xml b/build.xml
deleted file mode 100644 (file)
index daee9f4..0000000
--- a/build.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-  
-  
-    
-      
-    
-  
-
-  
-  
-    
-      
-    
-  
-
-  
-  
-    
-    
-      
-    
-  
-
-  
-    
-      
-    
-  
-
-  
-  
-    
-    
-  
-
-
-  

diff --git a/contrib/Makefile b/contrib/Makefile
index 7b3bbcb6fe03c940a283219cf2adb7a92134ed74..79dfa28ce4491d0a883ad5acc94d9484310c9dd3 100644 (file)
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.22 2001/06/18 17:20:56 momjian Exp $
+# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.23 2001/07/06 23:07:19 petere Exp $
 
 subdir = contrib
 top_builddir = ..
@@ -38,6 +38,11 @@ WANTED_DIRS = \
        userlock    \
        vacuumlo    
 
+ifeq ($(with_java),yes)
+WANTED_DIRS += retep
+endif
+
+
 all install installdirs uninstall clean distclean maintainer-clean:
    for dir in $(WANTED_DIRS); do \
        if [ -f $$dir/Makefile ]; then \

diff --git a/contrib/retep/Makefile b/contrib/retep/Makefile
new file mode 100644 (file)
index 0000000..e5de9c7
--- /dev/null
+++ b/contrib/retep/Makefile
@@ -0,0 +1,30 @@
+#-------------------------------------------------------------------------
+#
+# Makefile for contributed retep tools
+#
+# Copyright (c) 2001, PostgreSQL Global Development Group
+#
+# $Header: /cvsroot/pgsql/contrib/retep/Attic/Makefile,v 1.1 2001/07/06 23:07:20 petere Exp $
+#
+#-------------------------------------------------------------------------
+
+subdir = contrib/retep
+top_builddir = ../..
+include $(top_builddir)/src/Makefile.global
+
+all:
+   $(ANT) -buildfile $(srcdir)/build.xml all
+
+install: installdirs
+   $(ANT) -buildfile $(srcdir)/build.xml install \
+     -Dinstall.directory=$(javadir)
+
+installdirs:
+   $(mkinstalldirs) $(javadir)
+
+uninstall:
+   $(ANT) -buildfile $(srcdir)/build.xml uninstall \
+     -Dinstall.directory=$(javadir)
+
+clean distclean maintainer-clean:
+   $(ANT) -buildfile $(srcdir)/build.xml clean

diff --git a/contrib/retep/build.xml b/contrib/retep/build.xml
index 9fbc0f61ac57a0dcf6c01c4fe3ac2beb37d4b2c6..04a8db5c2f01186452a6f51c8ba5e1cee39d218f 100644 (file)
--- a/contrib/retep/build.xml
+++ b/contrib/retep/build.xml
@@ -1,18 +1,23 @@
+
 
 
-
+
+  
+]>
+
+
 
   
-  "     value="." />
-  dest"    value="build" />
+  dir"  value="." />
+  builddir" value="build" />
   
-  s"    value="jars" />
+  dir"  value="jars" />
 
   
   
@@ -23,53 +28,71 @@
   
 
   
-    
+    
+*** WARNING: Contributed retep tools need jdk1.2 or later.
+***          Compilation NOT done
+    
   
 
 
-  
-  
-    
-    
+  
+  
+    
   
 
-  
-  
-    
-    
-    
-    
-  
+
+  
+  
+    
+       
+         
+       
+
+       
+         
+       
+    
+   
+
 
   
   
-    }" destdir="${dest}">
+    dir}" destdir="${builddir}">
       
       
     
   
 
-  
-  <target name="jar" depends="compile">
-    
-      " />
-    </jar>
+
+  <!-- Prepares the build by creating a directory to place the class files -->
+  ">
+    " />
+    <mkdir dir="${jardir}" />
   
 
-  
+
+  
     
-      s}">
-        **/*.jar" />
+      dir}">
+        &jarname;" />
       
     
   
 
+
   
     
       
-        **/*.jar" />
+        &jarname;" />
       
     
   
 
+
+  
+  
+    
+    
+  
+
 


diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile

index c40de4e0bc0ecb976dc4dc35d1c2880ca573185d..311645a6c65b2d3f66247712856aadfe19a0a616 100644 (file)

--- a/src/interfaces/jdbc/Makefile
+++ b/src/interfaces/jdbc/Makefile
@@ -1,10 +1,10 @@
 #-------------------------------------------------------------------------
 #
-# Makefile for src/interfaces
+# Makefile for JDBC driver
 #
-# Copyright (c) 1994, Regents of the University of California
+# Copyright (c) 2001, PostgreSQL Global Development Group
 #
-# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.32 2001/06/07 20:24:54 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.33 2001/07/06 23:07:20 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,22 +20,22 @@ properties := -Dmajor=$(majorversion) -Dminor=$(minorversion) \
        -Ddef_pgport=$(DEF_PGPORT)
 
 all:
-   $(ANT) -buildfile $(top_srcdir)/build.xml $(properties)
+   $(ANT) -buildfile $(srcdir)/build.xml all \
+     $(properties)
 
 install: installdirs
-   $(ANT) -Dinstall.directory=$(javadir) \
-       -buildfile $(top_srcdir)/build.xml \
-       install $(properties)
+   $(ANT) -buildfile $(srcdir)/build.xml install \
+     -Dinstall.directory=$(javadir) $(properties)
 
 installdirs:
-   $(mkinstalldirs) $(DESTDIR)$(datadir)/java
+   $(mkinstalldirs) $(javadir)
 
 uninstall:
-   $(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java \
-       -buildfile $(top_srcdir)/build.xml \
-       uninstall
+   $(ANT) -buildfile $(srcdir)/build.xml uninstall \
+     -Dinstall.directory=$(javadir)
 
 clean distclean maintainer-clean:
-   $(ANT) -buildfile $(top_srcdir)/build.xml clean
-   # ANT 1.3 has a bug that prevents directory deletion
-   rm -rf build jars
+   $(ANT) -buildfile $(srcdir)/build.xml clean
+
+check:
+   $(ANT) -buildfile $(srcdir)/build.xml test


diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml

index 9d70e2cbb8a30601ab2a54b5cc1d66a8b6660fd9..114d05813b0ca969ff3cbdd469f921a5804ce5d1 100644 (file)

--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -1,31 +1,25 @@
+
 
 
-
+
+  
+]>
+
+
 
   
-  "     value="." />
-  s"    value="jars" />
-  dest"    value="build" />
+  dir"  value="." />
+  dir"  value="jars" />
+  builddir" value="build" />
   
 
-  
-  
-  
-  
-  
-  
 
   
+  
+    
+  
+
+
+  
+  
+    
+      
+        
+        
+      
+
+      
+        
+      
+    
+
+    
+      
+        
+      
+
+      
+        
+      
+    
+  
+
+
+  
+  
+    
+      
+
+      
+      
+
+      
+      
+
+      
+      
+
+      
+    
+  
+
+
   
   
-
     
     
     
@@ -71,115 +115,94 @@
           tofile="${package}/Driver.java"
           filtering="yes" />
 
-    
-
+    
   
 
-  
-  
-    
-    
-   
-       
-    
-    
-  
 
   
   
-    dest}" />
-    s}" />
+    builddir}" />
+    dir}" />
   
 
-  
-  
-    
-      
-      
-      
-      
-      
-      
-      
-      
-    
-    
-      
-        
-        
-      
-    
-  
 
   
   
-    }" destdir="${dest}">
+    dir}" destdir="${builddir}">
       
       
       
     
   
 
+
   
   
-    
+    dir}/example/corba" executable="idl2java">
       
     
-    
+
+    
       
     
   
 
-  
-  
-    
-    
-  
 
-  
-  
-    
-      
-        
-      
+
+  
+  
+    
+      
     
   
 
-  
+
+  
   
     
-      
-        
-      
+      
     
   
 
-  
+
+
+  
+  
+    
+    
+    
+  
+
+
+
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+
   
-    }" destdir="${dest}">
+    dir}" destdir="${builddir}">
       
       
     
+
     
       
       
       
       
       
-        dest}" />
+        builddir}" />
         
       
     
   
+
 

diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile
index c40de4e0bc0ecb976dc4dc35d1c2880ca573185d..311645a6c65b2d3f66247712856aadfe19a0a616 100644 (file)
--- a/src/interfaces/jdbc/Makefile
+++ b/src/interfaces/jdbc/Makefile
@@ -1,10 +1,10 @@
 #-------------------------------------------------------------------------
 #
-# Makefile for src/interfaces
+# Makefile for JDBC driver
 #
-# Copyright (c) 1994, Regents of the University of California
+# Copyright (c) 2001, PostgreSQL Global Development Group
 #
-# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.32 2001/06/07 20:24:54 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.33 2001/07/06 23:07:20 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -20,22 +20,22 @@ properties := -Dmajor=$(majorversion) -Dminor=$(minorversion) \
        -Ddef_pgport=$(DEF_PGPORT)
 
 all:
-   $(ANT) -buildfile $(top_srcdir)/build.xml $(properties)
+   $(ANT) -buildfile $(srcdir)/build.xml all \
+     $(properties)
 
 install: installdirs
-   $(ANT) -Dinstall.directory=$(javadir) \
-       -buildfile $(top_srcdir)/build.xml \
-       install $(properties)
+   $(ANT) -buildfile $(srcdir)/build.xml install \
+     -Dinstall.directory=$(javadir) $(properties)
 
 installdirs:
-   $(mkinstalldirs) $(DESTDIR)$(datadir)/java
+   $(mkinstalldirs) $(javadir)
 
 uninstall:
-   $(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java \
-       -buildfile $(top_srcdir)/build.xml \
-       uninstall
+   $(ANT) -buildfile $(srcdir)/build.xml uninstall \
+     -Dinstall.directory=$(javadir)
 
 clean distclean maintainer-clean:
-   $(ANT) -buildfile $(top_srcdir)/build.xml clean
-   # ANT 1.3 has a bug that prevents directory deletion
-   rm -rf build jars
+   $(ANT) -buildfile $(srcdir)/build.xml clean
+
+check:
+   $(ANT) -buildfile $(srcdir)/build.xml test

diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index 9d70e2cbb8a30601ab2a54b5cc1d66a8b6660fd9..114d05813b0ca969ff3cbdd469f921a5804ce5d1 100644 (file)
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -1,31 +1,25 @@
+
 
 
-
+
+  
+]>
+
+
 
   
-  "     value="." />
-  s"    value="jars" />
-  dest"    value="build" />
+  dir"  value="." />
+  dir"  value="jars" />
+  builddir" value="build" />
   
 
-  
-  
-  
-  
-  
-  
 
   
+  
+    
+  
+
+
+  
+  
+    
+      
+        
+        
+      
+
+      
+        
+      
+    
+
+    
+      
+        
+      
+
+      
+        
+      
+    
+  
+
+
+  
+  
+    
+      
+
+      
+      
+
+      
+      
+
+      
+      
+
+      
+    
+  
+
+
   
   
-
     
     
     
@@ -71,115 +115,94 @@
           tofile="${package}/Driver.java"
           filtering="yes" />
 
-    
-
+    
   
 
-  
-  
-    
-    
-   
-       
-    
-    
-  
 
   
   
-    dest}" />
-    s}" />
+    builddir}" />
+    dir}" />
   
 
-  
-  
-    
-      
-      
-      
-      
-      
-      
-      
-      
-    
-    
-      
-        
-        
-      
-    
-  
 
   
   
-    }" destdir="${dest}">
+    dir}" destdir="${builddir}">
       
       
       
     
   
 
+
   
   
-    
+    dir}/example/corba" executable="idl2java">
       
     
-    
+
+    
       
     
   
 
-  
-  
-    
-    
-  
 
-  
-  
-    
-      
-        
-      
+
+  
+  
+    
+      
     
   
 
-  
+
+  
   
     
-      
-        
-      
+      
     
   
 
-  
+
+
+  
+  
+    
+    
+    
+  
+
+
+
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+
   
-    }" destdir="${dest}">
+    dir}" destdir="${builddir}">
       
       
     
+
     
       
       
       
       
       
-        dest}" />
+        builddir}" />
         
       
     
   
+