From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13527 invoked by alias); 30 May 2004 17:57:07 -0000 Mailing-List: contact rhug-rhats-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Post: List-Help: , Sender: rhug-rhats-owner@sources.redhat.com Received: (qmail 13519 invoked from network); 30 May 2004 17:57:05 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 30 May 2004 17:57:05 -0000 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i4UHvDi5031498 for ; Sun, 30 May 2004 13:57:13 -0400 Received: from potter.sfbay.redhat.com (potter.sfbay.redhat.com [172.16.27.15]) by int-mx2.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i4UHvCw02742 for ; Sun, 30 May 2004 13:57:12 -0400 Received: from [172.31.0.13] (vpn50-26.rdu.redhat.com [172.16.50.26]) by potter.sfbay.redhat.com (8.11.6/8.11.6) with ESMTP id i4UHvBP23336 for ; Sun, 30 May 2004 10:57:11 -0700 Subject: Ant 1.6.1 and fluorine patches From: Anthony Green To: rhug-rhats@sources.redhat.com Content-Type: text/plain Organization: Red Hat, Inc. Message-Id: <1085939515.2982.12.camel@localhost.localdomain> Mime-Version: 1.0 Date: Sun, 30 May 2004 17:57:00 -0000 Content-Transfer-Encoding: 7bit X-SW-Source: 2004-05/txt/msg00009.txt.bz2 I've imported Ant 1.6.1. I believe I did all the cvs tagging properly. Ant now has dependencies on rhino and jython, which are both fluorinated now. This Ant it still using gcj as the default compiler. Gary - are you planning to move the ecj configury changes to the trunk? I generated the configury with the following fluorine patches. Gary - do these look ok? java-gnome now requires org.omg.* classes, which we can get from JacORB. I think we'd rather build JacORB with ant, since the build process is somewhat complicated. However, the JacORB requires Ant 1.6 - which was my motivation for doing this. JacORB mostly builds now. It contains dependencies on javax.net, which we can get from JESSIE - but that depends on a new gnu-crypto, and the current gnu-crypto configury appears to be broken. 2004-05-28 Anthony Green * fluorine (MakefileTemplater.sub_BUILDTARGETS): Set _LIBADD to use explicit .la file references. (ConfigureTemplater.sub_PATHS): Clear the default RHUGCLASSPATH. * Makefile.am (COMMON_GCJFLAGS): Add -fno-assert. Ideally this could be set on a per-project basis. * configure.in: Fix macros for use with modern autotools. Now using automake 1.8.4, autoconf 2.59 and libtool 1.5.6. Index: Makefile.am =================================================================== RCS file: /cvs/rhug/rhug/fluorine/Makefile.am,v retrieving revision 1.8 diff -c -r1.8 Makefile.am *** Makefile.am 27 Nov 2003 12:05:14 -0000 1.8 --- Makefile.am 30 May 2004 17:35:46 -0000 *************** *** 27,33 **** ## COMMON_GCJFLAGS = --encoding=@@ENCODING@@ -Wno-deprecated \ ! --classpath=@@CLASSPATH@@ AM_GCJFLAGS = $(COMMON_GCJFLAGS) -fassume-compiled --- 27,33 ---- ## COMMON_GCJFLAGS = --encoding=@@ENCODING@@ -Wno-deprecated \ ! -fno-assert --classpath=@@CLASSPATH@@ AM_GCJFLAGS = $(COMMON_GCJFLAGS) -fassume-compiled Index: configure.in =================================================================== RCS file: /cvs/rhug/rhug/fluorine/configure.in,v retrieving revision 1.2 diff -c -r1.2 configure.in *** configure.in 19 Nov 2003 16:35:05 -0000 1.2 --- configure.in 30 May 2004 17:35:46 -0000 *************** *** 8,23 **** AM_MAINTAINER_MODE AM_PROG_LIBTOOL - - # AM_PROG_GCJ isn't good enough, we have to roll our own. - # AC_CHECK_TOOL(GCJ, gcj) - LT_AC_PROG_GCJ - test -z "$GCJ" && AC_MSG_ERROR([no acceptable gcj found in \$PATH]) - if test "x${GCJFLAGS-unset}" = xunset; then - GCJFLAGS="-g -O2" - fi - AC_SUBST(GCJFLAGS) AC_LIBTOOL_GCJ AC_CHECK_TOOL(GCJH, gcjh) --- 8,15 ---- AM_MAINTAINER_MODE + AM_PROG_GCJ AM_PROG_LIBTOOL AC_LIBTOOL_GCJ AC_CHECK_TOOL(GCJH, gcjh) Index: fluorine =================================================================== RCS file: /cvs/rhug/rhug/fluorine/fluorine,v retrieving revision 1.55 diff -c -r1.55 fluorine *** fluorine 2 Feb 2004 17:33:14 -0000 1.55 --- fluorine 30 May 2004 17:35:48 -0000 *************** *** 817,823 **** libadd = linkage.getLibLink() if linkage.packageset.project is self.project: depends.append(libdep) ! libadds.append(libadd) else: other_libadds.append(libadd) if other_libadds: --- 822,828 ---- libadd = linkage.getLibLink() if linkage.packageset.project is self.project: depends.append(libdep) ! libadds.append(libdep) else: other_libadds.append(libadd) if other_libadds: *************** *** 1054,1061 **** break return "\n" + "\n".join([ ! "RHUGCLASSPATH=" + ":".join( ! ["$datadir/java/%s.jar" % j.jarName() for j in jarfiles]), "RHUGLIBDIRS=%s" % linkdirs, "if test -d $srcdir/%s; then" % srcdirs[0], " RHUGCLASSPATH=" + ":".join(["$srcdir/%s" % d for d in srcdirs]), --- 1059,1065 ---- break return "\n" + "\n".join([ ! "RHUGCLASSPATH=", "RHUGLIBDIRS=%s" % linkdirs, "if test -d $srcdir/%s; then" % srcdirs[0], " RHUGCLASSPATH=" + ":".join(["$srcdir/%s" % d for d in srcdirs]), AG -- Anthony Green Red Hat, Inc.