changeset in /hg/icedtea6: 2008-07-14 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 1db2f4a7db40 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1db2f4a7db40
description:
	2008-07-14  Matthias Klose  <doko at ubuntu.com>

	        * acinclude.m4 (FIND_JAR): Check if $JAR supports @<file>;
	        set JAR_KNOWS_ATFILE.
	        * Makefile.am (ICEDTEA_ENV_GCJ): Pass JAR_KNOWS_ATFILE.
	        * patches/icedtea-ecj.patch: Use jar @<file> if available.

diffstat:

4 files changed, 48 insertions(+), 13 deletions(-)
ChangeLog                 |    7 +++++++
Makefile.am               |    4 ++--
acinclude.m4              |   14 ++++++++++++++
patches/icedtea-ecj.patch |   36 +++++++++++++++++++++++++-----------

diffs (122 lines):

diff -r ccb7c89c5f75 -r 1db2f4a7db40 ChangeLog
--- a/ChangeLog	Sun Jul 13 01:53:09 2008 +0100
+++ b/ChangeLog	Mon Jul 14 15:44:55 2008 +0200
@@ -1,3 +1,10 @@ 2008-07-11  Andrew John Hughes  <gnu_and
+2008-07-14  Matthias Klose  <doko at ubuntu.com>
+
+	* acinclude.m4 (FIND_JAR): Check if $JAR supports @<file>;
+	set JAR_KNOWS_ATFILE.
+	* Makefile.am (ICEDTEA_ENV_GCJ): Pass JAR_KNOWS_ATFILE.
+	* patches/icedtea-ecj.patch: Use jar @<file> if available.
+
 2008-07-11  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* ChangeLog: Fix typos.
diff -r ccb7c89c5f75 -r 1db2f4a7db40 Makefile.am
--- a/Makefile.am	Sun Jul 13 01:53:09 2008 +0100
+++ b/Makefile.am	Mon Jul 14 15:44:55 2008 +0200
@@ -214,7 +214,8 @@ ICEDTEA_ENV_ECJ = \
 	"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
 	"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
 	"JAVAC=" \
-	"RHINO_JAR=$(RHINO_JAR)"
+	"RHINO_JAR=$(RHINO_JAR)" \
+	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
@@ -360,7 +361,6 @@ endif
 
 ICEDTEA_FSG_PATCHES = \
 	patches/icedtea-license-headers.patch \
-	patches/icedtea-idl.patch \
 	patches/icedtea-jscheme.patch
 
 ICEDTEA_PATCHES = \
diff -r ccb7c89c5f75 -r 1db2f4a7db40 acinclude.m4
--- a/acinclude.m4	Sun Jul 13 01:53:09 2008 +0100
+++ b/acinclude.m4	Mon Jul 14 15:44:55 2008 +0200
@@ -307,7 +307,21 @@ AC_DEFUN([FIND_JAR],
   if test -z "${JAR}"; then
     AC_MSG_ERROR("jar was not found.")
   fi
+  AC_MSG_CHECKING([wether jar supports @<file> argument])
+  touch _config.txt
+  cat >_config.list <<EOF
+_config.txt
+EOF
+  if $JAR cf _config.jar @_config.list 2>/dev/null; then
+    JAR_KNOWS_ATFILE=1
+    AC_MSG_RESULT(yes)
+  else
+    JAR_KNOWS_ATFILE=
+    AC_MSG_RESULT(no)
+  fi
+  rm -f _config.txt _config.list _config.jar
   AC_SUBST(JAR)
+  AC_SUBST(JAR_KNOWS_ATFILE)
 ])
 
 AC_DEFUN([FIND_RMIC],
diff -r ccb7c89c5f75 -r 1db2f4a7db40 patches/icedtea-ecj.patch
--- a/patches/icedtea-ecj.patch	Sun Jul 13 01:53:09 2008 +0100
+++ b/patches/icedtea-ecj.patch	Mon Jul 14 15:44:55 2008 +0200
@@ -430,33 +430,47 @@ diff -ru openjdk-ecj.orig/langtools/make
  # 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
-@@ -649,10 +649,11 @@
+@@ -655,10 +649,19 @@
  $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
 -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
-+$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE)
- 	$(prep-target)
--	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
+-	$(prep-target)
++$(RESOURCES_JAR): \
++    $(if $(JAR_KNOWS_ATFILE),$(RES_JAR_FILELIST),$(RES_JAR_ARGLIST)) \
++    $(JAR_MANIFEST_FILE)
++	$(prep-target)
++ifneq (,$(JAR_KNOWS_ATFILE))
++	(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)
-+	(cd $(CLASSBINDIR) && \
-+	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS) `cat $(RES_JAR_FILELIST)`)
++endif
  	@$(java-vm-cleanup)
  
  # Create jsse.jar containing SunJSSE implementation classes
-@@ -708,10 +709,11 @@
+@@ -714,10 +717,18 @@
  $(RT_JAR_ARGLIST): $(RT_JAR_FILELIST)
  	$(prep-target)
  	$(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@
 -$(RT_JAR): $(RT_JAR_ARGLIST) $(JAR_MANIFEST_FILE)
-+$(RT_JAR): $(RT_JAR_FILELIST) $(JAR_MANIFEST_FILE)
++$(RT_JAR): $(if $(JAR_KNOWS_ATFILE),$(RT_JAR_FILELIST),$(RT_JAR_ARGLIST)) \
++    $(JAR_MANIFEST_FILE)
  	$(prep-target)
--	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
++ifneq (,$(JAR_KNOWS_ATFILE))
++	(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)
-+	(cd $(CLASSBINDIR) && \
-+	$(BOOT_JAR_CMD) c0mf $(JAR_MANIFEST_FILE) $@ \
 +	    $(JAR_JFLAGS) `$(CAT) $(RT_JAR_FILELIST)`)
++endif
  	@$(java-vm-cleanup)
  
  # Meta-index construction to make core class loaders lazier