Mercurial > hg > release > icedtea-1.10
changeset 1841:cecded2429ca
Fix an issue where alternate zip files are only used if --with-openjdk-src-zip is set.
2009-05-27 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Allow setting of some zip files and not
others.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 27 May 2009 20:20:48 +0100 |
| parents | caf6ea78c242 |
| children | 31b0ba36a6b7 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 33 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 27 20:01:08 2009 +0100 +++ b/ChangeLog Wed May 27 20:20:48 2009 +0100 @@ -1,3 +1,9 @@ +2009-05-27 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + Allow setting of some zip files and not + others. + 2009-05-27 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Wed May 27 20:01:08 2009 +0100 +++ b/Makefile.am Wed May 27 20:20:48 2009 +0100 @@ -1693,9 +1693,6 @@ LANGTOOLS_URL = $(ICEDTEA_HG_URL)/langtools HOTSPOT_URL = $(ICEDTEA_HG_URL)/hotspot -if USE_ALT_OPENJDK_SRC_ZIP - OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) -else if USE_HG OPENJDK_SRC_ZIP = CORBA_SRC_ZIP = @@ -1705,20 +1702,43 @@ LANGTOOLS_SRC_ZIP = HOTSPOT_SRC_ZIP = else +if USE_ALT_OPENJDK_SRC_ZIP + OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) +else OPENJDK_SRC_ZIP = openjdk.tar.gz +endif +if USE_ALT_CORBA_SRC_ZIP + CORBA_SRC_ZIP = $(ALT_CORBA_SRC_ZIP) +else CORBA_SRC_ZIP = corba.tar.gz +endif +if USE_ALT_JAXP_SRC_ZIP + JAXP_SRC_ZIP = $(ALT_JAXP_SRC_ZIP) +else JAXP_SRC_ZIP = jaxp.tar.gz +endif +if USE_ALT_JAXWS_SRC_ZIP + JAXWS_SRC_ZIP = $(ALT_JAXWS_SRC_ZIP) +else JAXWS_SRC_ZIP = jaxws.tar.gz +endif +if USE_ALT_JDK_SRC_ZIP + JDK_SRC_ZIP = $(ALT_JDK_SRC_ZIP) +else JDK_SRC_ZIP = jdk.tar.gz +endif +if USE_ALT_LANGTOOLS_SRC_ZIP + LANGTOOLS_SRC_ZIP = $(ALT_LANGTOOLS_SRC_ZIP) +else LANGTOOLS_SRC_ZIP = langtools.tar.gz +endif +if USE_ALT_HOTSPOT_SRC_ZIP + HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP) +else HOTSPOT_SRC_ZIP = hotspot.tar.gz endif endif -if USE_ALT_HOTSPOT_SRC_ZIP - HOTSPOT_SRC_ZIP = $(ALT_HOTSPOT_SRC_ZIP) -endif - if WITH_ALT_HSBUILD HS_MD5SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" @@ -1729,26 +1749,6 @@ HS_URL = $(HOTSPOT_URL) endif -if USE_ALT_CORBA_SRC_ZIP - CORBA_SRC_ZIP = $(ALT_CORBA_SRC_ZIP) -endif - -if USE_ALT_JAXP_SRC_ZIP - JAXP_SRC_ZIP = $(ALT_JAXP_SRC_ZIP) -endif - -if USE_ALT_JAXWS_SRC_ZIP - JAXWS_SRC_ZIP = $(ALT_JAXWS_SRC_ZIP) -endif - -if USE_ALT_JDK_SRC_ZIP - JDK_SRC_ZIP = $(ALT_JDK_SRC_ZIP) -endif - -if USE_ALT_LANGTOOLS_SRC_ZIP - LANGTOOLS_SRC_ZIP = $(ALT_LANGTOOLS_SRC_ZIP) -endif - CACAO_BASE_URL = http://www.complang.tuwien.ac.at CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/