Mercurial > hg > release > icedtea7-2.2
changeset 2538:2c3f32cee817
Allow downloading to be disabled.
2012-04-11 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(download-openjdk): Don't download unless
enable_downloading is set.
(download-cacao): Likewise.
(download-jamvm): Likewise.
* acinclude.m4:
(IT_CHECK_FOR_DOWNLOADING): New option
--disable-downloading.
* configure.ac: Call IT_CHECK_FOR_DOWNLOADING.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Wed, 11 Apr 2012 18:36:03 +0100 |
parents | d9400e955e0f |
children | 887110bdf826 |
files | ChangeLog Makefile.am acinclude.m4 configure.ac |
diffstat | 4 files changed, 136 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Apr 06 20:52:28 2012 +0100 +++ b/ChangeLog Wed Apr 11 18:36:03 2012 +0100 @@ -1,3 +1,15 @@ +2012-04-11 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (download-openjdk): Don't download unless + enable_downloading is set. + (download-cacao): Likewise. + (download-jamvm): Likewise. + * acinclude.m4: + (IT_CHECK_FOR_DOWNLOADING): New option + --disable-downloading. + * configure.ac: Call IT_CHECK_FOR_DOWNLOADING. + 2012-04-06 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Fri Apr 06 20:52:28 2012 +0100 +++ b/Makefile.am Wed Apr 11 18:36:03 2012 +0100 @@ -855,15 +855,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)/archive/$(OPENJDK_CHANGESET).tar.gz -O $(OPENJDK_SRC_ZIP); \ + if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \ + | $(SHA256SUM) --check ; then \ + echo "ERROR: Bad download of OpenJDK root zip"; false; \ + fi; \ + else \ + echo "ERROR: No up-to-date OpenJDK root zip available"; exit -1; \ fi ; \ - $(WGET) $(OPENJDK_URL)/archive/$(OPENJDK_CHANGESET).tar.gz -O $(OPENJDK_SRC_ZIP); \ - if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then echo "ERROR: Bad download of OpenJDK root zip"; false; \ - fi; \ fi ; if USE_ALT_CORBA_SRC_ZIP ln -sf $(ALT_CORBA_SRC_ZIP) $(CORBA_SRC_ZIP) @@ -871,15 +874,18 @@ if ! echo "$(CORBA_SHA256SUM) $(CORBA_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ - if [ $(CORBA_SRC_ZIP) ] ; \ - then \ - mv $(CORBA_SRC_ZIP) $(CORBA_SRC_ZIP).old ; \ + if test "x$${enable_downloading}" = "xyes"; then \ + if [ $(CORBA_SRC_ZIP) ] ; then \ + mv $(CORBA_SRC_ZIP) $(CORBA_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(CORBA_URL)/archive/$(CORBA_CHANGESET).tar.gz -O $(CORBA_SRC_ZIP); \ + if ! echo "$(CORBA_SHA256SUM) $(CORBA_SRC_ZIP)" \ + | $(SHA256SUM) --check ; then \ + echo "ERROR: Bad download of CORBA zip"; false; \ + fi; \ + else \ + echo "ERROR: No up-to-date OpenJDK CORBA zip available"; exit -1; \ fi ; \ - $(WGET) $(CORBA_URL)/archive/$(CORBA_CHANGESET).tar.gz -O $(CORBA_SRC_ZIP); \ - if ! echo "$(CORBA_SHA256SUM) $(CORBA_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then echo "ERROR: Bad download of CORBA zip"; false; \ - fi; \ fi ; if USE_ALT_JAXP_SRC_ZIP ln -sf $(ALT_JAXP_SRC_ZIP) $(JAXP_SRC_ZIP) @@ -887,15 +893,18 @@ if ! echo "$(JAXP_SHA256SUM) $(JAXP_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ - if [ $(JAXP_SRC_ZIP) ] ; \ - then \ - mv $(JAXP_SRC_ZIP) $(JAXP_SRC_ZIP).old ; \ + if test "x$${enable_downloading}" = "xyes"; then \ + if [ $(JAXP_SRC_ZIP) ] ; then \ + mv $(JAXP_SRC_ZIP) $(JAXP_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(JAXP_URL)/archive/$(JAXP_CHANGESET).tar.gz -O $(JAXP_SRC_ZIP); \ + if ! echo "$(JAXP_SHA256SUM) $(JAXP_SRC_ZIP)" \ + | $(SHA256SUM) --check ; then \ + echo "ERROR: Bad download of JAXP zip"; false; \ + fi; \ + else \ + echo "ERROR: No up-to-date JAXP root zip available"; exit -1; \ fi ; \ - $(WGET) $(JAXP_URL)/archive/$(JAXP_CHANGESET).tar.gz -O $(JAXP_SRC_ZIP); \ - if ! echo "$(JAXP_SHA256SUM) $(JAXP_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then echo "ERROR: Bad download of JAXP zip"; false; \ - fi; \ fi ; if USE_ALT_JAXWS_SRC_ZIP ln -sf $(ALT_JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP) @@ -903,15 +912,18 @@ if ! echo "$(JAXWS_SHA256SUM) $(JAXWS_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ - if [ $(JAXWS_SRC_ZIP) ] ; \ - then \ - mv $(JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP).old ; \ + if test "x$${enable_downloading}" = "xyes"; then \ + if [ $(JAXWS_SRC_ZIP) ] ; then \ + mv $(JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(JAXWS_URL)/archive/$(JAXWS_CHANGESET).tar.gz -O $(JAXWS_SRC_ZIP); \ + if ! echo "$(JAXWS_SHA256SUM) $(JAXWS_SRC_ZIP)" \ + | $(SHA256SUM) --check ; then \ + echo "ERROR: Bad download of JAXWS zip"; false; \ + fi; \ + else \ + echo "ERROR: No up-to-date OpenJDK JAXWS zip available"; exit -1; \ fi ; \ - $(WGET) $(JAXWS_URL)/archive/$(JAXWS_CHANGESET).tar.gz -O $(JAXWS_SRC_ZIP); \ - if ! echo "$(JAXWS_SHA256SUM) $(JAXWS_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then echo "ERROR: Bad download of JAXWS zip"; false; \ - fi; \ fi ; if USE_ALT_JDK_SRC_ZIP ln -sf $(ALT_JDK_SRC_ZIP) $(JDK_SRC_ZIP) @@ -919,15 +931,18 @@ if ! echo "$(JDK_SHA256SUM) $(JDK_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ - if [ $(JDK_SRC_ZIP) ] ; \ - then \ - mv $(JDK_SRC_ZIP) $(JDK_SRC_ZIP).old ; \ + if test "x$${enable_downloading}" = "xyes"; then \ + if [ $(JDK_SRC_ZIP) ] ; then \ + mv $(JDK_SRC_ZIP) $(JDK_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(JDK_URL)/archive/$(JDK_CHANGESET).tar.gz -O $(JDK_SRC_ZIP); \ + if ! echo "$(JDK_SHA256SUM) $(JDK_SRC_ZIP)" \ + | $(SHA256SUM) --check ; then \ + echo "ERROR: Bad download of JDK zip"; false; \ + fi; \ + else \ + echo "ERROR: No up-to-date OpenJDK JDK zip available"; exit -1; \ fi ; \ - $(WGET) $(JDK_URL)/archive/$(JDK_CHANGESET).tar.gz -O $(JDK_SRC_ZIP); \ - if ! echo "$(JDK_SHA256SUM) $(JDK_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then echo "ERROR: Bad download of JDK zip"; false; \ - fi; \ fi ; if USE_ALT_LANGTOOLS_SRC_ZIP ln -sf $(ALT_LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP) @@ -935,15 +950,18 @@ if ! echo "$(LANGTOOLS_SHA256SUM) $(LANGTOOLS_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \ - if [ $(LANGTOOLS_SRC_ZIP) ] ; \ - then \ - mv $(LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP).old ; \ + if test "x$${enable_downloading}" = "xyes"; then \ + if [ $(LANGTOOLS_SRC_ZIP) ] ; then \ + mv $(LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP).old ; \ + fi ; \ + $(WGET) $(LANGTOOLS_URL)/archive/$(LANGTOOLS_CHANGESET).tar.gz -O $(LANGTOOLS_SRC_ZIP); \ + if ! echo "$(LANGTOOLS_SHA256SUM) $(LANGTOOLS_SRC_ZIP)" \ + | $(SHA256SUM) --check ; then \ + echo "ERROR: Bad download of langtools zip"; false; \ + fi; \ + else \ + echo "ERROR: No up-to-date OpenJDK langtools zip available"; exit -1; \ fi ; \ - $(WGET) $(LANGTOOLS_URL)/archive/$(LANGTOOLS_CHANGESET).tar.gz -O $(LANGTOOLS_SRC_ZIP); \ - if ! echo "$(LANGTOOLS_SHA256SUM) $(LANGTOOLS_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then echo "ERROR: Bad download of langtools zip"; false; \ - fi; \ fi ; if USE_ALT_HOTSPOT_SRC_ZIP ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP) @@ -951,15 +969,18 @@ if ! echo "$(HS_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 ; \ + $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -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 OpenJDK HotSpot zip available"; exit -1; \ fi ; \ - $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \ - if ! echo "$(HOTSPOT_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \ - | $(SHA256SUM) --check ; \ - then echo "ERROR: Bad download of HotSpot zip"; false; \ - fi; \ fi endif endif @@ -1005,15 +1026,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 @@ -1032,15 +1056,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
--- a/acinclude.m4 Fri Apr 06 20:52:28 2012 +0100 +++ b/acinclude.m4 Wed Apr 11 18:36:03 2012 +0100 @@ -2178,3 +2178,26 @@ AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "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]) +])