From: Marko Kreen <marko@l-t.ee>
To: Juhan-Peep Ernits <juhan@cc.ioc.ee>
Cc: pgsql-interfaces@postgresql.org
Cc: pgsql-patches@postgresql.org
Cc: peter@retep.org.uk
Subject: Re: org.postgresql.Driver.java compile problem
Date: Mon, 19 Mar 2001 21:30:59 +0200
Message-ID: <20010319213059.A13446@l-t.ee> (raw)
In-Reply-To: <Pine.GSO.4.21.0103191259340.22709-100000@suhkur.cc.ioc.ee>
References: <Pine.GSO.4.21.0103191259340.22709-100000@suhkur.cc.ioc.ee>
Try the following patch.
- ant 1.2 does not understand defines after target
- ant 1.2 cannot create .jar without manifest file
On Mon, Mar 19, 2001 at 01:06:30PM +0200, Juhan-Peep Ernits wrote:
> I got the CVS version today and tried to compile postgres and jdbc
> driver. The latter did not succeed without manual intervention, since
> Driver.java is not parsed correctly:
>
> ${major} and ${minor} stay unreplaced
>
> and generate error while compiling.
>
> Java is IBM-SDK1.3 and ant is Ant version 1.2 compiled on October 24 2000.
>
>
> May be I do something wrong, but the same procedure has succeeded earlier,
> that failed today.
Dunno if you noticed it or not: do not use ant directly in jdbc/
dir, use make.
--
marko
inline patch 1: pgsql/contrib/retep/build.xml, pgsql/contrib/retep/manifest, pgsql/src/interfaces/jdbc/Makefile and 2 more (+19/-6 lines) download inline-1.patchdiff -urNX /home/marko/misc/diff-exclude pgsql.orig/contrib/retep/build.xml pgsql/contrib/retep/build.xml
--- pgsql.orig/contrib/retep/build.xml Mon Mar 19 20:52:45 2001+++ pgsql/contrib/retep/build.xml Mon Mar 19 15:27:29 2001@@ -43,7 +43,8 @@
<!-- Builds the various jar files -->
<target name="jar" depends="compile">
- <jar jarfile="${jars}/retepTools.jar" basedir="${dest}">+ <jar jarfile="${jars}/retepTools.jar" basedir="${dest}"+ manifest="manifest">
<include name="${package}/**" />
</jar>
</target>
diff -urNX /home/marko/misc/diff-exclude pgsql.orig/contrib/retep/manifest pgsql/contrib/retep/manifest
--- pgsql.orig/contrib/retep/manifest Thu Jan 1 03:00:00 1970+++ pgsql/contrib/retep/manifest Mon Mar 19 15:27:38 2001@@ -0,0 +1,2 @@+Manifest-Version: 1.0+
diff -urNX /home/marko/misc/diff-exclude pgsql.orig/src/interfaces/jdbc/Makefile pgsql/src/interfaces/jdbc/Makefile
--- pgsql.orig/src/interfaces/jdbc/Makefile Mon Mar 19 20:53:50 2001+++ pgsql/src/interfaces/jdbc/Makefile Mon Mar 19 20:55:38 2001@@ -20,12 +20,12 @@
-Ddef_pgport=$(DEF_PGPORT)
all:
- $(ANT) -buildfile $(top_srcdir)/build.xml $(properties)+ $(ANT) $(properties) -buildfile $(top_srcdir)/build.xml
install: installdirs
$(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java \
- -buildfile $(top_srcdir)/build.xml \- install $(properties)+ $(properties) -buildfile $(top_srcdir)/build.xml \+ install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(datadir)/java
diff -urNX /home/marko/misc/diff-exclude pgsql.orig/src/interfaces/jdbc/build.xml pgsql/src/interfaces/jdbc/build.xml
--- pgsql.orig/src/interfaces/jdbc/build.xml Mon Mar 19 20:53:14 2001+++ pgsql/src/interfaces/jdbc/build.xml Mon Mar 19 15:24:13 2001@@ -15,6 +15,9 @@
<property name="dest" value="build" />
<property name="package" value="org/postgresql" />
+ <!-- for some reason ant 1.2 cannot create jar without manifest file -->+ <property name="manifest" value="${src}/manifest" />+
<!--
defaults for the tests - overide these if required
junit.ui is one of textui, awtui or swingui
@@ -135,8 +138,13 @@
<!-- This builds the jar file containing the driver -->
<target name="jar" depends="compile,examples">
- <jar jarfile="${jars}/postgresql.jar" basedir="${dest}" includes="${package}/**" excludes="${package}/test/**"/>- <jar jarfile="${jars}/postgresql-examples.jar" basedir="${dest}" includes="example/**" />+ <jar jarfile="${jars}/postgresql.jar" basedir="${dest}"+ includes="${package}/**"+ excludes="${package}/test/**"+ manifest="${manifest}"/>+ <jar jarfile="${jars}/postgresql-examples.jar" basedir="${dest}"+ includes="example/**"+ manifest="${manifest}"/>
</target>
<!--
diff -urNX /home/marko/misc/diff-exclude pgsql.orig/src/interfaces/jdbc/manifest pgsql/src/interfaces/jdbc/manifest
--- pgsql.orig/src/interfaces/jdbc/manifest Thu Jan 1 03:00:00 1970+++ pgsql/src/interfaces/jdbc/manifest Mon Mar 19 15:16:23 2001@@ -0,0 +1,2 @@+Manifest-Version: 1.0+
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-interfaces@postgresql.org
Cc: marko@l-t.ee, juhan@cc.ioc.ee, pgsql-patches@postgresql.org, peter@retep.org.uk
Subject: Re: org.postgresql.Driver.java compile problem
In-Reply-To: <20010319213059.A13446@l-t.ee>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox