/hg/icedtea: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Nov 17 13:30:40 PST 2009
changeset d4fe9b0323e0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d4fe9b0323e0
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 20:05:05 2009 +0000
Update to VisualVM 1.2.1.
2009-11-11 Tomas Hurka <tomas.hurka at sun.com>
* Makefile.am: Update to VisualVM 1.2.1.
changeset 896e946a6c03 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=896e946a6c03
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 21:31:19 2009 +0000
Add missing alternate zip options for VisualVM and NetBeans
profiler. Ensure symlinks are cleaned.
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (clean-download-openjdk): Remove
conditionals so that symlinks are removed. (clean-
download-cacao): Likewise. (download-visualvm.stamp):
Symlink the alternate NetBeans profiler and VisualVM zips
into place. (clean-download-visualvm): No need for a
conditional.
* acinclude.m4: (FIND_NETBEANS): Remove duplicate.
(WITH_NETBEANS_PROFILER_ZIP): New --with-netbeans-profiler-zip
option. (WITH_VISUALVM_ZIP): New --with-visualvm-zip option.
* configure.ac: Invoke new macros.
changeset 81a1e18fede2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=81a1e18fede2
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Nov 17 21:35:00 2009 +0000
Make the AttributeBase fix actually compile...
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-jaxws-getdtdtype.patch: Replace
getDTDType method, don't add another.
* HACKING: Document the patch.
diffstat:
6 files changed, 87 insertions(+), 61 deletions(-)
ChangeLog | 26 ++++++++++++++
HACKING | 1
Makefile.am | 46 ++++++++-----------------
acinclude.m4 | 57 +++++++++++++++++---------------
configure.ac | 2 +
patches/icedtea-jaxws-getdtdtype.patch | 16 +++++---
diffs (273 lines):
diff -r 3b4962f39f65 -r 81a1e18fede2 ChangeLog
--- a/ChangeLog Tue Nov 17 19:49:20 2009 +0000
+++ b/ChangeLog Tue Nov 17 21:35:00 2009 +0000
@@ -1,3 +1,29 @@ 2009-11-17 Andrew John Hughes <ahughes
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-jaxws-getdtdtype.patch:
+ Replace getDTDType method, don't add another.
+ * HACKING: Document the patch.
+
+2009-11-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (clean-download-openjdk): Remove conditionals
+ so that symlinks are removed.
+ (clean-download-cacao): Likewise.
+ (download-visualvm.stamp): Symlink the alternate
+ NetBeans profiler and VisualVM zips into place.
+ (clean-download-visualvm): No need for a conditional.
+ * acinclude.m4:
+ (FIND_NETBEANS): Remove duplicate.
+ (WITH_NETBEANS_PROFILER_ZIP): New --with-netbeans-profiler-zip option.
+ (WITH_VISUALVM_ZIP): New --with-visualvm-zip option.
+ * configure.ac:
+ Invoke new macros.
+
+2009-11-11 Tomas Hurka <tomas.hurka at sun.com>
+
+ * Makefile.am: Update to VisualVM 1.2.1.
+
2009-11-17 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-jaxws-getdtdtype.patch:
diff -r 3b4962f39f65 -r 81a1e18fede2 HACKING
--- a/HACKING Tue Nov 17 19:49:20 2009 +0000
+++ b/HACKING Tue Nov 17 21:35:00 2009 +0000
@@ -117,6 +117,7 @@ The following patches are only applied t
* icedtea-nss-config.patch: Add the NSS PKCS11 security provider. (PR356)
* icedtea-nss-6763530.patch: Fix PKCS11 provider when used with newer version of NSS (>=3.12.3) (PR356, S6763530).
* icedtea-sources.patch: Include netx and plugin sources in src.zip
+* icedtea-jaxws-getdtdtype.patch: Workaround for incorrect return type in gcj < 4.4 / GNU Classpath < 0.98
The following patches are only applied to the icedtea-ecj bootstrap tree:
diff -r 3b4962f39f65 -r 81a1e18fede2 Makefile.am
--- a/Makefile.am Tue Nov 17 19:49:20 2009 +0000
+++ b/Makefile.am Tue Nov 17 21:35:00 2009 +0000
@@ -24,13 +24,13 @@ CACAO_URL = $(CACAO_BASE_URL)/cacaojvm/d
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_SHA256SUM = b57b8d90e5749b80885c03abe5547f0d671abebe7f4991d679fa8a0034ebf2c3
-
-VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/127170/
-VISUALVM_SRC_ZIP = visualvm-111-src.tar.gz
-VISUALVM_SHA256SUM = 947b0af99a1263e14d496a7231445eeff3e04cb38877fd2b56e1b6f68a7ff710
+NETBEANS_PROFILER_URL = https://visualvm.dev.java.net/files/documents/7163/145168/
+NETBEANS_PROFILER_SRC_ZIP = netbeans-profiler-visualvm_release67.tar.gz
+NETBEANS_PROFILER_SHA256SUM = 611736b4e6dac2f7ddb669a23a474fb052f4141c04dc2ba5888b9e9db61fe59b
+
+VISUALVM_URL = https://visualvm.dev.java.net/files/documents/7163/145167/
+VISUALVM_SRC_ZIP = visualvm_121-src.tar.gz
+VISUALVM_SHA256SUM = b561207d85da4916e809cc4c104098e1ca979b30192c207b9d6087a31c91b8b0
JAXWS_DROP_URL = http://kenai.com/projects/jdk7-drops/downloads/download
JAXWS_DROP_ZIP = jdk7-jaxws-2009_09_28.zip
@@ -999,41 +999,27 @@ endif
touch $@
clean-download-openjdk:
-if !USE_ALT_OPENJDK_SRC_ZIP
if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \
rm -f $(OPENJDK_SRC_ZIP) ; \
fi
-endif
-if !USE_ALT_CORBA_SRC_ZIP
if [ ! -z $(CORBA_SRC_ZIP) ] ; then \
rm -f $(CORBA_SRC_ZIP) ; \
fi
-endif
-if !USE_ALT_JAXP_SRC_ZIP
if [ ! -z $(JAXP_SRC_ZIP) ] ; then \
rm -f $(JAXP_SRC_ZIP) ; \
fi
-endif
-if !USE_ALT_JAXWS_SRC_ZIP
if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \
rm -f $(JAXWS_SRC_ZIP) ; \
fi
-endif
-if !USE_ALT_JDK_SRC_ZIP
if [ ! -z $(JDK_SRC_ZIP) ] ; then \
rm -f $(JDK_SRC_ZIP) ; \
fi
-endif
-if !USE_ALT_LANGTOOLS_SRC_ZIP
if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \
rm -f $(LANGTOOLS_SRC_ZIP) ; \
fi
-endif
-if !USE_ALT_HOTSPOT_SRC_ZIP
if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \
rm -f $(HOTSPOT_SRC_ZIP) ; \
fi
-endif
rm -f stamps/download-openjdk.stamp
stamps/download-cacao.stamp:
@@ -1061,15 +1047,14 @@ endif
touch $@
clean-download-cacao:
-if BUILD_CACAO
-if !USE_ALT_CACAO_SRC_ZIP
rm -f $(CACAO_SRC_ZIP)
-endif
-endif
rm -f stamps/download-cacao.stamp
stamps/download-visualvm.stamp:
if WITH_VISUALVM
+if USE_ALT_NETBEANS_PROFILER_ZIP
+ ln -sf $(ALT_NETBEANS_PROFILER_ZIP) $(NETBEANS_PROFILER_SRC_ZIP)
+endif
if ! echo "$(NETBEANS_PROFILER_SHA256SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -1085,6 +1070,9 @@ if WITH_VISUALVM
fi; \
fi
+if USE_ALT_VISUALVM_ZIP
+ ln -sf $(ALT_VISUALVM_ZIP) $(VISUALVM_SRC_ZIP)
+endif
if ! echo "$(VISUALVM_SHA256SUM) $(VISUALVM_SRC_ZIP)" \
| $(SHA256SUM) --check ; \
then \
@@ -1104,10 +1092,8 @@ endif
touch $@
clean-download-visualvm:
-if WITH_VISUALVM
rm -f $(VISUALVM_SRC_ZIP)
rm -f $(NETBEANS_PROFILER_SRC_ZIP)
-endif
rm -f stamps/download-visualvm.stamp
stamps/extract.stamp: stamps/extract-openjdk.stamp \
@@ -2224,9 +2210,9 @@ if WITH_VISUALVM
cd ../../.. ; \
JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true \
-f nbbuild/build.xml bootstrap ; \
- for dir in lib.profiler lib.profiler.ui lib.profiler.common profiler ; do \
- JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=081204 \
- -Dnetbeans.dest.dir=../nbbuild/netbeans_visualvm \
+ for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler ; do \
+ JAVA_HOME=$(ICEDTEA_HOME) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091020 \
+ -Dnetbeans.dest.dir=$(abs_top_builddir)/netbeans/nbbuild/netbeans_visualvm \
-f $$dir/build.xml ; \
done
endif
diff -r 3b4962f39f65 -r 81a1e18fede2 acinclude.m4
--- a/acinclude.m4 Tue Nov 17 19:49:20 2009 +0000
+++ b/acinclude.m4 Tue Nov 17 21:35:00 2009 +0000
@@ -581,31 +581,6 @@ AC_DEFUN([FIND_NETBEANS],
AC_SUBST(NETBEANS)
])
-AC_DEFUN([FIND_NETBEANS],
-[
- AC_ARG_WITH([netbeans],
- [AS_HELP_STRING(--with-netbeans,specify location of netbeans)],
- [
- if test -f "${withval}"; then
- AC_MSG_CHECKING(netbeans)
- NETBEANS="${withval}"
- AC_MSG_RESULT(${withval})
- else
- AC_PATH_PROG(NETBEANS, "${withval}")
- fi
- ],
- [
- NETBEANS=
- ])
- if test -z "${NETBEANS}"; then
- AC_PATH_PROG(NETBEANS, "netbeans")
- fi
- if test -z "${NETBEANS}"; then
- AC_MSG_ERROR("NetBeans was not found.")
- fi
- AC_SUBST(NETBEANS)
-])
-
AC_DEFUN([FIND_RHINO_JAR],
[
AC_MSG_CHECKING(whether to include Javascript support via Rhino)
@@ -1635,3 +1610,35 @@ AM_CONDITIONAL([DTDTYPE_QNAME], test x"$
AM_CONDITIONAL([DTDTYPE_QNAME], test x"${it_cv_dtdtype}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN([WITH_NETBEANS_PROFILER_ZIP],
+[
+ AC_MSG_CHECKING(for a NetBeans profiler zip)
+ AC_ARG_WITH([netbeans-profiler-zip],
+ [AS_HELP_STRING(--with-netbeans-profiler-zip,specify the location of the NetBeans profiler zip)],
+ [
+ ALT_NETBEANS_PROFILER_ZIP=${withval}
+ ],
+ [
+ ALT_NETBEANS_PROFILER_ZIP="not specified"
+ ])
+ AC_MSG_RESULT(${ALT_NETBEANS_PROFILER_ZIP})
+ AM_CONDITIONAL(USE_ALT_NETBEANS_PROFILER_ZIP, test "x$ALT_NETBEANS_PROFILER_ZIP" != "xnot specified")
+ AC_SUBST(ALT_NETBEANS_PROFILER_ZIP)
+])
+
+AC_DEFUN([WITH_VISUALVM_ZIP],
+[
+ AC_MSG_CHECKING(for a VisualVM zip)
+ AC_ARG_WITH([visualvm-zip],
+ [AS_HELP_STRING(--with-visualvm-zip,specify the location of the VisualVM zip)],
+ [
+ ALT_VISUALVM_ZIP=${withval}
+ ],
+ [
+ ALT_VISUALVM_ZIP="not specified"
+ ])
+ AC_MSG_RESULT(${ALT_VISUALVM_ZIP})
+ AM_CONDITIONAL(USE_ALT_VISUALVM_ZIP, test "x$ALT_VISUALVM_ZIP" != "xnot specified")
+ AC_SUBST(ALT_VISUALVM_ZIP)
+])
diff -r 3b4962f39f65 -r 81a1e18fede2 configure.ac
--- a/configure.ac Tue Nov 17 19:49:20 2009 +0000
+++ b/configure.ac Tue Nov 17 21:35:00 2009 +0000
@@ -232,6 +232,8 @@ WITH_JAXP_DROP_ZIP
WITH_JAXP_DROP_ZIP
WITH_JAF_DROP_ZIP
WITH_JAXWS_DROP_ZIP
+WITH_NETBEANS_PROFILER_ZIP
+WITH_VISUALVM_ZIP
AC_CHECK_ENABLE_CACAO
AC_CHECK_WITH_CACAO_HOME
diff -r 3b4962f39f65 -r 81a1e18fede2 patches/icedtea-jaxws-getdtdtype.patch
--- a/patches/icedtea-jaxws-getdtdtype.patch Tue Nov 17 19:49:20 2009 +0000
+++ b/patches/icedtea-jaxws-getdtdtype.patch Tue Nov 17 21:35:00 2009 +0000
@@ -11,13 +11,17 @@
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;
+@@ -108,11 +108,10 @@
+ * the String "CDATA"
+ * @return the type as a String, default is "CDATA"
+ */
+- public String getDTDType() {
+- return _attributeType;
++ public QName getDTDType() {
++ return new QName(_attributeType);
}
-+ public QName getDTDType() {
-+ return new QName(_attributeType);
-+ }
-
+-
/**
* A flag indicating whether this attribute was actually
+ * specified in the start-tag of its element, or was defaulted from the schema.
More information about the distro-pkg-dev
mailing list