neilg 2003/03/19 15:15:11
Modified: java build.xml
java/tools/src XJavac.java
java/tools/bin xjavac.jar
Log:
permit DOM 3 samples to be built under (sun) JDK 1.4
Revision Changes Path
1.124 +3 -3 xml-xerces/java/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xerces/java/build.xml,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- build.xml 18 Mar 2003 18:05:43 -0000 1.123
+++ build.xml 19 Mar 2003 23:15:10 -0000 1.124
@@ -1114,7 +1114,7 @@
<!-- =================================================================== -->
<!-- Compiles the samples with DOM Level 3 -->
<!-- =================================================================== -->
- <target name="samples-dom3" depends="compile-dom3">
+ <target name="samples-dom3" depends="jar-dom3, apijar-dom3">
<mkdir dir="${build.samples}"/>
<copy todir="${build.samples}" >
<fileset dir="${samples.dir}" />
@@ -1132,7 +1132,7 @@
<xjavac srcdir="${build.samples}"
destdir="${build.dest}"
- classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
+
classpath="${build.dir}/classes:${build.dir}/dom3-${jar.parser}:${build.dir}/dom3-${jar.apis}:${tools.dir}/${jar.apis}"
debug="${debug}"
includeAntRuntime="false"
includeJavaRuntime="true"/>
1.3 +7 -3 xml-xerces/java/tools/src/XJavac.java
Index: XJavac.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/tools/src/XJavac.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XJavac.java 20 Jan 2003 22:15:00 -0000 1.2
+++ XJavac.java 19 Mar 2003 23:15:11 -0000 1.3
@@ -133,11 +133,15 @@
// need to do special things for Sun too...
else if(vendor.indexOf("SUN") >= 0){
// we're on an SUN 1.4; fiddle with the bootclasspath.
+ // since we can't eviscerate XML-related info here,
+ // we must use the classpath
Path bcp = createBootclasspath();
- String bcpMember = "./tools/xml-apis.jar";
- bcp.createPathElement().setPath(bcpMember);
+ Path clPath = getClasspath();
+ bcp.append(clPath);
String currBCP = (String)props.get("sun.boot.class.path");
- bcp.createPathElement().setPath(currBCP);
+ Path currBCPath = new Path(null);
+ currBCPath.createPathElement().setPath(currBCP);
+ bcp.append(currBCPath);
setBootclasspath(bcp);
}
}
1.3 +6 -6 xml-xerces/java/tools/bin/xjavac.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
