/hg/icedtea: Use xsltproc for bootstrap xslt processing not Xerc...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 25 14:56:04 PDT 2011
changeset 8b248f7009b8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8b248f7009b8
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed May 25 21:25:40 2011 +0100
Use xsltproc for bootstrap xslt processing not Xerces/Xalan.
2011-05-25 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: (ENDORSED_DIR): Removed.
(ICEDTEA_BOOT_PATCHES): Add xsltproc.patch
(ICEDTEA_ENV_BOOT): 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.
* configure.ac: Replace calls to IT_FIND_XALAN2_JAR,
IT_FIND_XALAN2_SERIALIZER_JAR and IT_FIND_XERCES2_JAR with
call to IT_FIND_TOOL for xsltproc.
* patches/boot/xsltproc.patch: Patch jvmti.make in HotSpot to
use xsltproc instead of Java's XSLT when
bootstrapping.
* patches/headers.patch: Remove addition of $(ENDORSED) to
jvmti.make.
diffstat:
ChangeLog | 26 ++++++++++++
Makefile.am | 14 +----
acinclude.m4 | 95 ---------------------------------------------
configure.ac | 4 +-
patches/boot/xsltproc.patch | 53 +++++++++++++++++++++++++
patches/headers.patch | 12 -----
6 files changed, 84 insertions(+), 120 deletions(-)
diffs (282 lines):
diff -r 43c6c4a00875 -r 8b248f7009b8 ChangeLog
--- a/ChangeLog Wed May 25 17:33:49 2011 +0100
+++ b/ChangeLog Wed May 25 21:25:40 2011 +0100
@@ -1,3 +1,29 @@
+2011-05-25 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (ENDORSED_DIR): Removed.
+ (ICEDTEA_BOOT_PATCHES): Add xsltproc.patch
+ (ICEDTEA_ENV_BOOT): 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.
+ * configure.ac:
+ Replace calls to IT_FIND_XALAN2_JAR,
+ IT_FIND_XALAN2_SERIALIZER_JAR and
+ IT_FIND_XERCES2_JAR with call to
+ IT_FIND_TOOL for xsltproc.
+ * patches/boot/xsltproc.patch:
+ Patch jvmti.make in HotSpot to use
+ xsltproc instead of Java's XSLT
+ when bootstrapping.
+ * patches/headers.patch:
+ Remove addition of $(ENDORSED) to
+ jvmti.make.
+
2011-05-25 Andrew John Hughes <ahughes at redhat.com>
Fix make distcheck.
diff -r 43c6c4a00875 -r 8b248f7009b8 Makefile.am
--- a/Makefile.am Wed May 25 17:33:49 2011 +0100
+++ b/Makefile.am Wed May 25 21:25:40 2011 +0100
@@ -65,7 +65,6 @@
BOOT_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-boot
BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
RUNTIME = $(BOOT_DIR)/jre/lib/rt.jar
-ENDORSED_DIR = $(BOOT_DIR)/lib/endorsed
CLS_DIR_BOOT = $(BOOT_BUILD_OUTPUT_DIR)/classes
SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -373,7 +372,8 @@
patches/boot/hotspot-jdk-dependency.patch \
patches/boot/ecj-multicatch.patch \
patches/boot/ecj-trywithresources.patch \
- patches/boot/ecj-autoboxing.patch
+ patches/boot/ecj-autoboxing.patch \
+ patches/boot/xsltproc.patch
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
@@ -444,8 +444,6 @@
ALT_BOOTDIR="$(BOOT_DIR)" \
BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
ICEDTEA_RT="$(RUNTIME)" \
- ICEDTEA_ENDORSED_DIR="$(ENDORSED_DIR)" \
- ENDORSED="-Djava.endorsed.dirs=$(ENDORSED_DIR)" \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
@@ -534,7 +532,8 @@
JAR_ACCEPTS_STDIN_LIST="$(JAR_ACCEPTS_STDIN_LIST)" \
DISABLE_NIMBUS="true" \
NO_DOCS="true" \
- ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)"
+ ALT_OUTPUTDIR="$(BOOT_BUILD_OUTPUT_DIR)" \
+ XSLT="$(XSLTPROC)"
# Source files
@@ -1678,11 +1677,6 @@
ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii
ln -sf ../../../javac $(STAGE1_BOOT_DIR)/bin/javac
ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap
- mkdir -p $(STAGE1_BOOT_DIR)/lib/endorsed && \
- ln -sf $(XALAN2_JAR) $(STAGE1_BOOT_DIR)/lib/endorsed/xalan-j2.jar && \
- ln -sf $(XALAN2_SERIALIZER_JAR) \
- $(STAGE1_BOOT_DIR)/lib/endorsed/xalan-j2-serializer.jar && \
- ln -sf $(XERCES2_JAR) $(STAGE1_BOOT_DIR)/lib/endorsed/xerces-j2.jar
mkdir -p $(STAGE1_BOOT_DIR)/lib/modules
mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \
cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
diff -r 43c6c4a00875 -r 8b248f7009b8 acinclude.m4
--- a/acinclude.m4 Wed May 25 17:33:49 2011 +0100
+++ b/acinclude.m4 Wed May 25 21:25:40 2011 +0100
@@ -579,101 +579,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[[=PATH]]],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[[=PATH]]],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[[=PATH]]],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_RHINO_JAR],
[
AC_MSG_CHECKING([whether to include Javascript support via Rhino])
diff -r 43c6c4a00875 -r 8b248f7009b8 configure.ac
--- a/configure.ac Wed May 25 17:33:49 2011 +0100
+++ b/configure.ac Wed May 25 21:25:40 2011 +0100
@@ -103,9 +103,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_FIND_TOOL([XSLTPROC], [xsltproc])
fi
AC_CONFIG_FILES([javac], [chmod +x javac])
AC_CONFIG_FILES([javap], [chmod +x javap])
diff -r 43c6c4a00875 -r 8b248f7009b8 patches/boot/xsltproc.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/xsltproc.patch Wed May 25 21:25:40 2011 +0100
@@ -0,0 +1,54 @@
+diff -r 591c7dc0b2ee make/linux/makefiles/jvmti.make
+--- openjdk-boot/hotspot/make/linux/makefiles/jvmti.make Thu May 19 13:27:44 2011 +0200
++++ openjdk-boot/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
+
+ # #########################################################################
+
diff -r 43c6c4a00875 -r 8b248f7009b8 patches/headers.patch
--- a/patches/headers.patch Wed May 25 17:33:49 2011 +0100
+++ b/patches/headers.patch Wed May 25 21:25:40 2011 +0100
@@ -37,16 +37,3 @@
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
-diff -Nru openjdk.orig/hotspot/make/linux/makefiles/jvmti.make openjdk/hotspot/make/linux/makefiles/jvmti.make
---- openjdk.orig/hotspot/make/linux/makefiles/jvmti.make 2008-05-23 20:51:14.000000000 +0100
-+++ openjdk/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
-
-
More information about the distro-pkg-dev
mailing list