[RFC][icedtea6-1.9,icedtea6-1.10] Backport for PR732: Use xsltproc for bootstrap xslt in place of Xerces/Xalan

Danesh Dadachanji ddadacha at redhat.com
Wed Oct 26 13:13:30 PDT 2011


Hi,

Attached are patches for 6-1.9 and 6-1.10 to replace the use of 
xalan/xerces with xsltproc.

It is pretty similar to PR732's fix[1] with some minor changes in 
syntax/line numbers for diffs:
  - The changeset from HEAD that added 
patches/ecj/endorsed-dir-for-jvmti.patch was never backported so I did 
not need to deal with it.
  - I had to adjust patches/ecj/xsltproc.patch to get it to apply, 
jvmti.make is a bit offset when compared to HEAD's build.
  - For 1.9, the configure.ac macros in question do not start with "IT_" 
(e.g. FIND_TOOL vs IT_FIND_TOOL).

1.10 ChangeLog:
+2011-10-26  Danesh Dadachanji  <ddadacha at redhat.com>
+
+	* Makefile.am:
+	(ENDORSED_DIR): Removed.
+	(ICEDTEA_ECJ_PATCHES): Add xsltproc.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): Removed.
+	(IT_FIND_XERCES2_JAR): Removed.
+	* configure.ac:
+	Replace calls to FIND_XALAN2_JAR,
+	IT_FIND_XALAN2_SERIALIZER_JAR and
+	IT_FIND_XERCES2_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.
+	* NEWS: Updated.


1.9 ChangeLog:
+2011-10-26  Danesh Dadachanji  <ddadacha at redhat.com>
+
+	* Makefile.am:
+	(ENDORSED_DIR): Removed.
+	(ICEDTEA_ECJ_PATCHES): Add xsltproc.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:
+	(FIND_XALAN2_JAR): Removed.
+	(FIND_XALAN2_SERIALIZER_JAR): Removed.
+	(FIND_XERCES2_JAR): Removed.
+	* configure.ac:
+	Replace calls to FIND_XALAN2_JAR,
+	FIND_XALAN2_SERIALIZER_JAR and
+	FIND_XERCES2_JAR with call to
+	FIND_TOOL for xsltproc.
+	* patches/ecj/xsltproc.patch:
+	Patch jvmti.make in HotSpot to use
+	xsltproc instead of Java's XSLT
+	when bootstrapping.
+	* NEWS: Updated.

Regards,
Danesh
[1] http://icedtea.classpath.org/hg/icedtea6/rev/32fa8c401cee
-------------- next part --------------
A non-text attachment was scrubbed...
Name: backport-xsltproc-replacement-1.9-01.patch
Type: text/x-patch
Size: 9761 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111026/b15081fd/backport-xsltproc-replacement-1.9-01.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: backport-xsltproc-replacement-1.10-01.patch
Type: text/x-patch
Size: 9953 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111026/b15081fd/backport-xsltproc-replacement-1.10-01.patch 


More information about the distro-pkg-dev mailing list