Mercurial > hg > release > icedtea6-1.11
changeset 2655:32fa8c401cee
PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan
2011-05-25 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(ENDORSED_DIR): Removed.
(ICEDTEA_ECJ_PATCHES): Add xsltproc.patch.
Remove endorsed-dir-for-jvmti.patch.
(ICEDTEA_ENV_ECJ): Set XSLT. Don't
set ICEDTEA_ENDORSED_DIR or ENDORSED.
(bootstrap-directory-stage1): Don't link
xalan2, xerces2 or xalan2 serialiser.
* acinclude.m4:
(IT_FIND_XALAN2_JAR): Removed.
(IT_FIND_XALAN2_SERIALIZER_JAR): Likewise.
(IT_FIND_XERCES2_JAR): Likewise.
(IT_FIND_XML_COMMONS_API_JAR): Likewise.
* configure.ac:
Replace calls to IT_FIND_XALAN2_JAR,
IT_FIND_XALAN2_SERIALIZER_JAR,
IT_FIND_XERCES2_JAR and
IT_FIND_XML_COMMONS_API_JAR with call to
IT_FIND_TOOL for xsltproc.
* patches/ecj/xsltproc.patch:
Patch jvmti.make in HotSpot to use
xsltproc instead of Java's XSLT
when bootstrapping.
* patches/ecj/endorsed-dir-for-jvmti.patch:
Remove addition of $(ENDORSED) to
jvmti.make.
* NEWS: Update and make bug fixes more
prominent.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 12 Jul 2011 02:01:39 +0100 |
| parents | 15b2923c12a0 |
| children | 98a64707ae8c d987aa111762 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 configure.ac patches/ecj/endorsed-dir-for-jvmti.patch patches/ecj/xsltproc.patch |
| diffstat | 7 files changed, 96 insertions(+), 178 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jul 11 23:52:57 2011 +0100 +++ b/ChangeLog Tue Jul 12 02:01:39 2011 +0100 @@ -1,3 +1,34 @@ +2011-05-25 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (ENDORSED_DIR): Removed. + (ICEDTEA_ECJ_PATCHES): Add xsltproc.patch. + Remove endorsed-dir-for-jvmti.patch. + (ICEDTEA_ENV_ECJ): Set XSLT. Don't + set ICEDTEA_ENDORSED_DIR or ENDORSED. + (bootstrap-directory-stage1): Don't link + xalan2, xerces2 or xalan2 serialiser. + * acinclude.m4: + (IT_FIND_XALAN2_JAR): Removed. + (IT_FIND_XALAN2_SERIALIZER_JAR): Likewise. + (IT_FIND_XERCES2_JAR): Likewise. + (IT_FIND_XML_COMMONS_API_JAR): Likewise. + * configure.ac: + Replace calls to IT_FIND_XALAN2_JAR, + IT_FIND_XALAN2_SERIALIZER_JAR, + IT_FIND_XERCES2_JAR and + IT_FIND_XML_COMMONS_API_JAR with call to + IT_FIND_TOOL for xsltproc. + * patches/ecj/xsltproc.patch: + Patch jvmti.make in HotSpot to use + xsltproc instead of Java's XSLT + when bootstrapping. + * patches/ecj/endorsed-dir-for-jvmti.patch: + Remove addition of $(ENDORSED) to + jvmti.make. + * NEWS: Update and make bug fixes more + prominent. + 2011-07-11 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Mon Jul 11 23:52:57 2011 +0100 +++ b/Makefile.am Tue Jul 12 02:01:39 2011 +0100 @@ -39,7 +39,6 @@ ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0 -ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed ECJ_BOOT_DIR = $(abs_top_builddir)/bootstrap/ecj ICEDTEA_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot @@ -419,14 +418,14 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \ patches/ecj/hotspot.patch \ - patches/ecj/endorsed-dir-for-jvmti.patch \ patches/ecj/javafiles.patch \ patches/ecj/spp.patch \ patches/ecj/jopt.patch \ patches/ecj/jaxp-dependency.patch \ patches/ecj/bootver.patch \ patches/ecj/getannotation-cast.patch \ - patches/ecj/override.patch + patches/ecj/override.patch \ + patches/ecj/xsltproc.patch if DTDTYPE_QNAME ICEDTEA_ECJ_PATCHES += \ @@ -562,15 +561,14 @@ BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \ BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" \ CLASSPATH="" \ - ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \ - ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \ LD_LIBRARY_PATH="" \ GENSRCDIR="$(abs_top_builddir)/generated" \ JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \ JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \ DISABLE_NIMBUS="true" \ - NO_DOCS="true" + NO_DOCS="true" \ + XSLT="$(XSLTPROC)" # Source files # FIXME (distclean): Add generated file list @@ -1250,16 +1248,6 @@ ln -sf $(NATIVE2ASCII) $(ECJ_BOOT_DIR)/bin/native2ascii ln -sf $(abs_top_builddir)/javac $(ECJ_BOOT_DIR)/bin/javac ln -sf $(abs_top_builddir)/javap $(ECJ_BOOT_DIR)/bin/javap - mkdir -p $(ECJ_BOOT_DIR)/lib/endorsed && \ - ln -sf $(XALAN2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \ - ln -sf $(XALAN2_SERIALIZER_JAR) \ - $(ECJ_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \ - ln -sf $(XERCES2_JAR) $(ECJ_BOOT_DIR)/lib/endorsed/xerces-j2.jar && \ - if test -n "$(XML_COMMONS_APIS_JAR)"; \ - then \ - ln -sf $(XML_COMMONS_APIS_JAR) \ - $(ECJ_BOOT_DIR)/lib/endorsed/xml-commons-apis.jar; \ - fi mkdir -p $(ECJ_BOOT_DIR)/jre/lib && \ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar && \ ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
--- a/NEWS Mon Jul 11 23:52:57 2011 +0100 +++ b/NEWS Tue Jul 12 02:01:39 2011 +0100 @@ -13,6 +13,12 @@ * Use HotSpot 20 as the default virtual machine. * ARM assembler port and Thumb2 JIT removed (broken and unmaintained). +* Bug fixes + - PR637: make check should exit with an error code if any regression test failed. + - PR748: Icedtea6 fails to build with Linux 3.0. + - PR744: icedtea6-1.10.2 : patching error + - PR752: ImageFormatException extends Exception not RuntimeException + - PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan * Backports - S7019861: Last scanline skpped when doing AA. - S6768387, PR670: REGRESSION: JTable no longer serializable @@ -46,11 +52,6 @@ - S6711682: JCheckBox in JTable: checkbox doesn't always respond to the first mouse click - S7016856: fix dashing performance regression. Improve other rendering performance. - S6934977: MappedByteBuffer.load crashes with SIGBUS. -* Bug fixes - - PR637: make check should exit with an error code if any regression test failed. - - PR748: Icedtea6 fails to build with Linux 3.0. - - PR744: icedtea6-1.10.2 : patching error - - PR752: ImageFormatException extends Exception not RuntimeException * Allow selection of test suites using the jtreg_checks argument e.g. jtreg_checks="langtools" * CACAO - Threadlist & threadobject improvements.
--- a/acinclude.m4 Mon Jul 11 23:52:57 2011 +0100 +++ b/acinclude.m4 Tue Jul 12 02:01:39 2011 +0100 @@ -630,138 +630,6 @@ AC_SUBST(ALT_JAR_CMD) ]) -AC_DEFUN([IT_FIND_XALAN2_JAR], -[ - AC_MSG_CHECKING([for a xalan2 jar]) - AC_ARG_WITH([xalan2-jar], - [AS_HELP_STRING(--with-xalan2-jar,specify location of the xalan2 jar)], - [ - if test -f "${withval}" ; then - XALAN2_JAR="${withval}" - fi - ], - [ - XALAN2_JAR= - ]) - if test -z "${XALAN2_JAR}"; then - if test -e "/usr/share/java/xalan-j2.jar"; then - XALAN2_JAR=/usr/share/java/xalan-j2.jar - elif test -e "/usr/share/java/xalan2.jar"; then - XALAN2_JAR=/usr/share/java/xalan2.jar - elif test -e "/usr/share/xalan/lib/xalan.jar"; then - XALAN2_JAR=/usr/share/xalan/lib/xalan.jar - else - AC_MSG_RESULT(no) - fi - fi - if test -z "${XALAN2_JAR}"; then - AC_MSG_ERROR("A xalan2 jar was not found.") - fi - AC_MSG_RESULT(${XALAN2_JAR}) - AC_SUBST(XALAN2_JAR) -]) - -AC_DEFUN([IT_FIND_XALAN2_SERIALIZER_JAR], -[ - AC_MSG_CHECKING([for a xalan2 serializer jar]) - AC_ARG_WITH([xalan2-serializer-jar], - [AS_HELP_STRING(--with-xalan2-serializer-jar,specify location of the xalan2-serializer jar)], - [ - if test -f "${withval}" ; then - XALAN2_SERIALIZER_JAR="${withval}" - fi - ], - [ - XALAN2_SERIALIZER_JAR= - ]) - if test -z "${XALAN2_SERIALIZER_JAR}"; then - if test -e "/usr/share/java/xalan-j2-serializer.jar"; then - XALAN2_SERIALIZER_JAR=/usr/share/java/xalan-j2-serializer.jar - elif test -e "/usr/share/xalan-serializer/lib/serializer.jar"; then - XALAN2_SERIALIZER_JAR=/usr/share/xalan-serializer/lib/serializer.jar - elif test -e "/usr/share/java/serializer.jar"; then - XALAN2_SERIALIZER_JAR=/usr/share/java/serializer.jar - else - AC_MSG_RESULT(no) - fi - fi - if test -z "${XALAN2_SERIALIZER_JAR}"; then - AC_MSG_ERROR("A xalan2-serializer jar was not found.") - fi - AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR}) - AC_SUBST(XALAN2_SERIALIZER_JAR) -]) - -AC_DEFUN([IT_FIND_XERCES2_JAR], -[ - AC_MSG_CHECKING([for a xerces2 jar]) - AC_ARG_WITH([xerces2-jar], - [AS_HELP_STRING(--with-xerces2-jar,specify location of the xerces2 jar)], - [ - if test -f "${withval}" ; then - XERCES2_JAR="${withval}" - fi - ], - [ - XERCES2_JAR= - ]) - if test -z "${XERCES2_JAR}"; then - if test -e "/usr/share/java/xerces-j2.jar"; then - XERCES2_JAR=/usr/share/java/xerces-j2.jar - elif test -e "/usr/share/java/xerces2.jar"; then - XERCES2_JAR=/usr/share/java/xerces2.jar - elif test -e "/usr/share/xerces-2/lib/xercesImpl.jar"; then - XERCES2_JAR=/usr/share/xerces-2/lib/xercesImpl.jar - elif test -e "/usr/share/java/xercesImpl.jar"; then - XERCES2_JAR=/usr/share/java/xercesImpl.jar - else - AC_MSG_RESULT(no) - fi - fi - if test -z "${XERCES2_JAR}"; then - AC_MSG_ERROR("A xerces2 jar was not found.") - fi - AC_MSG_RESULT(${XERCES2_JAR}) - AC_SUBST(XERCES2_JAR) -]) - -AC_DEFUN([IT_FIND_XML_COMMONS_APIS_JAR], -[ - AC_MSG_CHECKING([for an xml-commons-apis jar]) - AC_ARG_WITH([xml-commons-apis-jar], - [AS_HELP_STRING(--with-xml-commons-apis-jar,specify location of the xml-commons-apis jar)], - [ - if test -f "${withval}" || test -h "${withval}" ; then - XML_COMMONS_APIS_JAR="${withval}" - fi - ], - [ - XML_COMMONS_APIS_JAR= - ]) - if test -z "${XML_COMMONS_APIS_JAR}"; then - if test -e "/usr/share/java/xml-commons-apis.jar"; then - XML_COMMONS_APIS_JAR=/usr/share/java/xml-commons-apis.jar - elif test -e "/usr/share/java/xml-apis.jar"; then - XML_COMMONS_APIS_JAR=/usr/share/java/xml-apis.jar - elif test -e "/usr/share/xml-commons/lib/xml-apis.jar"; then - XML_COMMONS_APIS_JAR=/usr/share/xml-commons/lib/xml-apis.jar - elif test -e "/usr/share/java/xml-apis-ext.jar"; then - XML_COMMONS_APIS_JAR=/usr/share/java/xml-apis-ext.jar - elif test -e "/usr/share/java/xml-commons-external.jar"; then - XML_COMMONS_APIS_JAR=/usr/share/java/xml-commons-external.jar - elif test -e "/usr/share/java/apache-xml-commons-apis.jar"; then - XML_COMMONS_APIS_JAR=/usr/share/java/apache-xml-commons-apis.jar - else - AC_MSG_RESULT(no) - fi - fi - if test -z "${XML_COMMONS_APIS_JAR}"; then - AC_MSG_ERROR("An xml-commons-apis jar was not found.") - fi - AC_MSG_RESULT(${XML_COMMONS_APIS_JAR}) - AC_SUBST(XML_COMMONS_APIS_JAR) -]) - AC_DEFUN([IT_FIND_RHINO_JAR], [ AC_MSG_CHECKING([whether to include Javascript support via Rhino])
--- a/configure.ac Mon Jul 11 23:52:57 2011 +0100 +++ b/configure.ac Tue Jul 12 02:01:39 2011 +0100 @@ -155,18 +155,7 @@ IT_FIND_NATIVE2ASCII if test "x$enable_bootstrap" = "xyes"; then IT_FIND_ECJ_JAR - IT_FIND_XALAN2_JAR - IT_FIND_XALAN2_SERIALIZER_JAR - IT_FIND_XERCES2_JAR - IT_CHECK_IF_INSTANTIABLE([ORG_APACHE_XERCES_DOM_DEFERREDDOCUMENTIMPL], -[org.apache.xerces.dom.DeferredDocumentImpl],[], -[$XALAN2_JAR:$XALAN2_SERIALIZER_JAR:$XERCES2_JAR]) - if test x"${ORG_APACHE_XERCES_DOM_DEFERREDDOCUMENTIMPL_INSTANTIABLE}" = "xno" - then - IT_FIND_XML_COMMONS_APIS_JAR - else - XML_COMMONS_APIS_JAR= - fi + IT_FIND_TOOL([XSLTPROC], [xsltproc]) fi AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap])
--- a/patches/ecj/endorsed-dir-for-jvmti.patch Mon Jul 11 23:52:57 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make ---- openjdk-ecj.orig/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:51:14.000000000 +0100 -+++ openjdk-ecj/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:54:13.000000000 +0100 -@@ -59,7 +59,7 @@ - - JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%) - --XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen -+XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) $(ENDORSED) -classpath $(JvmtiOutDir) jvmtiGen - - .PHONY: all jvmtidocs clean cleanall - -
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/xsltproc.patch Tue Jul 12 02:01:39 2011 +0100 @@ -0,0 +1,54 @@ +diff -r 591c7dc0b2ee make/linux/makefiles/jvmti.make +--- openjdk-ecj.orig/hotspot/make/linux/makefiles/jvmti.make Thu May 19 13:27:44 2011 +0200 ++++ openjdk-ecj/hotspot/make/linux/makefiles/jvmti.make Wed May 25 20:01:25 2011 +0100 +@@ -58,8 +58,6 @@ + + JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%) + +-XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen +- + .PHONY: all jvmtidocs clean cleanall + + # ######################################################################### +@@ -76,34 +74,34 @@ + + $(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti ++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnter.cpp --stringparam interface jvmti $(JvmtiSrcDir)/jvmtiEnter.xsl $(JvmtiSrcDir)/jvmti.xml + + $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl + @echo Generating $@ +- $(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp ++ $(XSLT) -o $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml + + $(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace ++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnterTrace.cpp --stringparam interface jvmti --stringparam trace Trace $(JvmtiSrcDir)/jvmtiEnter.xsl $(JvmtiSrcDir)/jvmti.xml + + $(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass) + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl -OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp ++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmti.xml + $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiOutDir)/jvmtiEnvRecommended.cpp + + $(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl -OUT $(JvmtiOutDir)/jvmtiEnv.hpp ++ $(XSLT) -o $(JvmtiOutDir)/jvmtiEnv.hpp $(JvmtiSrcDir)/jvmtiHpp.xsl $(JvmtiSrcDir)/jvmti.xml + + $(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl -OUT $(JvmtiOutDir)/jvmti.h ++ $(XSLT) -o $(JvmtiOutDir)/jvmti.h $(JvmtiSrcDir)/jvmtiH.xsl $(JvmtiSrcDir)/jvmti.xml + + jvmtidocs: $(JvmtiOutDir)/jvmti.html + + $(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl + @echo Generating $@ +- $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl -OUT $(JvmtiOutDir)/jvmti.html ++ $(XSLT) -o $(JvmtiOutDir)/jvmti.html $(JvmtiSrcDir)/jvmti.xsl $(JvmtiSrcDir)/jvmti.xml + + # ######################################################################### +