/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Apr 1 02:10:09 UTC 2016
changeset 0637ff9bfd77 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0637ff9bfd77
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 01:37:13 2016 +0100
PR2541: Allow the user to specify the cacerts file to use
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2541: Allow the user to specify the cacerts file
to use
* Makefile.am:
(uninstall-local): Delete the cacerts file.
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2541: Allow the user to specify the cacerts file
to use
* INSTALL: Document --with-cacerts-file.
* Makefile.am:
(JDK_CACERTS_FILE): Replace hardcoded value with
@ALT_CACERTS_FILE at .
(install-data-local): Install the cacerts file.
* NEWS: Updated.
* acinclude.m4:
(IT_WITH_CACERTS_FILE): Allow a cacerts file to
be specified, defaulting to
${SYSTEM_JDK_DIR}/jre/lib/security/cacerts
* configure.ac:
Invoke IT_WITH_CACERTS_FILE.
changeset 03f444adc703 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=03f444adc703
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 02:35:07 2016 +0100
PR2544: Desktop files do not allow installation from multiple versions of IcedTea
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2544: Desktop files do not allow installation from
multiple versions of IcedTea
* Makefile.am:
(uninstall-local): Replace hard-coded "1.8.0" with @JAVA_VER at .
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2544: Desktop files do not allow installation from
multiple versions of IcedTea
* jconsole.desktop: Moved to jconsole.desktop.in.
* policytool.desktop: Moved to policytool.desktop.in.
* Makefile.am:
(DESKTOP_FILES): Add Java version to filenames.
(EXTRA_DIST): Remove $(DESKTOP_FILES) as they are
now handled by autoconf and generated versions shouldn't
be packaged.
(all-local): Depend on $(DESKTOP_FILES) being created.
(clean-local): Add clean-policytool- at JAVA_VER@.desktop
and clean-jconsole- at JAVA_VER@.desktop
(.PHONY): Likewise.
(policytool- at JAVA_VER@.desktop): Generate desktop file
by replacing _BINDIR_ with actual make variable $(bindir).
(clean-policytool- at JAVA_VER@.desktop): Remove generated file.
(jconsole- at JAVA_VER@.desktop): Generate desktop file
by replacing _BINDIR_ with actual make variable $(bindir).
(clean-jconsole- at JAVA_VER@.desktop): Remove generated file.
(install-data-local): Replace hard-coded "1.8.0" with @JAVA_VER at .
Copy desktop files from build directory.
* NEWS: Updated.
* acinclude.m4:
(IT_DETERMINE_VERSION): Set JAVA_VER to 1.8.0 and include in
configure output.
* configure.ac:
Generate jconsole.desktop and policytool.desktop.
Drop AC_PREFIX_DEFAULT invocation, reverting to
/usr/local as default installation directory.
* jconsole.desktop.in: Moved from jconsole.desktop so
that @JAVA_VER@ can be replaced by configure and
_BINDIR_ by the build.
* policytool.desktop.in: Likewise for policytool.desktop.
changeset 5b874b8529b9 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5b874b8529b9
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Apr 01 03:10:31 2016 +0100
PR2547: Extend tarball checksumming option to allow the checksum to be specified
2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2547: Extend tarball checksumming option to
allow the checksum to be specified
* INSTALL: Update documentation, replacing
the --disable-nashorn-checksum option with
the --with--nashorn-checksum option.
* Makefile.am:
(NASHORN_SUM): Set to either NASHORN_SHA256SUM
or the checksum supplied by the user.
(download-nashorn): Use NASHORN_SUM instead
of NASHORN_SHA256SUM directly.
* acinclude.m4:
(IT_ENABLE_NASHORN_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_NASHORN_CHECKSUM is
set if the specified value is other than
"yes" or "no".
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2547: Extend tarball checksumming option to
allow the checksum to be specified
* INSTALL: Update documentation, replacing
--disable-x-checksum options with
--with-x-checksum options.
* Makefile.am:
(OPENJDK_SUM): Set to either OPENJDK_SHA256SUM
or the checksum supplied by the user.
(CORBA_SUM): Set to either CORBA_SHA256SUM
or the checksum supplied by the user.
(JAXP_SUM): Set to either JAXP_SHA256SUM
or the checksum supplied by the user.
(JAXWS_SUM): Set to either JAXWS_SHA256SUM
or the checksum supplied by the user.
(JDK_SUM): Set to either JDK_SHA256SUM
or the checksum supplied by the user.
(LANGTOOLS_SUM): Set to either LANGTOOLS_SHA256SUM
or the checksum supplied by the user.
(CACAO_SUM): Set to either CACAO_SHA256SUM
or the checksum supplied by the user.
(JAMVM_SUM): Set to either JAMVM_SHA256SUM
or the checksum supplied by the user.
(HOTSPOT_SUM): Set to either HS_SHA256SUM
or the checksum supplied by the user.
(download-openjdk): Use OPENJDK_SUM instead
of OPENJDK_SHA256SUM directly.
(download-corba): Use CORBA_SUM instead
of CORBA_SHA256SUM directly.
(download-jaxp): Use JAXP_SUM instead
of JAXP_SHA256SUM directly.
(download-jaxws): Use JAXWS_SUM instead
of JAXWS_SHA256SUM directly.
(download-jdk): Use JDK_SUM instead
of JDK_SHA256SUM directly.
(download-langtools): Use LANGTOOLS_SUM instead
of LANGTOOLS_SHA256SUM directly.
(download-cacao): Use CACAO_SUM instead
of CACAO_SHA256SUM directly.
(download-jamvm): Use JAMVM_SUM instead
of JAMVM_SHA256SUM directly.
(download-hotspot): Use HOTSPOT_SUM instead
of HS_SHA256SUM directly.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_OPENJDK_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_OPENJDK_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_CORBA_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_CORBA_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_JAXP_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_JAXP_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_JAXWS_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_JAXWS_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_JDK_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_JDK_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_LANGTOOLS_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_LANGTOOLS_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_CACAO_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_CACAO_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_JAMVM_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_JAMVM_CHECKSUM is
set if the specified value is other than
"yes" or "no".
(IT_ENABLE_HOTSPOT_CHECKSUM): Change from
an enablement option to a with option, so
that the user can specify a checksum.
The conditional WITH_HOTSPOT_CHECKSUM is
set if the specified value is other than
"yes" or "no".
diffstat:
ChangeLog | 188 ++++++++++++++++++++++++++++++++++
INSTALL | 82 +++++++++-----
Makefile.am | 137 +++++++++++++++++++-----
NEWS | 3 +
acinclude.m4 | 276 ++++++++++++++++++++++---------------------------
configure.ac | 5 +-
jconsole.desktop | 10 -
jconsole.desktop.in | 10 +
policytool.desktop | 10 -
policytool.desktop.in | 10 +
10 files changed, 498 insertions(+), 233 deletions(-)
diffs (truncated from 1225 to 500 lines):
diff -r b1d858e368bb -r 5b874b8529b9 ChangeLog
--- a/ChangeLog Fri Apr 01 00:54:40 2016 +0100
+++ b/ChangeLog Fri Apr 01 03:10:31 2016 +0100
@@ -1,3 +1,191 @@
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2547: Extend tarball checksumming option to
+ allow the checksum to be specified
+ * INSTALL: Update documentation, replacing
+ the --disable-nashorn-checksum option with
+ the --with--nashorn-checksum option.
+ * Makefile.am:
+ (NASHORN_SUM): Set to either NASHORN_SHA256SUM
+ or the checksum supplied by the user.
+ (download-nashorn): Use NASHORN_SUM instead
+ of NASHORN_SHA256SUM directly.
+ * acinclude.m4:
+ (IT_ENABLE_NASHORN_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_NASHORN_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+
+2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2547: Extend tarball checksumming option to
+ allow the checksum to be specified
+ * INSTALL: Update documentation, replacing
+ --disable-x-checksum options with
+ --with-x-checksum options.
+ * Makefile.am:
+ (OPENJDK_SUM): Set to either OPENJDK_SHA256SUM
+ or the checksum supplied by the user.
+ (CORBA_SUM): Set to either CORBA_SHA256SUM
+ or the checksum supplied by the user.
+ (JAXP_SUM): Set to either JAXP_SHA256SUM
+ or the checksum supplied by the user.
+ (JAXWS_SUM): Set to either JAXWS_SHA256SUM
+ or the checksum supplied by the user.
+ (JDK_SUM): Set to either JDK_SHA256SUM
+ or the checksum supplied by the user.
+ (LANGTOOLS_SUM): Set to either LANGTOOLS_SHA256SUM
+ or the checksum supplied by the user.
+ (CACAO_SUM): Set to either CACAO_SHA256SUM
+ or the checksum supplied by the user.
+ (JAMVM_SUM): Set to either JAMVM_SHA256SUM
+ or the checksum supplied by the user.
+ (HOTSPOT_SUM): Set to either HS_SHA256SUM
+ or the checksum supplied by the user.
+ (download-openjdk): Use OPENJDK_SUM instead
+ of OPENJDK_SHA256SUM directly.
+ (download-corba): Use CORBA_SUM instead
+ of CORBA_SHA256SUM directly.
+ (download-jaxp): Use JAXP_SUM instead
+ of JAXP_SHA256SUM directly.
+ (download-jaxws): Use JAXWS_SUM instead
+ of JAXWS_SHA256SUM directly.
+ (download-jdk): Use JDK_SUM instead
+ of JDK_SHA256SUM directly.
+ (download-langtools): Use LANGTOOLS_SUM instead
+ of LANGTOOLS_SHA256SUM directly.
+ (download-cacao): Use CACAO_SUM instead
+ of CACAO_SHA256SUM directly.
+ (download-jamvm): Use JAMVM_SUM instead
+ of JAMVM_SHA256SUM directly.
+ (download-hotspot): Use HOTSPOT_SUM instead
+ of HS_SHA256SUM directly.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_OPENJDK_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_OPENJDK_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_CORBA_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_CORBA_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_JAXP_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_JAXP_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_JAXWS_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_JAXWS_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_JDK_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_JDK_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_LANGTOOLS_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_LANGTOOLS_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_CACAO_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_CACAO_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_JAMVM_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_JAMVM_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+ (IT_ENABLE_HOTSPOT_CHECKSUM): Change from
+ an enablement option to a with option, so
+ that the user can specify a checksum.
+ The conditional WITH_HOTSPOT_CHECKSUM is
+ set if the specified value is other than
+ "yes" or "no".
+
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2544: Desktop files do not allow installation from
+ multiple versions of IcedTea
+ * Makefile.am:
+ (uninstall-local): Replace hard-coded "1.8.0" with @JAVA_VER at .
+
+2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2544: Desktop files do not allow installation from
+ multiple versions of IcedTea
+ * jconsole.desktop: Moved to jconsole.desktop.in.
+ * policytool.desktop: Moved to policytool.desktop.in.
+ * Makefile.am:
+ (DESKTOP_FILES): Add Java version to filenames.
+ (EXTRA_DIST): Remove $(DESKTOP_FILES) as they are
+ now handled by autoconf and generated versions shouldn't
+ be packaged.
+ (all-local): Depend on $(DESKTOP_FILES) being created.
+ (clean-local): Add clean-policytool- at JAVA_VER@.desktop
+ and clean-jconsole- at JAVA_VER@.desktop
+ (.PHONY): Likewise.
+ (policytool- at JAVA_VER@.desktop): Generate desktop file
+ by replacing _BINDIR_ with actual make variable $(bindir).
+ (clean-policytool- at JAVA_VER@.desktop): Remove generated file.
+ (jconsole- at JAVA_VER@.desktop): Generate desktop file
+ by replacing _BINDIR_ with actual make variable $(bindir).
+ (clean-jconsole- at JAVA_VER@.desktop): Remove generated file.
+ (install-data-local): Replace hard-coded "1.8.0" with @JAVA_VER at .
+ Copy desktop files from build directory.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_DETERMINE_VERSION): Set JAVA_VER to 1.8.0 and include in
+ configure output.
+ * configure.ac:
+ Generate jconsole.desktop and policytool.desktop.
+ Drop AC_PREFIX_DEFAULT invocation, reverting to
+ /usr/local as default installation directory.
+ * jconsole.desktop.in: Moved from jconsole.desktop so
+ that @JAVA_VER@ can be replaced by configure and
+ _BINDIR_ by the build.
+ * policytool.desktop.in: Likewise for policytool.desktop.
+
+2016-03-31 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2541: Allow the user to specify the cacerts file
+ to use
+ * Makefile.am:
+ (uninstall-local): Delete the cacerts file.
+
+2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2541: Allow the user to specify the cacerts file
+ to use
+ * INSTALL: Document --with-cacerts-file.
+ * Makefile.am:
+ (JDK_CACERTS_FILE): Replace hardcoded value with
+ @ALT_CACERTS_FILE at .
+ (install-data-local): Install the cacerts file.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_WITH_CACERTS_FILE): Allow a cacerts file to
+ be specified, defaulting to
+ ${SYSTEM_JDK_DIR}/jre/lib/security/cacerts
+ * configure.ac:
+ Invoke IT_WITH_CACERTS_FILE.
+
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2523: Add executable stack markings
diff -r b1d858e368bb -r 5b874b8529b9 INSTALL
--- a/INSTALL Fri Apr 01 00:54:40 2016 +0100
+++ b/INSTALL Fri Apr 01 03:10:31 2016 +0100
@@ -122,53 +122,75 @@
- /usr/share/java/ecj.jar
- /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar
* --with-openjdk-src-zip: Specify the location of the OpenJDK tarball to avoid downloading.
-* --disable-openjdk-checksum: Don't check that the tarball specified by --with-openjdk-src-zip
- has the same checksum as the expected OpenJDK source zip, so a locally modified version can
- be used instead.
+* --with-openjdk-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-openjdk-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-openjdk-checksum doesn't check the tarball specified by
+ --with-openjdk-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-hotspot-src-zip: Specify the location of the HotSpot tarball to avoid downloading.
-* --disable-hotspot-checksum: Don't check that the tarball specified by --with-hotspot-src-zip
- has the same checksum as the expected HotSpot source zip, so a locally modified version can
- be used instead.
+* --with-hotspot-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-hotspot-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-hotspot-checksum doesn't check the tarball specified by
+ --with-hotspot-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-corba-src-zip: Specify the location of the CORBA tarball to avoid downloading.
-* --disable-corba-checksum: Don't check that the tarball specified by --with-corba-src-zip
- has the same checksum as the expected CORBA source zip, so a locally modified version can
- be used instead.
+* --with-corba-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-corba-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-corba-checksum doesn't check the tarball specified by
+ --with-corba-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-jaxp-src-zip: Specify the location of the JAXP tarball to avoid downloading.
-* --disable-jaxp-checksum: Don't check that the tarball specified by --with-jaxp-src-zip
- has the same checksum as the expected JAXP source zip, so a locally modified version can
- be used instead.
+* --with-jaxp-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-jaxp-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-jaxp-checksum doesn't check the tarball specified by
+ --with-jaxp-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-jaxws-src-zip: Specify the location of the JAXWS tarball to avoid downloading.
-* --disable-jaxws-checksum: Don't check that the tarball specified by --with-jaxws-src-zip
- has the same checksum as the expected JAXWS source zip, so a locally modified version can
- be used instead.
+* --with-jaxws-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-jaxws-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-jaxws-checksum doesn't check the tarball specified by
+ --with-jaxws-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-jdk-src-zip: Specify the location of the JDK tarball to avoid downloading.
-* --disable-jdk-checksum: Don't check that the tarball specified by --with-jdk-src-zip
- has the same checksum as the expected JDK source zip, so a locally modified version can
- be used instead.
+* --with-jdk-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-jdk-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-jdk-checksum doesn't check the tarball specified by
+ --with-jdk-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-langtools-src-zip: Specify the location of the langtools tarball to avoid downloading.
-* --disable-langtools-checksum: Don't check that the tarball specified by --with-langtools-src-zip
- has the same checksum as the expected langtools source zip, so a locally modified version can
- be used instead.
+* --with-langtools-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-langtools-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-langtools-checksum doesn't check the tarball specified by
+ --with-langtools-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-nashorn-src-zip: Specify the location of the Nashorn tarball to avoid downloading.
-* --disable-nashorn-checksum: Don't check that the tarball specified by --with-nashorn-src-zip
- has the same checksum as the expected Nashorn source zip, so a locally modified version can
- be used instead.
+* --with-nashorn-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-nashorn-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-nashorn-checksum doesn't check the tarball specified by
+ --with-nashorn-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-alt-jar: Use the specified jar binary in the second stage rather than the one just built.
* --with-cacao-home: Specify the location of an installed CACAO to use rather than downloading
and building one.
* --with-cacao-src-zip: Specify the location of a CACAO tarball to avoid downloading.
-* --disable-cacao-checksum: Don't check that the tarball specified by --with-cacao-src-zip
- has the same checksum as the expected CACAO source zip, so a locally modified version can
- be used instead.
+* --with-cacao-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-cacao-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-cacao-checksum doesn't check the tarball specified by
+ --with-cacao-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-cacao-src-dir: Specify the location of a CACAO source tree to avoid downloading.
* --with-jamvm-src-zip: Specify the location of a JamVM tarball to avoid downloading.
-* --disable-jamvm-checksum: Don't check that the tarball specified by --with-jamvm-src-zip
- has the same checksum as the expected JamVM source zip, so a locally modified version can
- be used instead.
+* --with-jamvm-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+ --with-jamvm-checksum without an argument (the default) uses the expected upstream SHA256
+ checksum, while --without-jamvm-checksum doesn't check the tarball specified by
+ --with-jamvm-src-zip at all. This option allows a locally modified version of the source
+ tarball to be used instead of the standard versions.
* --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
* --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
* --with-llvm-config: Specify the location of the llvm-config binary.
* --with-version-suffix: Appends the given text to the JDK version output.
+* --with-cacerts-file: Specify the location of a cacerts file, defaulting to
+ ${SYSTEM_JDK_DIR}/jre/lib/security/cacerts
Other options may be supplied which enable or disable new features.
These are documented fully in the relevant section below.
diff -r b1d858e368bb -r 5b874b8529b9 Makefile.am
--- a/Makefile.am Fri Apr 01 00:54:40 2016 +0100
+++ b/Makefile.am Fri Apr 01 03:10:31 2016 +0100
@@ -88,7 +88,7 @@
VERSION_SETTINGS_FILE_BACKUP = $$(basename $(VERSION_SETTINGS_FILE)).bak
-JDK_CACERTS_FILE = $(SYSTEM_JDK_DIR)/jre/lib/security/cacerts
+JDK_CACERTS_FILE = @ALT_CACERTS_FILE@
CACERTS_FILE = \
`if [ -h $(JDK_CACERTS_FILE) ] ; then $(READLINK) -e $(JDK_CACERTS_FILE) ; else echo $(JDK_CACERTS_FILE); fi`
@@ -139,60 +139,120 @@
OPENJDK_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_OPENJDK_CHECKSUM
+OPENJDK_SUM = @OPENJDK_CHECKSUM@
+else
+OPENJDK_SUM = $(OPENJDK_SHA256SUM)
+endif
+
if DISABLE_CORBA_CHECKSUM
CORBA_SHA256SUM_BIN = true
else
CORBA_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_CORBA_CHECKSUM
+CORBA_SUM = @CORBA_CHECKSUM@
+else
+CORBA_SUM = $(CORBA_SHA256SUM)
+endif
+
if DISABLE_JAXP_CHECKSUM
JAXP_SHA256SUM_BIN = true
else
JAXP_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_JAXP_CHECKSUM
+JAXP_SUM = @JAXP_CHECKSUM@
+else
+JAXP_SUM = $(JAXP_SHA256SUM)
+endif
+
if DISABLE_JAXWS_CHECKSUM
JAXWS_SHA256SUM_BIN = true
else
JAXWS_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_JAXWS_CHECKSUM
+JAXWS_SUM = @JAXWS_CHECKSUM@
+else
+JAXWS_SUM = $(JAXWS_SHA256SUM)
+endif
+
if DISABLE_JDK_CHECKSUM
JDK_SHA256SUM_BIN = true
else
JDK_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_JDK_CHECKSUM
+JDK_SUM = @JDK_CHECKSUM@
+else
+JDK_SUM = $(JDK_SHA256SUM)
+endif
+
if DISABLE_LANGTOOLS_CHECKSUM
LANGTOOLS_SHA256SUM_BIN = true
else
LANGTOOLS_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_LANGTOOLS_CHECKSUM
+LANGTOOLS_SUM = @LANGTOOLS_CHECKSUM@
+else
+LANGTOOLS_SUM = $(LANGTOOLS_SHA256SUM)
+endif
+
if DISABLE_CACAO_CHECKSUM
CACAO_SHA256SUM_BIN = true
else
CACAO_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_CACAO_CHECKSUM
+CACAO_SUM = @CACAO_CHECKSUM@
+else
+CACAO_SUM = $(CACAO_SHA256SUM)
+endif
+
if DISABLE_JAMVM_CHECKSUM
JAMVM_SHA256SUM_BIN = true
else
JAMVM_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_JAMVM_CHECKSUM
+JAMVM_SUM = @JAMVM_CHECKSUM@
+else
+JAMVM_SUM = $(JAMVM_SHA256SUM)
+endif
+
if DISABLE_HOTSPOT_CHECKSUM
HOTSPOT_SHA256SUM_BIN = true
else
HOTSPOT_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_HOTSPOT_CHECKSUM
+HOTSPOT_SUM = @HOTSPOT_CHECKSUM@
+else
+HOTSPOT_SUM = $(HS_SHA256SUM)
+endif
+
if DISABLE_NASHORN_CHECKSUM
NASHORN_SHA256SUM_BIN = true
else
NASHORN_SHA256SUM_BIN = $(SHA256SUM)
endif
+if WITH_NASHORN_CHECKSUM
+NASHORN_SUM = @NASHORN_CHECKSUM@
+else
+NASHORN_SUM = $(NASHORN_SHA256SUM)
+endif
+
if WITH_HGREV
REV_ARG = -r $(HGREV)
endif
@@ -637,14 +697,13 @@
$(top_srcdir)/test/jtreg/JavaTest.cmdMgrs.lst \
$(top_srcdir)/test/jtreg/excludelist.langtools.jtx
-DESKTOP_FILES = jconsole.desktop policytool.desktop
+DESKTOP_FILES = jconsole- at JAVA_VER@.desktop policytool- at JAVA_VER@.desktop
EXTRA_DIST = $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
$(top_srcdir)/patches/jamvm/*.patch \
tools-copy contrib overlays \
- $(JTREG_SRCS) $(DESKTOP_FILES) \
- HACKING autogen.sh \
+ $(JTREG_SRCS) HACKING autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
tapset/jstack.stp.in \
@@ -658,7 +717,7 @@
# Top-Level Targets
# =================
-all-local: icedtea-stage2
+all-local: icedtea-stage2 $(DESKTOP_FILES)
check-local: jtregcheck $(SYSTEMTAP_TEST_SUITE) stamps/check-ecc.stamp
@@ -670,7 +729,8 @@
clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \
clean-extract clean-native-ecj clean-icedtea-stage2 \
clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
- clean-add-cacao clean-add-cacao-debug clean-cryptocheck clean-ecccheck
+ clean-add-cacao clean-add-cacao-debug clean-cryptocheck clean-ecccheck \
+ clean-policytool- at JAVA_VER@.desktop clean-jconsole- at JAVA_VER@.desktop
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -706,7 +766,7 @@
clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
clean-tests clean-tapset-report clean-ecccheck clean-check-ecc \
check-jdk check-hotspot check-langtools jtregcheck check-tapset check-tapset-probes \
- check-tapset-jstack
+ check-tapset-jstack clean-policytool- at JAVA_VER@.desktop clean-jconsole- at JAVA_VER@.desktop
env:
@echo 'unset JAVA_HOME'
@@ -758,7 +818,7 @@
if USE_ALT_OPENJDK_SRC_ZIP
ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
endif
- if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \
+ if ! echo "$(OPENJDK_SUM) $(OPENJDK_SRC_ZIP)" \
| $(OPENJDK_SHA256SUM_BIN) --check ; \
then \
if test "x$(enable_downloading)" = "xyes"; then \
@@ -766,7 +826,7 @@
mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
fi ; \
$(WGET) $(ICEDTEA_URL)/$(OPENJDK_SRC_ZIP); \
- if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \
+ if ! echo "$(OPENJDK_SUM) $(OPENJDK_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
echo "ERROR: Bad download of OpenJDK root zip"; false; \
fi; \
More information about the distro-pkg-dev
mailing list