changeset in /hg/icedtea: 2007-10-02 Lillian Angel <langel at red...

[Lillian Angel]

changeset ea10471637af in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ea10471637af
description:
	2007-10-02  Lillian Angel  <langel at redhat.com>

	        * Makefile.am: Removed ANT_HOME, added patch.
	        * Makefile.in: Regenerated.
	        * configure: Regenerated.
	        * configure.ac: Set --with-ant-home default to /usr/share/ant
	        * patches/icedtea-ant.patch: New patch

diffstat:

6 files changed, 37 insertions(+), 6 deletions(-)
ChangeLog                 |    8 ++++++++
Makefile.am               |    1 +
Makefile.in               |    1 +
configure                 |    6 +++---
configure.ac              |    6 +++---
patches/icedtea-ant.patch |   21 +++++++++++++++++++++

diffs (115 lines):

diff -r ba2a7d244aca -r ea10471637af ChangeLog
--- a/ChangeLog	Tue Oct 02 09:04:05 2007 -0400
+++ b/ChangeLog	Tue Oct 02 11:48:14 2007 -0400
@@ -1,3 +1,11 @@ 2007-10-02  Lillian Angel  <langel at redha
+2007-10-02  Lillian Angel  <langel at redhat.com>
+
+	* Makefile.am: Removed ANT_HOME, added patch.
+	* Makefile.in: Regenerated.
+	* configure: Regenerated.
+	* configure.ac: Set --with-ant-home default to /usr/share/ant
+	* patches/icedtea-ant.patch: New patch
+
 2007-10-02  Lillian Angel  <langel at redhat.com>
 
 	* AUTHORS: Added Matthias Klose.
diff -r ba2a7d244aca -r ea10471637af Makefile.am
--- a/Makefile.am	Tue Oct 02 09:04:05 2007 -0400
+++ b/Makefile.am	Tue Oct 02 11:48:14 2007 -0400
@@ -135,6 +135,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-demos.patch \
 	patches/icedtea-use-system-tzdata.patch \
 	patches/icedtea-headers.patch \
+	patches/icedtea-ant.patch \
 	$(FAST_BUILD_PATCH)
 
 stamps/patch.stamp: stamps/extract.stamp
diff -r ba2a7d244aca -r ea10471637af Makefile.in
--- a/Makefile.in	Tue Oct 02 09:04:05 2007 -0400
+++ b/Makefile.in	Tue Oct 02 11:48:14 2007 -0400
@@ -251,6 +251,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-demos.patch \
 	patches/icedtea-use-system-tzdata.patch \
 	patches/icedtea-headers.patch \
+	patches/icedtea-ant.patch \
 	$(FAST_BUILD_PATCH)
 
 
diff -r ba2a7d244aca -r ea10471637af configure
--- a/configure	Tue Oct 02 09:04:05 2007 -0400
+++ b/configure	Tue Oct 02 11:48:14 2007 -0400
@@ -1350,7 +1350,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-icedtea-home     IcedTea home directory (default is
                           /usr/lib/jvm/java-icedtea)
-  --with-ant-home         Ant home directory (default is /usr)
+  --with-ant-home         Ant home directory (default is /usr/share/ant)
   --with-openjdk-src-zip  specify the location of the openjdk source zip
   --with-openjdk-src-dir  specify the location of the openjdk sources
 
@@ -4809,14 +4809,14 @@ if test "${with_ant_home+set}" = set; th
   withval=$with_ant_home;
               if test "x${withval}" == x
               then
-                SYSTEM_ANT_DIR=/usr
+                SYSTEM_ANT_DIR=/usr/share/ant
               else
                 SYSTEM_ANT_DIR=${withval}
               fi
 
 else
 
-              SYSTEM_ANT_DIR=/usr
+              SYSTEM_ANT_DIR=/usr/share/ant
 
 fi
 
diff -r ba2a7d244aca -r ea10471637af configure.ac
--- a/configure.ac	Tue Oct 02 09:04:05 2007 -0400
+++ b/configure.ac	Tue Oct 02 11:48:14 2007 -0400
@@ -38,17 +38,17 @@ AC_SUBST(SYSTEM_ICEDTEA_DIR)
 
 AC_ARG_WITH([ant-home],
             [AS_HELP_STRING([--with-ant-home],
-                            [Ant home directory (default is /usr)])],
+                            [Ant home directory (default is /usr/share/ant)])],
             [
               if test "x${withval}" == x
               then
-                SYSTEM_ANT_DIR=/usr
+                SYSTEM_ANT_DIR=/usr/share/ant
               else
                 SYSTEM_ANT_DIR=${withval}
               fi
             ],
             [
-              SYSTEM_ANT_DIR=/usr
+              SYSTEM_ANT_DIR=/usr/share/ant
             ])
 AC_SUBST(SYSTEM_ANT_DIR)
 
diff -r ba2a7d244aca -r ea10471637af patches/icedtea-ant.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ant.patch	Tue Oct 02 11:48:14 2007 -0400
@@ -0,0 +1,21 @@
+--- lang.orig	2007-10-02 11:38:32.000000000 -0400
++++ openjdk/langtools/make/Makefile	2007-10-02 11:38:52.000000000 -0400
+@@ -129,17 +129,7 @@
+   ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
+ endif
+ 
+-ifdef ANT_HOME
+-  ANT = $(ANT_HOME)/bin/ant
+-  ifneq ($(shell test -x $(ANT) && echo OK), OK)
+-    $(error $(ANT) not found -- please update ANT_HOME)
+-  endif
+-else
+-  ANT = ant
+-  ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
+-    $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
+-  endif
+-endif
++ANT = ant
+ 
+ # Default target and expected 'do everything' target
+ all: build