changeset 2541:57592c0e9b8b

PR1289: Allow JARs to be optionally compressed by setting COMPRESS_JARS 2012-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org> PR1289: 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: (IT_ENABLE_JAR_COMPRESSION): Added. * configure.ac: Include new macro.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 10 Mar 2015 20:27:28 +0000
parents 6d2ddb408564
children dc6a63fd4529
files ChangeLog Makefile.am NEWS acinclude.m4 configure.ac
diffstat 5 files changed, 41 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 04 17:31:04 2015 +0000
+++ b/ChangeLog	Tue Mar 10 20:27:28 2015 +0000
@@ -1,3 +1,15 @@
+2012-08-22  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR1289: 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:
+	(IT_ENABLE_JAR_COMPRESSION): Added.
+	* configure.ac: Include new macro.
+
 2013-06-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am:
--- a/Makefile.am	Wed Mar 04 17:31:04 2015 +0000
+++ b/Makefile.am	Tue Mar 10 20:27:28 2015 +0000
@@ -368,6 +368,11 @@
 #	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" 
 #	ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)"
 
+if ENABLE_JAR_COMPRESSION
+ICEDTEA_ENV += \
+	COMPRESS_JARS="true"
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_CONFIGURE_BOOT = $(ICEDTEA_CONFIGURE)
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
--- a/NEWS	Wed Mar 04 17:31:04 2015 +0000
+++ b/NEWS	Tue Mar 10 20:27:28 2015 +0000
@@ -27,6 +27,7 @@
   - PR1275: Provide option to turn off downloading of tarballs
   - PR1279: Synchronise CACAO versions between IcedTea6/7/8 where possible
   - PR1281, RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive
+  - PR1289: Allow JARs to be optionally compressed by setting COMPRESS_JARS
   - PR1291: Ensure unlimited crypto policy is in place.
   - PR1325: Only add classes to rt-source-files.txt if actually needed
   - PR1346: Filter out -j option to make
--- a/acinclude.m4	Wed Mar 04 17:31:04 2015 +0000
+++ b/acinclude.m4	Tue Mar 10 20:27:28 2015 +0000
@@ -1980,3 +1980,25 @@
   AC_SUBST(PAX_COMMAND)
   AC_SUBST(PAX_COMMAND_ARGS)
 ])
+
+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")
+])
--- a/configure.ac	Wed Mar 04 17:31:04 2015 +0000
+++ b/configure.ac	Tue Mar 10 20:27:28 2015 +0000
@@ -137,6 +137,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