changeset in /hg/icedtea6: Merging with latest from main repo

[Deepak Bhole]

changeset f9d81fd1466d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9d81fd1466d
description:
	Merging with latest from main repo

diffstat:

5 files changed, 38 insertions(+), 11 deletions(-)
AUTHORS                   |    1 +
ChangeLog                 |    9 +++++++++
Makefile.am               |    3 ++-
acinclude.m4              |    9 +++++++++
patches/icedtea-ecj.patch |   27 +++++++++++++++++----------

diffs (132 lines):

diff -r 30567fe7d579 -r f9d81fd1466d AUTHORS
--- a/AUTHORS	Wed Sep 24 11:35:01 2008 -0400
+++ b/AUTHORS	Wed Sep 24 11:44:16 2008 -0400
@@ -11,6 +11,7 @@ Andrew John Hughes <gnu_andrew at member.fs
 Andrew John Hughes <gnu_andrew at member.fsf.org>
 Matthias Klose <doko at ubuntu.com>
 Francis Kung <fkung at redhat.com>
+DJ Lucas <dj at linuxfromscratch.org>
 Casey Marshall <csm at gnu.org>
 Dan Munckton <lists at munckfish.net>
 Raif Naffah <admin at naffah-raif.name>
diff -r 30567fe7d579 -r f9d81fd1466d ChangeLog
--- a/ChangeLog	Wed Sep 24 11:35:01 2008 -0400
+++ b/ChangeLog	Wed Sep 24 11:44:16 2008 -0400
@@ -49,6 +49,15 @@ 2008-09-23  Deepak Bhole  <dbhole at redhat
 	* rt/netscape/javascript/JSProxy.java: Same.
 	* rt/netscape/javascript/JSRunnable.java: Same.
 	* rt/netscape/javascript/JSUtil.java: Same.
+
+2008-09-22  Lillian Angel  <langel at redhat.com>
+			DJ Lucas  <dj at linuxfromscratch.org>
+
+		* Makefile.am: Added new env var JAR_ACCEPTS_STDIN_LIST.
+		* acinclude.m4: Added check to determine whether jar supports
+		stdin file args.
+		* patches/icedtea-ecj.patch: Updated patch.
+		* AUTHORS: Added DJ Lucas.
 
 2008-09-18  Lillian Angel  <langel at redhat.com>
 
diff -r 30567fe7d579 -r f9d81fd1466d Makefile.am
--- a/Makefile.am	Wed Sep 24 11:35:01 2008 -0400
+++ b/Makefile.am	Wed Sep 24 11:44:16 2008 -0400
@@ -228,7 +228,8 @@ ICEDTEA_ENV_ECJ = \
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
 	"JAVAC=" \
 	"RHINO_JAR=$(RHINO_JAR)" \
-	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)"
+	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
+	"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
diff -r 30567fe7d579 -r f9d81fd1466d acinclude.m4
--- a/acinclude.m4	Wed Sep 24 11:35:01 2008 -0400
+++ b/acinclude.m4	Wed Sep 24 11:44:16 2008 -0400
@@ -342,9 +342,18 @@ EOF
     JAR_KNOWS_ATFILE=
     AC_MSG_RESULT(no)
   fi
+  AC_MSG_CHECKING([whether jar supports stdin file arguments])
+  if cat _config.list | $JAR cf@ _config.jar 2>/dev/null; then
+    JAR_ACCEPTS_STDIN_LIST=1
+    AC_MSG_RESULT(yes)
+  else
+    JAR_ACCEPTS_STDIN_LIST=
+    AC_MSG_RESULT(no)
+  fi
   rm -f _config.txt _config.list _config.jar
   AC_SUBST(JAR)
   AC_SUBST(JAR_KNOWS_ATFILE)
+  AC_SUBST(JAR_ACCEPTS_STDIN_LIST)
 ])
 
 AC_DEFUN([FIND_RMIC],
diff -r 30567fe7d579 -r f9d81fd1466d patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Wed Sep 24 11:35:01 2008 -0400
+++ b/patches/icedtea-ecj.patch	Wed Sep 24 11:44:16 2008 -0400
@@ -428,32 +428,35 @@ diff -ru openjdk-ecj.orig/langtools/make
  endif
  
  # Override of what javac to use (see deploy workspace)
---- oipenjdk/jdk/make/common/Release.gmk	2007-11-13 16:47:23.000000000 -0500
-+++ openjdk-ecj/jdk/make/common/Release.gmk	2007-11-13 16:48:08.000000000 -0500
-@@ -655,10 +649,19 @@
+--- oipenjdk/jdk/make/common/Release.gmk	2008-08-28 03:10:47.000000000 -0500
++++ openjdk-ecj/jdk/make/common/Release.gmk	2008-09-16 17:53:16.000000000 -0500
+@@ -655,10 +655,23 @@
  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
 -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
--	$(prep-target)
 +$(RESOURCES_JAR): \
 +    $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \
 +    $(JAR_MANIFEST_FILE)
-+	$(prep-target)
+ 	$(prep-target)
 +ifneq (,$(JAR_KNOWS_ATFILE))
++	(cd $(CLASSBINDIR) && \
+ 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+-	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
++	    $(JAR_JFLAGS) @$(RES_JAR_FILELIST))
++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
 +	(cd $(CLASSBINDIR) && $(CAT) $(RES_JAR_FILELIST) | \
 +	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS))
 +else
 +	(cd $(CLASSBINDIR) && \
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
--	    @$(RES_JAR_ARGLIST) $(JAR_JFLAGS)
++	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
 +endif
  	@$(java-vm-cleanup)
  
  # Create jsse.jar containing SunJSSE implementation classes
-@@ -714,10 +717,18 @@
+@@ -714,10 +727,22 @@
  $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
@@ -462,13 +465,17 @@ diff -ru openjdk-ecj.orig/langtools/make
 +    $(JAR_MANIFEST_FILE)
  	$(prep-target)
 +ifneq (,$(JAR_KNOWS_ATFILE))
++	(cd $(CLASSBINDIR) && \
+ 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+-	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
++	    $(JAR_JFLAGS) @$(RT_JAR_FILELIST))
++else ifneq (,$(JAR_ACCEPTS_STDIN_LIST))
 +	(cd $(CLASSBINDIR) && $(CAT) $(RT_JAR_FILELIST) | \
 +	$(BOOT_JAR_CMD) c0mf@ $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS))
 +else
 +	(cd $(CLASSBINDIR) && \
- 	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
--	    @$(RT_JAR_ARGLIST) $(JAR_JFLAGS)
++	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
 +endif
  	@$(java-vm-cleanup)