From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 4 21:40:15 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 062F016A422 for ; Tue, 4 Oct 2005 21:40:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CEF943D55 for ; Tue, 4 Oct 2005 21:40:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j94LeDe9066468 for ; Tue, 4 Oct 2005 21:40:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j94LeDKS066466; Tue, 4 Oct 2005 21:40:13 GMT (envelope-from gnats) Resent-Date: Tue, 4 Oct 2005 21:40:13 GMT Resent-Message-Id: <200510042140.j94LeDKS066466@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "\"Panagiotis Astithas\" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B854A16A41F for ; Tue, 4 Oct 2005 21:31:09 +0000 (GMT) (envelope-from past@ebs.gr) Received: from fly.ebs.gr (fly.ebs.gr [62.103.84.177]) by mx1.FreeBSD.org (Postfix) with ESMTP id C099C43D55 for ; Tue, 4 Oct 2005 21:31:08 +0000 (GMT) (envelope-from past@ebs.gr) Received: from ebs.gr (root@hal.ebs.gr [10.1.1.2]) by fly.ebs.gr (8.12.9p1/8.12.9) with ESMTP id j94LV79V087376 for ; Wed, 5 Oct 2005 00:31:07 +0300 (EEST) (envelope-from past@ebs.gr) Received: from ajax.ebs.gr (pptp.ebs.gr [10.1.1.200]) by ebs.gr (8.13.3/8.12.11) with ESMTP id j94LVIEj095721 for ; Wed, 5 Oct 2005 00:31:18 +0300 (EEST) (envelope-from past@ebs.gr) Message-Id: <1128461456.0@ajax.ebs.gr> Date: Wed, 5 Oct 2005 00:30:56 +0300 From: "\"Panagiotis Astithas\" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: ports/86902: [patch] Align devel/apache-ant invocation to the java/javavmwrapper way X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Oct 2005 21:40:15 -0000 >Number: 86902 >Category: ports >Synopsis: [patch] Align devel/apache-ant invocation to the java/javavmwrapper way >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Oct 04 21:40:13 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Panagiotis Astithas >Release: FreeBSD 6.0-BETA5 i386 >Organization: EBS Ltd. >Environment: System: FreeBSD 6.0-BETA5 #7: Mon Oct 3 22:00:16 EEST 2005 past@ajax.ebs.gr:/usr/obj/usr/src/sys/GENERIC >Description: The ant startup script that launches ant has a hardcoded default JAVA_HOME directory to that of ${JAVA_HOME}. This can be overridden by the user's setting of JAVA_HOME. However, this is not the recommended way to override the default jdk. Both javavmwrapper (a dependency of the jdk ports) and bsd.java.mk recommend the use of variables like JAVA_VERSION, JAVA_PREFERRED_PORTS, etc. One known case where the current script fails to override the default jdk, is when one has both jdk14 and jdk15 and tries to select jdk15 using JAVA_PREFERRED_PORTS. The attached patch (similar to the one in PR ports/86860) makes the default JAVA_HOME directory correspond to javavmwrapper's symlinks, in /usr/local/bin. >How-To-Repeat: Install java/jdk14, java/jdk15 and apache-ant. Set JAVA_PREFERRED_PORTS to JAVA_PORT_NATIVE_BSDJAVA_JDK_1_5. Try to use ant to build a project that contains Java 1.5 constructs. Observe the compiler errors that prove jdk14 was used. >Fix: --- ant.patch begins here --- diff -ruN /usr/ports/devel/apache-ant/files/ant apache-ant/files/ant --- /usr/ports/devel/apache-ant/files/ant Sat Apr 3 14:30:54 2004 +++ apache-ant/files/ant Wed Oct 5 00:19:49 2005 @@ -11,8 +11,8 @@ # -DEFAULT_JAVACMD=%%JAVA%% -DEFAULT_JAVA_HOME=%%JAVA_HOME%% +DEFAULT_JAVACMD=java +DEFAULT_JAVA_HOME=%%PREFIX%% DEFAULT_JIKES=false ANT_HOME=%%ANT_HOME%% @@ -38,6 +38,11 @@ # Set ANT_LIB location ANT_LIB="${ANT_HOME}/lib" + +# Determine the JDK home directory +if [ -z "${JAVA_HOME}" ]; then + JAVA_HOME=${DEFAULT_JAVA_HOME} +fi # Determine 'java' executable if [ -z "${JAVACMD}" ]; then --- ant.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: