/hg/icedtea6: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 739dfd3ff255 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=739dfd3ff255
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Oct 08 13:53:20 2013 +0100

	Correct ChangeLog entry.


changeset 9e8a68310569 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9e8a68310569
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Oct 09 01:08:04 2013 +0100

	PR1288: Allow JARs to be optionally compressed by setting COMPRESS_JARS

	2012-08-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR1288: Allow JARs to be optionally compressed by
		setting COMPRESS_JARS
		* Makefile.am:
		(ICEDTEA_ENV): Add COMPRESS_JARS="true" if
		ENABLE_JAR_COMPRESSION is set.
		* NEWS: Updated.
		* acinclude.m4: Add IT_ENABLE_JAR_COMPRESSION macro.
		* configure.ac: Include new macro.


diffstat:

 ChangeLog    |  17 +++++++++++++++--
 Makefile.am  |   5 +++++
 NEWS         |   1 +
 acinclude.m4 |  22 ++++++++++++++++++++++
 configure.ac |   1 +
 5 files changed, 44 insertions(+), 2 deletions(-)

diffs (93 lines):

diff -r 598a353f5405 -r 9e8a68310569 ChangeLog
--- a/ChangeLog	Tue Oct 08 09:53:44 2013 +0200
+++ b/ChangeLog	Wed Oct 09 01:08:04 2013 +0100
@@ -1,8 +1,21 @@
+2012-08-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR1288: Allow JARs to be optionally compressed by
+	setting COMPRESS_JARS
+	* Makefile.am:
+	(ICEDTEA_ENV): Add COMPRESS_JARS="true" if
+	ENABLE_JAR_COMPRESSION is set.
+	* NEWS: Updated.
+	* acinclude.m4: Add IT_ENABLE_JAR_COMPRESSION macro.
+	* configure.ac: Include new macro.
+
 2013-10-08  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am:
-	Added --no-check-certificate flag to wget command
-	to allow downloading OpenJDK tarball using https.
+	(download-openjdk): Added --no-check-certificate
+	flag to wget command to allow downloading OpenJDK
+	tarball using https on systems with the necessary
+	certificates.
 
 2013-10-07  Andrew John Hughes  <gnu.andrew at redhat.com>
 
diff -r 598a353f5405 -r 9e8a68310569 Makefile.am
--- a/Makefile.am	Tue Oct 08 09:53:44 2013 +0200
+++ b/Makefile.am	Wed Oct 09 01:08:04 2013 +0100
@@ -846,6 +846,11 @@
 	KRB5_CFLAGS="${KRB5_CFLAGS}"
 endif
 
+if ENABLE_JAR_COMPRESSION
+ICEDTEA_ENV += \
+	COMPRESS_JARS="true"
+endif
+
 # OpenJDK ecj build environment.
 ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
 	ALT_OUTPUTDIR="$(ECJ_BUILD_OUTPUT_DIR)" \
diff -r 598a353f5405 -r 9e8a68310569 NEWS
--- a/NEWS	Tue Oct 08 09:53:44 2013 +0200
+++ b/NEWS	Wed Oct 09 01:08:04 2013 +0100
@@ -16,6 +16,7 @@
 * New features
   - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
   - PR718: Backport LCMS2 support from IcedTea7
+  - PR1288: Allow JARs to be optionally compressed by setting COMPRESS_JARS
 * Import of OpenJDK6 b28
   - OJ1: Confirm that community members can commit to hotspot in OpenJDK6
   - OJ2: Revert unnecessary file added to hotspot repo
diff -r 598a353f5405 -r 9e8a68310569 acinclude.m4
--- a/acinclude.m4	Tue Oct 08 09:53:44 2013 +0200
+++ b/acinclude.m4	Wed Oct 09 01:08:04 2013 +0100
@@ -2083,3 +2083,25 @@
   AM_CONDITIONAL(USE_SYSTEM_KERBEROS, test x"${ENABLE_SYSTEM_KERBEROS}" = "xyes")
   AC_SUBST(ENABLE_SYSTEM_KERBEROS)
 ])
+
+AC_DEFUN([IT_ENABLE_JAR_COMPRESSION],
+[
+  AC_MSG_CHECKING([whether to enable JAR compression])
+  AC_ARG_ENABLE([jar-compression],
+                [AS_HELP_STRING(--enable-jar-compression,compress built jars [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+        enable_jar_compression=no
+        ;;
+      *)
+        enable_jar_compression=yes
+        ;;
+    esac
+  ],
+  [
+    enable_jar_compression=yes
+  ])
+  AC_MSG_RESULT([$enable_jar_compression])
+  AM_CONDITIONAL([ENABLE_JAR_COMPRESSION], test x"${enable_jar_compression}" = "xyes")
+])
diff -r 598a353f5405 -r 9e8a68310569 configure.ac
--- a/configure.ac	Tue Oct 08 09:53:44 2013 +0200
+++ b/configure.ac	Wed Oct 09 01:08:04 2013 +0100
@@ -284,6 +284,7 @@
 IT_WITH_JAMVM_SRC_ZIP
 
 IT_DISABLE_OPTIMIZATIONS
+IT_ENABLE_JAR_COMPRESSION
 IT_SET_SHARK_BUILD
 IT_ENABLE_ZERO_BUILD
 IT_CHECK_ADDITIONAL_VMS