/hg/icedtea6: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Sep 25 10:06:17 PDT 2012
changeset d9d8e88ece00 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d9d8e88ece00
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Sep 25 18:04:11 2012 +0100
PR1114: Provide option to turn off downloading of tarballs (--disable-downloading)
2012-09-25 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: List PR1114.
2012-04-11 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(download-openjdk): Don't download unless
enable_downloading is set.
(download-cacao): Likewise.
(download-jamvm): Likewise.
(download-hotspot): Likewise.
(download-jaxp-drop): Likewise.
(download-jaxws-drop): Likewise.
(download-jaf-drop): Likewise.
* acinclude.m4:
(IT_CHECK_FOR_DOWNLOADING): New option
--disable-downloading.
* configure.ac: Call IT_CHECK_FOR_DOWNLOADING.
changeset 9fe1e3e1d4dc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9fe1e3e1d4dc
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Sep 25 18:06:05 2012 +0100
PR1114: Fix enable_downloading syntax.
2012-04-12 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(download-openjdk): Fix syntax.
(download-cacao): Likewise.
(download-jamvm): Likewise.
(download-hotspot): Likewise.
(download-jaxp-drop): Likewise.
(download-jaxws-drop): Likewise.
(download-jaf-drop): Likewise.
diffstat:
ChangeLog | 31 +++++++++++++
Makefile.am | 134 ++++++++++++++++++++++++++++++++++++----------------------
NEWS | 1 +
acinclude.m4 | 23 ++++++++++
configure.ac | 1 +
5 files changed, 139 insertions(+), 51 deletions(-)
diffs (280 lines):
diff -r 8bfbcf3a5d93 -r 9fe1e3e1d4dc ChangeLog
--- a/ChangeLog Tue Sep 25 17:22:04 2012 +0100
+++ b/ChangeLog Tue Sep 25 18:06:05 2012 +0100
@@ -1,3 +1,34 @@
+2012-04-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (download-openjdk): Fix syntax.
+ (download-cacao): Likewise.
+ (download-jamvm): Likewise.
+ (download-hotspot): Likewise.
+ (download-jaxp-drop): Likewise.
+ (download-jaxws-drop): Likewise.
+ (download-jaf-drop): Likewise.
+
+2012-09-25 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: List PR1114.
+
+2012-04-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (download-openjdk): Don't download unless
+ enable_downloading is set.
+ (download-cacao): Likewise.
+ (download-jamvm): Likewise.
+ (download-hotspot): Likewise.
+ (download-jaxp-drop): Likewise.
+ (download-jaxws-drop): Likewise.
+ (download-jaf-drop): Likewise.
+ * acinclude.m4:
+ (IT_CHECK_FOR_DOWNLOADING): New option
+ --disable-downloading.
+ * configure.ac: Call IT_CHECK_FOR_DOWNLOADING.
+
2012-09-25 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r 8bfbcf3a5d93 -r 9fe1e3e1d4dc Makefile.am
--- a/Makefile.am Tue Sep 25 17:22:04 2012 +0100
+++ b/Makefile.am Tue Sep 25 18:06:05 2012 +0100
@@ -762,15 +762,19 @@
if ! echo "$(JAXP_DROP_SHA256SUM) drops/$(JAXP_DROP_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ -f drops/$(JAXP_DROP_ZIP) ] ; \
- then \
- mv drops/$(JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP).old ; \
+ if test "x$(enable_downloading)" = "xyes"; then \
+ if [ -f drops/$(JAXP_DROP_ZIP) ] ; \
+ then \
+ mv drops/$(JAXP_DROP_ZIP) drops/$(JAXP_DROP_ZIP).old ; \
+ fi ; \
+ $(WGET) $(JAXP_DROP_URL)/$(JAXP_DROP_ZIP) -O drops/$(JAXP_DROP_ZIP); \
+ if ! echo "$(JAXP_DROP_SHA256SUM) drops/$(JAXP_DROP_ZIP)" \
+ | $(SHA256SUM) --check ; \
+ then echo "ERROR: Bad download of jaxp drop zip"; false; \
+ fi; \
+ else \
+ echo "ERROR: No up-to-date JAXP drop zip available"; exit -1; \
fi ; \
- $(WGET) $(JAXP_DROP_URL)/$(JAXP_DROP_ZIP) -O drops/$(JAXP_DROP_ZIP); \
- if ! echo "$(JAXP_DROP_SHA256SUM) drops/$(JAXP_DROP_ZIP)" \
- | $(SHA256SUM) --check ; \
- then echo "ERROR: Bad download of jaxp drop zip"; false; \
- fi; \
fi ;
mkdir -p stamps
touch $@
@@ -787,14 +791,18 @@
if ! echo "$(JAF_DROP_SHA256SUM) drops/$(JAF_DROP_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ -f drops/$(JAF_DROP_ZIP) ] ; \
- then \
- mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \
- fi ; \
- $(WGET) $(JAF_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
- if ! echo "$(JAF_DROP_SHA256SUM) drops/$(JAF_DROP_ZIP)" \
- | $(SHA256SUM) --check ; \
- then echo "ERROR: Bad download of jaf drop zip"; false; \
+ if test "x$(enable_downloading)" = "xyes"; then \
+ if [ -f drops/$(JAF_DROP_ZIP) ] ; \
+ then \
+ mv drops/$(JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP).old ; \
+ fi ; \
+ $(WGET) $(JAF_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
+ if ! echo "$(JAF_DROP_SHA256SUM) drops/$(JAF_DROP_ZIP)" \
+ | $(SHA256SUM) --check ; \
+ then echo "ERROR: Bad download of jaf drop zip"; false; \
+ fi; \
+ else \
+ echo "ERROR: No up-to-date JAF drop zip available"; exit -1; \
fi; \
fi ;
mkdir -p stamps
@@ -812,14 +820,18 @@
if ! echo "$(JAXWS_DROP_SHA256SUM) drops/$(JAXWS_DROP_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ -f drops/$(JAXWS_DROP_ZIP) ] ; \
- then \
- mv drops/$(JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP).old ; \
- fi ; \
- $(WGET) $(JAXWS_DROP_URL)/$(JAXWS_DROP_ZIP) -O drops/$(JAXWS_DROP_ZIP); \
- if ! echo "$(JAXWS_DROP_SHA256SUM) drops/$(JAXWS_DROP_ZIP)" \
- | $(SHA256SUM) --check ; \
- then echo "ERROR: Bad download of jaxws drop zip"; false; \
+ if test "x$(enable_downloading)" = "xyes"; then \
+ if [ -f drops/$(JAXWS_DROP_ZIP) ] ; \
+ then \
+ mv drops/$(JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP).old ; \
+ fi ; \
+ $(WGET) $(JAXWS_DROP_URL)/$(JAXWS_DROP_ZIP) -O drops/$(JAXWS_DROP_ZIP); \
+ if ! echo "$(JAXWS_DROP_SHA256SUM) drops/$(JAXWS_DROP_ZIP)" \
+ | $(SHA256SUM) --check ; \
+ then echo "ERROR: Bad download of jaxws drop zip"; false; \
+ fi; \
+ else \
+ echo "ERROR: No up-to-date JAXWS drop zip available"; exit -1; \
fi; \
fi ;
mkdir -p stamps
@@ -844,15 +856,18 @@
if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ -e $(CACAO_SRC_ZIP) ] ; \
- then \
- mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
+ if test "x$(enable_downloading)" = "xyes"; then \
+ if [ -e $(CACAO_SRC_ZIP) ] ; then \
+ mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
+ fi ; \
+ $(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \
+ if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; then \
+ echo "ERROR: Bad download of CACAO zip"; false; \
+ fi; \
+ else \
+ echo "ERROR: No up-to-date CACAO zip available"; exit -1; \
fi ; \
- $(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \
- if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
- | $(SHA256SUM) --check ; \
- then echo "ERROR: Bad download of CACAO zip"; false; \
- fi; \
fi
endif
endif
@@ -872,15 +887,18 @@
if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ -e $(JAMVM_SRC_ZIP) ] ; \
- then \
- mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \
- fi ; \
- $(WGET) $(JAMVM_URL) -O $(JAMVM_SRC_ZIP); \
- if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \
- | $(SHA256SUM) --check ; \
- then echo "ERROR: Bad download of JamVM zip"; false; \
- fi; \
+ if test "x$(enable_downloading)" = "xyes"; then \
+ if [ -e $(JAMVM_SRC_ZIP) ] ; then \
+ mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \
+ fi ; \
+ $(WGET) $(JAMVM_URL) -O $(JAMVM_SRC_ZIP); \
+ if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; then \
+ echo "ERROR: Bad download of JamVM zip"; false; \
+ fi; \
+ else \
+ echo "ERROR: No up-to-date JamVM zip available"; exit -1; \
+ fi ; \
fi
endif
mkdir -p stamps
@@ -914,11 +932,18 @@
if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ -e $(OPENJDK_SRC_ZIP) ] ; \
- then \
- mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+ if test "x$(enable_downloading)" = "xyes"; then \
+ if [ -e $(OPENJDK_SRC_ZIP) ] ; then \
+ mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
+ fi ; \
+ $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
+ if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; then \
+ echo "ERROR: Bad download of OpenJDK zip"; false; \
+ fi; \
+ else \
+ echo "ERROR: No up-to-date OpenJDK zip available"; exit -1; \
fi ; \
- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
fi
endif
endif
@@ -941,13 +966,20 @@
if ! echo "$${hotspot_sha256sum} $(HOTSPOT_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
- if [ -e $(HOTSPOT_SRC_ZIP) ] ; \
- then \
- mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
+ if test "x$(enable_downloading)" = "xyes"; then \
+ if [ -e $(HOTSPOT_SRC_ZIP) ] ; then \
+ mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
+ fi ; \
+ hotspot_url="`$(AWK) 'version==$$1 {print $$2 "/archive/" $$3 ".tar.gz"}' \
+ version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"; \
+ $(WGET) $${hotspot_url} -O $(HOTSPOT_SRC_ZIP) ; \
+ if ! echo "$${hotspot_sha256sum} $(HOTSPOT_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; then \
+ echo "ERROR: Bad download of HotSpot zip"; false; \
+ fi; \
+ else \
+ echo "ERROR: No up-to-date HotSpot zip available"; exit -1; \
fi ; \
- hotspot_url="`$(AWK) 'version==$$1 {print $$2 "/archive/" $$3 ".tar.gz"}' \
- version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"; \
- $(WGET) $${hotspot_url} -O $(HOTSPOT_SRC_ZIP) ; \
fi
endif
mkdir -p stamps
diff -r 8bfbcf3a5d93 -r 9fe1e3e1d4dc NEWS
--- a/NEWS Tue Sep 25 17:22:04 2012 +0100
+++ b/NEWS Tue Sep 25 18:06:05 2012 +0100
@@ -51,6 +51,7 @@
- PR1121: Old installs still suffer from GCC PR41686
- PR1119: Only add classes to rt-source-files.txt if the class (or one or more of its methods/fields)
are actually missing from the boot JDK
+ - PR1114: Provide option to turn off downloading of tarballs (--disable-downloading)
* JamVM
- ARMv6 armhf: Changes for Raspbian (Raspberry Pi)
- PPC: Don't use lwsync if it isn't supported
diff -r 8bfbcf3a5d93 -r 9fe1e3e1d4dc acinclude.m4
--- a/acinclude.m4 Tue Sep 25 17:22:04 2012 +0100
+++ b/acinclude.m4 Tue Sep 25 18:06:05 2012 +0100
@@ -1834,3 +1834,26 @@
AM_CONDITIONAL([LACKS_$1], test x"${it_cv_$1}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN([IT_CHECK_IF_DOWNLOADING],
+[
+ AC_MSG_CHECKING([whether to download tarballs])
+ AC_ARG_ENABLE([downloading],
+ [AS_HELP_STRING(--disable-downloading,don't download tarballs [[default=no]])],
+ [
+ case "${enableval}" in
+ no)
+ enable_downloading=no
+ ;;
+ *)
+ enable_downloading=yes
+ ;;
+ esac
+ ],
+ [
+ enable_downloading=yes
+ ])
+ AC_MSG_RESULT([${enable_downloading}])
+ AM_CONDITIONAL([DOWNLOADING], test x"${enable_downloading}" = "xyes")
+ AC_SUBST([enable_downloading])
+])
diff -r 8bfbcf3a5d93 -r 9fe1e3e1d4dc configure.ac
--- a/configure.ac Tue Sep 25 17:22:04 2012 +0100
+++ b/configure.ac Tue Sep 25 18:06:05 2012 +0100
@@ -149,6 +149,7 @@
AC_SUBST(OPENJDK_BUILD_DIR)
IT_CHECK_IF_BOOTSTRAPPING
+IT_CHECK_IF_DOWNLOADING
IT_FIND_JAVA
IT_FIND_COMPILER
IT_FIND_JAVAH
More information about the distro-pkg-dev
mailing list