xerces-j2/xerces-j2-build.patch

117 lines
3.8 KiB
Diff
Raw Normal View History

auto-import changelog data from xerces-j2-2.6.1-1jpp.src.rpm 2.6.1-1jpp - 2.6.1 - update Source0 URL - now requires xml-commons-resolver 2.6.0-1jpp - Update to 2.6.0 - Patch #1 (xerces-j2-manifest.patch) is unnecessary (upstream) 2.5.0-1jpp - Update to 2.5.0. - Clean up versionless javadoc dir symlinking, own (ghost) the symlinks. - Mark javadocs as %doc. 2.4.0-3jpp - Own (ghost) %{_javadir}/jaxp_parser_impl.jar. - Remove alternatives in preun instead of postun. 2.4.0-2jpp - bug #17325 fixed upstream 2.4.0-1jpp - 2.4.0 - BuildRequires: jikes - update for JPackage 1.5 - re-diff'ed build patch for 2.4.0 - bug #17325 handled by perl now - scripts: s|find-jar|build-classpath| and don't test for java-functions Wed Mar 26 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> - 2.3.0-2jpp - For jpackage-utils 1.5 - zapped manual, since it doesn't want to build - as a consequence, removed uneeded dependencies Mon Feb 24 2003 Ville Skyttä <ville.skytta at iki.fi> - 2.3.0-1jpp - Update to 2.3.0. - Add a crude patch to work around invalid XML in doc sources, see <http://nagoya.apache.org/bugzilla/show_bug.cgi?id=17325>. - Built with IBM's 1.3.1 SR3. Sat Dec 28 2002 Ville Skyttä <ville.skytta at iki.fi> - 2.2.1-2jpp - Add upstream patch which fixes problems with Tomcat's webapps. <http://nagoya.apache.org/bugzilla/show_bug.cgi?id=13282> <http://marc.theaimsgroup.com/?l=xerces-cvs&m=103791990130308> - Separate scripts subpackage. Fri Nov 15 2002 Ville Skyttä <ville.skytta at iki.fi> - 2.2.1-1jpp - Update to 2.2.1. - Change alternative to point to non-versioned jar. - Don't remove alternative on upgrade. - Fix Group tag for demo, javadoc and manual subpackages. - Add version and constants scripts. - Some spec file cleanup. Sun Oct 06 2002 Ville Skyttä <ville.skytta at iki.fi> 2.2.0-2jpp - Fix bad permissions for main jar. Sun Sep 29 2002 Ville Skyttä <ville.skytta at iki.fi> 2.1.0-1jpp - Update to 2.2.0. Tue Sep 10 2002 Ville Skyttä <ville.skytta at iki.fi> 2.1.0-2jpp - Rebuild with -Dcompiler=modern, not a Jikes bug this time, but sloppy code that is tolerated by javac. See <http://www-124.ibm.com/developerworks/bugs/?func=detailbug&bug_id=3218 &group_id=10> for details. Tue Sep 10 2002 Ville Skyttä <ville.skytta at iki.fi> 2.1.0-1jpp - 2.1.0. - Updated description. - Changed javadoc and manual group to Documentation. - Spec file cleanups. Fri Jul 12 2002 Henri Gomez <hgomez@users.sourceforge.net> 2.0.2-4jpp - add BuildRequires xerces-j1 and xalan-j2 - removed BuildRequires xml-commons-api since ant require jaxp_parser_impl which in turn require xml-commons-api ;) Mon Jul 01 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.0.2-3jpp - vendor, distribution, group tags - provides jaxp_parser_impl - dropped api jar - renamed lone jar to xerces-j2.jar - priority bumped to 40 - fixed stylebook build (add xerces-j1 in classpath) Wed Jun 26 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.0.2-2jpp - rebuild for missing symlinks - use sed instead of bash 2.x extension in link area to make spec compatible with distro using bash 1.1x Mon Jun 24 2002 Henri Gomez <hgomez@users.sourceforge.net> 2.0.2-1jpp - 2.0.2 Sun Mar 10 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.0.1-1jpp - 2.0.1 - provides jaxp_parser2 virtual resource - drop wrapper Sun Feb 03 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.0.0-1jpp - first JPackage release
2004-09-09 16:28:45 +00:00
--- build.xml~ 2003-07-31 20:14:16.000000000 +0300
+++ build.xml 2003-10-21 21:45:47.000000000 +0300
@@ -19,7 +19,7 @@
<project default="usage" basedir=".">
<!-- enable compilation under IBM JDK 1.4 -->
- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
+ <!-- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/> -->
<!-- Allow properties following these statements to be overridden -->
<!-- Note that all of these don't have to exist. They've just been defined
@@ -187,6 +187,7 @@
</copy>
<!-- now deal with API's: -->
+ <!--
<unzip src="${src.apis.zip}" dest="${build.src}">
<patternset
includes="org/xml/sax/**
@@ -198,6 +199,7 @@
org/w3c/dom/traversal/**"
/>
</unzip>
+ -->
<!-- substitute tokens as needed -->
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
@@ -214,7 +216,7 @@
</fileset>
</copy>
- <xjavac srcdir="${build.src}"
+ <javac srcdir="${build.src}"
destdir="${build.dest}"
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
debug="${debug}"
@@ -275,7 +277,7 @@
excludes="dom/DOMAddLines.java
dom/DOM3.java" />
</copy>
- <xjavac srcdir="${build.samples}"
+ <javac srcdir="${build.samples}"
destdir="${build.dest}"
classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
debug="${debug}"
@@ -292,7 +294,7 @@
<fileset dir="${tests.dir}"
excludes="dom/rename/**, dom/registry/**" />
</copy>
- <xjavac srcdir="${build.tests}"
+ <javac srcdir="${build.tests}"
destdir="${build.dest}"
classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
debug="${debug}"
@@ -813,7 +815,7 @@
</fileset>
</copy>
- <xjavac srcdir="${build.src}"
+ <javac srcdir="${build.src}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
@@ -903,6 +905,7 @@
token="return ((String)type).getNamespace();" value="return null;"/>
<!-- now deal with API's: -->
+ <!--
<unzip src="${src.apis.zip}" dest="${build.src}">
<patternset
includes="org/xml/sax/**
@@ -914,7 +917,7 @@
org/w3c/dom/traversal/**"
/>
</unzip>
-
+ -->
<!-- substitute tokens as needed -->
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
@@ -950,7 +953,7 @@
</fileset>
</copy>
- <xjavac srcdir="${build.src}"
+ <javac srcdir="${build.src}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
@@ -1166,7 +1169,7 @@
</fileset>
</copy>
- <xjavac srcdir="${build.src}"
+ <javac srcdir="${build.src}"
destdir="${build.dest}"
debug="${debug}"
deprecation="${deprecation}"
@@ -1194,7 +1197,7 @@
<replace file="${build.samples}/dom/ASBuilder.java"
token="org.apache.xerces.dom3.DOMConfiguration" value="org.w3c.dom.DOMConfiguration"/>
- <xjavac srcdir="${build.samples}"
+ <javac srcdir="${build.samples}"
destdir="${build.dest}"
classpath="${build.dir}/classes:${build.dir}/dom3-${jar.parser}:${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.apis}"
debug="${debug}"
@@ -1222,7 +1225,7 @@
<replace file="${build.tests}/thread/Test.java"
token="org.apache.xerces.dom3" value="org.w3c.dom"/>
- <xjavac srcdir="${build.tests}"
+ <javac srcdir="${build.tests}"
destdir="${build.dest}"
classpath="${build.dir}/dom3-${jar.apis}:${build.dir}/classes:./tools/junit.jar"
debug="${debug}"