/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Nov 17 11:44:48 PST 2009
changeset 9c090fa1a619 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c090fa1a619
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 19:31:54 2009 +0000
Always checksum zips, even if specified with --with-alt-x.
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Always compute the checksums of zip
files even when specified by --with-alt-src-zip.
Switch the alternate HotSpot build to SHA256 checksums.
(hgforest.stamp): Simplified to just if USE_HG. (download-
openjdk.stamp): Symlink alternate zip files and then check,
instead of jumping the download step altogether.
(download-cacao.stamp): Likewise.
* hotspot.map: Remove dead redundant line for old original
build.
changeset 713bd5db2ed2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=713bd5db2ed2
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 19:44:03 2009 +0000
Use SHA256 checksums throughout.
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Use SHA256 checksums for all.
(download-visualvm.stamp): Use SHA256 checksums. (download-
cacao.stamp): Likewise. (download-jaf-drop.stamp): Likewise.
(download-jaxws-drop.stamp): Likewise.
* configure.ac: Remove search for MD5SUM tool.
changeset 3b4962f39f65 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3b4962f39f65
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 19:49:20 2009 +0000
Add additional JAXWS gcj 4.3 fix for AttributeBase.java
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-jaxws-getdtdtype.patch: Add
additional fix for AttributeBase.java
diffstat:
5 files changed, 101 insertions(+), 82 deletions(-)
ChangeLog | 31 +++++++
Makefile.am | 138 +++++++++++++-------------------
configure.ac | 1
hotspot.map | 1
patches/icedtea-jaxws-getdtdtype.patch | 12 ++
diffs (396 lines):
diff -r ee96b94c9270 -r 3b4962f39f65 ChangeLog
--- a/ChangeLog Tue Nov 17 17:47:58 2009 +0000
+++ b/ChangeLog Tue Nov 17 19:49:20 2009 +0000
@@ -1,3 +1,34 @@ 2009-11-17 Andrew John Hughes <ahughes
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-jaxws-getdtdtype.patch:
+ Add additional fix for AttributeBase.java
+
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Use SHA256 checksums for all.
+ (download-visualvm.stamp): Use SHA256 checksums.
+ (download-cacao.stamp): Likewise.
+ (download-jaf-drop.stamp): Likewise.
+ (download-jaxws-drop.stamp): Likewise.
+ * configure.ac:
+ Remove search for MD5SUM tool.
+
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Always compute the checksums of zip files
+ even when specified by --with-alt-src-zip.
+ Switch the alternate HotSpot build to SHA256
+ checksums.
+ (hgforest.stamp): Simplified to just if USE_HG.
+ (download-openjdk.stamp): Symlink alternate
+ zip files and then check, instead of jumping
+ the download step altogether.
+ (download-cacao.stamp): Likewise.
+ * hotspot.map: Remove dead redundant line for
+ old original build.
+
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-jaxws-getdtdtype.patch:
diff -r ee96b94c9270 -r 3b4962f39f65 Makefile.am
--- a/Makefile.am Tue Nov 17 17:47:58 2009 +0000
+++ b/Makefile.am Tue Nov 17 19:49:20 2009 +0000
@@ -19,23 +19,24 @@ OPENJDK_SHA256SUM = 6a28cd0ba1bcc4290175
OPENJDK_SHA256SUM = 6a28cd0ba1bcc4290175497e6cfe11295a8e4f82f4c030b3e5686f7c48297936
CACAO_VERSION = 0.99.4
-CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
+CACAO_SHA256SUM = c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf
CACAO_BASE_URL = http://www.complang.tuwien.ac.at
CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/download/cacao-$(CACAO_VERSION)/
+CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release65_mod.tar.gz
-NETBEANS_PROFILER_MD5SUM = a6756a62291ebea5c0e2431389b31380
+NETBEANS_PROFILER_SHA256SUM = b57b8d90e5749b80885c03abe5547f0d671abebe7f4991d679fa8a0034ebf2c3
VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/
VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz
-VISUALVM_MD5SUM = a289739f4a5bcdb9a2c642cfcc1e83fe
+VISUALVM_SHA256SUM = 947b0af99a1263e14d496a7231445eeff3e04cb38877fd2b56e1b6f68a7ff710
JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip
-JAXWS_DROP_MD5SUM = f5010ebf636db9f465a61a7a74944543
+JAXWS_DROP_SHA256SUM = 272756b999e9ae2435da8d58e259562e61126e1c5b1f9421fe65423217cef8fd
JAF_DROP_ZIP = jdk7-jaf-2009_08_28.zip
-JAF_DROP_MD5SUM = eb8cb7a4a7f14e211fbe2354878a2472
+JAF_DROP_SHA256SUM = 8c81940b3017c0058367d7e7453123442f2cdd77c2bfe74acd9035f97e4db8e8
JAXP_DROP_URL = https://jaxp.dev.java.net/files/documents/913/144160
JAXP_DROP_ZIP = jdk7-jaxp-m5.zip
JAXP_DROP_SHA256SUM = ebab4c6c4e641a4c95a7b6669e78f9bb1149a11054fc5b423cf292b633d6be53
@@ -144,55 +145,21 @@ if USE_HG
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_CACAO_SRC_ZIP
- CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP)
-else
- CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2
-endif
if WITH_ALT_HSBUILD
- HS_MD5SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`"
+ HS_SHA256SUM = "`$(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`"
HS_URL = $(OPENJDK_HOTSPOT_URL)
else
- HS_MD5SUM = $(HOTSPOT_MD5SUM)
+ HS_SHA256SUM = $(HOTSPOT_SHA256SUM)
HS_CHANGESET = $(HOTSPOT_CHANGESET)
HS_URL = $(HOTSPOT_URL)
endif
@@ -769,20 +736,13 @@ dist-openjdk-fsg: stamps/patch-fsg.stamp
# Check for forest support
stamps/hgforest.stamp:
-if OPENJDK_SRC_DIR_FOUND
-else
-if USE_ALT_OPENJDK_SRC_ZIP
-else
-if !USE_HG
-else
+if USE_HG
if ! $(HG) fclone -h; \
then \
echo "No forest extension found. Please refer to" \
"http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \
exit 1; \
- fi;
-endif
-endif
+ fi;
endif
mkdir -p stamps
touch $@
@@ -831,16 +791,16 @@ if USE_ALT_JAF_DROP_ZIP
if USE_ALT_JAF_DROP_ZIP
ln -sf $(ALT_JAF_DROP_ZIP) drops/$(JAF_DROP_ZIP)
endif
- if ! echo "$(JAF_DROP_MD5SUM) drops/$(JAF_DROP_ZIP)" \
- | $(MD5SUM) --check ; \
+ 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) $(JAXWS_DROP_URL)/$(JAF_DROP_ZIP) -O drops/$(JAF_DROP_ZIP); \
- if ! echo "$(JAF_DROP_MD5SUM) drops/$(JAF_DROP_ZIP)" \
- | $(MD5SUM) --check ; \
+ if ! echo "$(JAF_DROP_SHA256SUM) drops/$(JAF_DROP_ZIP)" \
+ | $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of jaf drop zip"; false; \
fi; \
fi ;
@@ -856,16 +816,16 @@ if USE_ALT_JAXWS_DROP_ZIP
if USE_ALT_JAXWS_DROP_ZIP
ln -sf $(ALT_JAXWS_DROP_ZIP) drops/$(JAXWS_DROP_ZIP)
endif
- if ! echo "$(JAXWS_DROP_MD5SUM) drops/$(JAXWS_DROP_ZIP)" \
- | $(MD5SUM) --check ; \
+ 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_MD5SUM) drops/$(JAXWS_DROP_ZIP)" \
- | $(MD5SUM) --check ; \
+ if ! echo "$(JAXWS_DROP_SHA256SUM) drops/$(JAXWS_DROP_ZIP)" \
+ | $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of jaxws drop zip"; false; \
fi; \
fi ;
@@ -890,8 +850,6 @@ clean-drops: clean-download-jaxp-drop cl
stamps/download-openjdk.stamp: stamps/hgforest.stamp
if !OPENJDK_SRC_DIR_FOUND
-if USE_ALT_OPENJDK_SRC_ZIP
-else
if USE_CLOSURES
$(HG) fclone $(CLOSURES_HG_URL) openjdk;
else
@@ -917,6 +875,9 @@ else
$(HG) fclone $(ICEDTEA_HG_URL) openjdk;
endif
else
+if USE_ALT_OPENJDK_SRC_ZIP
+ ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
+endif
if ! echo "$(OPENJDK_SHA256SUM) $(OPENJDK_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -929,7 +890,10 @@ else
| $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of OpenJDK root zip"; false; \
fi; \
- fi ; \
+ fi ;
+if USE_ALT_CORBA_SRC_ZIP
+ ln -sf $(ALT_CORBA_SRC_ZIP) $(CORBA_SRC_ZIP)
+endif
if ! echo "$(CORBA_SHA256SUM) $(CORBA_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -942,7 +906,10 @@ else
| $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of CORBA zip"; false; \
fi; \
- fi ; \
+ fi ;
+if USE_ALT_JAXP_SRC_ZIP
+ ln -sf $(ALT_JAXP_SRC_ZIP) $(JAXP_SRC_ZIP)
+endif
if ! echo "$(JAXP_SHA256SUM) $(JAXP_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -955,7 +922,10 @@ else
| $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of JAXP zip"; false; \
fi; \
- fi ; \
+ fi ;
+if USE_ALT_JAXWS_SRC_ZIP
+ ln -sf $(ALT_JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP)
+endif
if ! echo "$(JAXWS_SHA256SUM) $(JAXWS_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -968,7 +938,10 @@ else
| $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of JAXWS zip"; false; \
fi; \
- fi ; \
+ fi ;
+if USE_ALT_JDK_SRC_ZIP
+ ln -sf $(ALT_JDK_SRC_ZIP) $(JDK_SRC_ZIP)
+endif
if ! echo "$(JDK_SHA256SUM) $(JDK_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -981,7 +954,10 @@ else
| $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of JDK zip"; false; \
fi; \
- fi ; \
+ fi ;
+if USE_ALT_LANGTOOLS_SRC_ZIP
+ ln -sf $(ALT_LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP)
+endif
if ! echo "$(LANGTOOLS_SHA256SUM) $(LANGTOOLS_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -995,6 +971,9 @@ else
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)
+endif
if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -1016,7 +995,6 @@ endif
endif
endif
endif
-endif
mkdir -p stamps
touch $@
@@ -1062,21 +1040,21 @@ if BUILD_CACAO
if BUILD_CACAO
if !USE_SYSTEM_CACAO
if USE_ALT_CACAO_SRC_ZIP
-else
- if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
+ ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
+endif
+ if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
then \
if [ $(CACAO_SRC_ZIP) ] ; \
then \
mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
fi ; \
$(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
- if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
+ if ! echo "$(CACAO_SHA256SUM) $(CACAO_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of CACAO zip"; false; \
fi; \
fi
-endif
endif
endif
mkdir -p stamps
@@ -1092,8 +1070,8 @@ endif
stamps/download-visualvm.stamp:
if WITH_VISUALVM
- if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
+ if ! echo "$(NETBEANS_PROFILER_SHA256SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
then \
if [ $(NETBEANS_PROFILER_SRC_ZIP) ] ; \
then \
@@ -1101,14 +1079,14 @@ if WITH_VISUALVM
fi ; \
$(WGET) $(NETBEANS_PROFILER_URL)$(NETBEANS_PROFILER_SRC_ZIP) \
-O $(NETBEANS_PROFILER_SRC_ZIP) ; \
- if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
+ if ! echo "$(NETBEANS_PROFILER_SHA256SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of NetBeans profiler zip"; false; \
fi; \
fi
- if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
+ if ! echo "$(VISUALVM_SHA256SUM) $(VISUALVM_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
then \
if [ $(VISUALVM_SRC_ZIP) ] ; \
then \
@@ -1116,8 +1094,8 @@ if WITH_VISUALVM
fi ; \
$(WGET) $(VISUALVM_URL)$(VISUALVM_SRC_ZIP) \
-O $(VISUALVM_SRC_ZIP) ; \
- if ! echo "$(VISUALVM_MD5SUM) $(VISUALVM_SRC_ZIP)" \
- | $(MD5SUM) --check ; \
+ if ! echo "$(VISUALVM_SHA256SUM) $(VISUALVM_SRC_ZIP)" \
+ | $(SHA256SUM) --check ; \
then echo "ERROR: Bad download of VisualVM zip"; false; \
fi; \
fi
diff -r ee96b94c9270 -r 3b4962f39f65 configure.ac
--- a/configure.ac Tue Nov 17 17:47:58 2009 +0000
+++ b/configure.ac Tue Nov 17 19:49:20 2009 +0000
@@ -25,7 +25,6 @@ FIND_TOOL([PATCH], [patch])
FIND_TOOL([PATCH], [patch])
FIND_TOOL([TAR], [tar])
FIND_TOOL([CHMOD], [chmod])
-FIND_TOOL([MD5SUM], [md5sum])
FIND_TOOL([SHA256SUM], [sha256sum])
FIND_TOOL([WGET], [wget])
FIND_TOOL([ZIP], [zip])
diff -r ee96b94c9270 -r 3b4962f39f65 hotspot.map
--- a/hotspot.map Tue Nov 17 17:47:58 2009 +0000
+++ b/hotspot.map Tue Nov 17 19:49:20 2009 +0000
@@ -1,2 +1,1 @@
# version changeset md5sum
-original f9d938ede196 c8f78d48ac83987bc2adebeebcd354e9
diff -r ee96b94c9270 -r 3b4962f39f65 patches/icedtea-jaxws-getdtdtype.patch
--- a/patches/icedtea-jaxws-getdtdtype.patch Tue Nov 17 17:47:58 2009 +0000
+++ b/patches/icedtea-jaxws-getdtdtype.patch Tue Nov 17 19:49:20 2009 +0000
@@ -9,3 +9,15 @@
String value = staxAttr.getValue();
attrs.addAttribute(uri, localName, qName, type, value);
+--- drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.old 2009-11-17 19:46:11.000000000 +0000
++++ drop/jaxws_src/src/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java 2009-11-17 19:46:35.000000000 +0000
+@@ -112,6 +112,9 @@
+ return _attributeType;
+ }
+
++ public QName getDTDType() {
++ return new QName(_attributeType);
++ }
+
+ /**
+ * A flag indicating whether this attribute was actually
More information about the distro-pkg-dev
mailing list