Mercurial > hg > icedtea12

changeset 2524:0414cb086a6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR1275: Provide option to turn off downloading of tarballs 2015-02-25 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am: (download-nashorn): Don't download unless enable_downloading is set. (download-hotspot): Likewise. 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 <gnu_andrew@member.fsf.org>
date Thu, 26 Feb 2015 00:23:44 +0000
parents ecb919dbfe35
children 98becf54fa63
files ChangeLog Makefile.am NEWS acinclude.m4 configure.ac
diffstat 5 files changed, 161 insertions(+), 86 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Sep 10 21:37:48 2014 +0100
+++ b/ChangeLog	Thu Feb 26 00:23:44 2015 +0000
@@ -1,3 +1,23 @@
+2015-02-25  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(download-nashorn): Don't download unless
+	enable_downloading is set.
+	(download-hotspot): Likewise.
+
+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.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_CHECK_FOR_DOWNLOADING): New option
+	--disable-downloading.
+	* configure.ac: Call IT_CHECK_FOR_DOWNLOADING.
+
 2014-09-10  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am:
--- a/Makefile.am	Wed Sep 10 21:37:48 2014 +0100
+++ b/Makefile.am	Thu Feb 26 00:23:44 2015 +0000
@@ -588,15 +588,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) $(ICEDTEA_URL)/$(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) $(ICEDTEA_URL)/$(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)
@@ -604,15 +607,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) $(ICEDTEA_URL)/$(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) $(ICEDTEA_URL)/$(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)
@@ -620,15 +626,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) $(ICEDTEA_URL)/$(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) $(ICEDTEA_URL)/$(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)
@@ -636,15 +645,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) $(ICEDTEA_URL)/$(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) $(ICEDTEA_URL)/$(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)
@@ -652,15 +664,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) $(ICEDTEA_URL)/$(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) $(ICEDTEA_URL)/$(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)
@@ -668,15 +683,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) $(ICEDTEA_URL)/$(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) $(ICEDTEA_URL)/$(LANGTOOLS_SRC_ZIP); \
-	  if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
-	    | $(SHA256SUM) --check ; \
-	  then echo "ERROR: Bad download of langtools zip"; false; \
-	  fi; \
 	fi ;
 endif
 endif
@@ -713,15 +731,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
@@ -740,15 +761,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
@@ -770,16 +794,19 @@
 	if ! echo "$(NASHORN_SHA256SUM)  $(NASHORN_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
-	  if [ $(NASHORN_SRC_ZIP) ] ; \
-	  then \
-	    mv $(NASHORN_SRC_ZIP) $(NASHORN_SRC_ZIP).old ; \
+	  if test "x$${enable_downloading}" = "xyes"; then \
+	    if [ -e $(NASHORN_SRC_ZIP) ] ; then \
+	      mv $(NASHORN_SRC_ZIP) $(NASHORN_SRC_ZIP).old ; \
+	    fi ; \
+	    $(WGET) $(ICEDTEA_URL)/$(NASHORN_SRC_ZIP); \
+	    if ! echo "$(NASHORN_SHA256SUM)  $(NASHORN_SRC_ZIP)" \
+	      | $(SHA256SUM) --check ; then \
+	      echo "ERROR: Bad download of NASHORN zip"; false; \
+	    fi; \
+	  else \
+	    echo "ERROR: No up-to-date OpenJDK Nashorn zip available"; exit -1; \
 	  fi ; \
-	  $(WGET) $(ICEDTEA_URL)/$(NASHORN_SRC_ZIP); \
-	  if ! echo "$(NASHORN_SHA256SUM)  $(NASHORN_SRC_ZIP)" \
-	    | $(SHA256SUM) --check ; \
-	  then echo "ERROR: Bad download of NASHORN zip"; false; \
-	  fi; \
-	fi ;
+	fi
 endif
 endif
 	mkdir -p stamps
@@ -803,19 +830,22 @@
 	if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
 	  | $(SHA256SUM) --check ; \
 	then \
-	  if [ -e $(HOTSPOT_SRC_ZIP) ] ; \
-	  then \
-	    mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
-	  fi ; \
-	  if test "x$(HS_TYPE)" = "xhg"; then \
-	    $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+	  if test "x$${enable_downloading}" = "xyes"; then \
+	    if [ -e $(HOTSPOT_SRC_ZIP) ] ; then \
+	      mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
+	    fi ; \
+	    if test "x$(HS_TYPE)" = "xhg"; then \
+	      $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+	    else \
+	      $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
+            fi ; \
+	    if ! echo "$(HOTSPOT_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
+	      | $(SHA256SUM) --check ; then \
+	      echo "ERROR: Bad download of HotSpot zip"; false; \
+	    fi; \
 	  else \
-	    $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
-          fi ; \
-	  if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
-	    | $(SHA256SUM) --check ; \
-	  then echo "ERROR: Bad download of HotSpot zip"; false; \
-	  fi; \
+	    echo "ERROR: No up-to-date OpenJDK HotSpot zip available"; exit -1; \
+	  fi ; \
 	fi
 endif
 endif
--- a/NEWS	Wed Sep 10 21:37:48 2014 +0100
+++ b/NEWS	Thu Feb 26 00:23:44 2015 +0000
@@ -24,6 +24,7 @@
 * Bug fixes
   - S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM
   - PR729: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops
+  - PR1275: Provide option to turn off downloading of tarballs
   - PR1279: Synchronise CACAO versions between IcedTea6/7/8 where possible
   - PR1325: Only add classes to rt-source-files.txt if actually needed
   - PR1346: Filter out -j option to make
--- a/acinclude.m4	Wed Sep 10 21:37:48 2014 +0100
+++ b/acinclude.m4	Thu Feb 26 00:23:44 2015 +0000
@@ -1670,6 +1670,29 @@
 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])
+])
+
 # Finds number of available processors using sysconf
 AC_DEFUN_ONCE([IT_FIND_NUMBER_OF_PROCESSORS],[
   IT_FIND_TOOL([GETCONF], [getconf])
--- a/configure.ac	Wed Sep 10 21:37:48 2014 +0100
+++ b/configure.ac	Thu Feb 26 00:23:44 2015 +0000
@@ -94,6 +94,7 @@
 
 IT_CHECK_NUMBER_OF_PARALLEL_JOBS
 IT_CHECK_IF_BOOTSTRAPPING
+IT_CHECK_IF_DOWNLOADING
 IT_CHECK_FOR_JDK
 IT_FIND_JAVA
 IT_FIND_JAVA_COMPILER