xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject cvs commit: xml-xalan/java build.xml
Date Thu, 08 Nov 2001 22:00:26 GMT
curcuru     01/11/08 14:00:26

  Modified:    java     build.xml
  Log:
  OK, now we're finally using the new build.xml-apis.jar in the classpath in
  all the places we need it.  Really.  I promise.
  
  Revision  Changes    Path
  1.143     +76 -40    xml-xalan/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/build.xml,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- build.xml	2001/11/08 21:00:45	1.142
  +++ build.xml	2001/11/08 22:00:26	1.143
  @@ -42,7 +42,7 @@
   
   Copyright:
     Copyright (c) 1999-2001 The Apache Software Foundation.
  -   $Id: build.xml,v 1.142 2001/11/08 21:00:45 curcuru Exp $
  +   $Id: build.xml,v 1.143 2001/11/08 22:00:26 curcuru Exp $
   ==================================================================== -->
   
   <project name="Xalan" default="jar" basedir=".">
  @@ -158,8 +158,14 @@
       <pathelement location="${stylebook.jar}" />
       <pathelement location="${doclet.jar}" />
       <pathelement location="${build.xalan.jar}" />
  +    <pathelement location="${build.xml-apis.jar}" />
       <pathelement path="${java.class.path}" />
     </path>
  +  <path id="samples.class.path">
  +    <pathelement location="${build.xalan.jar}" />
  +    <pathelement location="${build.xml-apis.jar}" />
  +    <pathelement path="${java.class.path}" />
  +  </path>
     <path id="xslt.boot.class.path">
       <!-- Put this version of xalan in front of the jdk's for JDK 1.4+ -->
       <pathelement location="${build.classes}" />
  @@ -170,7 +176,7 @@
     <!-- Creates output build directories and doc prerequistes               -->
     <!-- =================================================================== -->
     <target name="prepare">
  -    <echo message="Project:${Name-in-docs} version:${version} build.xml $Revision: 1.142
$"/>
  +    <echo message="Project:${Name-in-docs} version:${version} build.xml $Revision: 1.143
$"/>
       <mkdir dir="${build.dir}"/>
       <mkdir dir="${build.classes}"/>
       <!-- Note that all testing-related targets *must* depend on 
  @@ -382,14 +388,16 @@
     <!-- Creates the Xalan-J1 compatability JAR                              -->
     <!-- =================================================================== -->
     <target name="compat.jar" depends="jar"
  -    description="Compile and jar Xalan-J 1.x backwards compat classes" >
  -    <echo message="Compile and jar just the Xalan-J 1 compability API"/>
  +    description="DEPRECATED:Compile and jar Xalan-J 1.x backwards compat classes" >
  +    <echo message="DEPRECATED:Compile and jar just the Xalan-J 1 compability API"/>
       <mkdir dir="${build.compat.classes}"/>
  -    <javac srcdir="${compat.src.dir}" classpath="${build.xalan.jar}:${java.class.path}"

  +    <javac srcdir="${compat.src.dir}" 
              destdir="${build.compat.classes}"
              includes="**/*.java"
              debug="${build.debug}"
  -           bootclasspathref="xslt.boot.class.path" />
  +           bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="docs.class.path" />
  +    </javac>           
       <copy todir="${build.compat.classes}">
             <fileset dir="${compat.src.dir}" includes="**/*.properties,**/*.res"/>
       </copy>  
  @@ -427,42 +435,66 @@
       <property name="exclude" value="*.xml,*.xsl,*.txt,*.html,*.properties,*.out"/>
       <mkdir dir="${build.samples}"/>
       <!-- Since the samples are packageless, they must be compiled separately. -->
  
  -    <javac srcdir="${samples.dir}/SimpleTransform" classpath="${java.class.path}:${build.xalan.jar}"

  +    <javac srcdir="${samples.dir}/SimpleTransform" 
              destdir="${build.samples}"  excludes="${exclude}"
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/UseStylesheetPI" classpath="${java.class.path}:${build.xalan.jar}"
 
  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/UseStylesheetPI"   
              destdir="${build.samples}"  excludes="${exclude}"
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/UseStylesheetParam" classpath="${java.class.path}:${build.xalan.jar}"
  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/UseStylesheetParam" 
              destdir="${build.samples}"  excludes="${exclude}"
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/SAX2SAX" classpath="${java.class.path}:${build.xalan.jar}"

  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/SAX2SAX"  
              destdir="${build.samples}"  excludes="${exclude}"
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/DOM2DOM" classpath="${java.class.path}:${build.xalan.jar}"

  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/DOM2DOM"  
              destdir="${build.samples}"  excludes="${exclude}"
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/Pipe" classpath="${java.class.path}:${build.xalan.jar}"

  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/Pipe"  
              destdir="${build.samples}"  excludes="${exclude}"
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/UseXMLFilters" classpath="${java.class.path}:${build.xalan.jar}"

  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/UseXMLFilters"  
              destdir="${build.samples}"  excludes="${exclude}"
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/Trace" classpath="${java.class.path}:${build.xalan.jar}"
 
  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/Trace"   
              destdir="${build.samples}"  excludes="${exclude}"
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/ApplyXPath" classpath="${java.class.path}:${build.xalan.jar}"

  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/ApplyXPath"  
              destdir="${build.samples}" excludes="${exclude}" 
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/trax" classpath="${java.class.path}:${build.xalan.jar}"

  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/trax"  
              destdir="${build.samples}" excludes="${exclude}" 
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/extensions" classpath="${java.class.path}:${build.xalan.jar}"

  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/extensions"  
              destdir="${build.samples}" excludes="${exclude}" 
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samples.dir}/Validate" classpath="${java.class.path}:${build.xalan.jar}"

  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
  +    <javac srcdir="${samples.dir}/Validate"  
              destdir="${build.samples}" excludes="${exclude}" 
  -           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  +           debug="${build.debug}" bootclasspathref="xslt.boot.class.path" >
  +      <classpath refid="samples.class.path" />
  +    </javac>           
       <jar jarfile="${build.samples.jar}" basedir="${build.samples}"
            includes="*.class"/>                   
     </target>
  @@ -476,10 +508,12 @@
       description="Compile and jar the servlet samples" >
        <echo message="To compile the sample servlets, javax.servlet and javax.servlet.http
must be on the classpath"/>   
        <mkdir dir="${build.samples}/servlet"/>
  -     <javac srcdir="${samples.dir}/servlet" classpath="${java.class.path}:${build.xalan.jar}"

  +     <javac srcdir="${samples.dir}/servlet"
               destdir="${build.samples}"
               debug="${build.debug}"
  -            bootclasspathref="xslt.boot.class.path" />
  +            bootclasspathref="xslt.boot.class.path" >
  +       <classpath refid="samples.class.path" />
  +     </javac>           
         <copy todir="${build.samples}/servlet">
           <fileset dir="${samples.dir}/servlet" 
             includes="media.properties,default.xsl,default2.xsl"/>
  @@ -862,35 +896,37 @@
     <!-- =================================================================== -->  
      <!-- for developers only; compiles xalan-j1 samples with compat jar and xalan-j2
xalan.jar-->
      <target name="compat.samples" depends="jar,compat.jar" 
  -    description="Compile and jar Xalan-J 1.x backwards compat samples" >
  +    description="DEPRECATED:Compile and jar Xalan-J 1.x backwards compat samples" >
        <property name="exclude" value="*.xml,*.xsl,*.txt,*.html.*.properties"/>
        <property name="samplesj1.dir" value="/xml-xalan/samples"/>
        <property name="build.compat.samples" value="./build/compat_samples"/>
  +     <property name="build.compat.class.path" value="${build.compat.jar}:${build.xalan.jar}:${build.xml-apis.jar}:${java.class.path}"/>
  +     
        <mkdir dir="${build.compat.samples}"/>     
   
       <!--need to use the XalanJ2 XPathAPI, so cannot compile ApplyXPath as is -->
  
  -    <javac srcdir="${samplesj1.dir}/Pipe" classpath="${build.compat.jar}:${build.xalan.jar}:${java.class.path}"

  +    <javac srcdir="${samplesj1.dir}/Pipe" classpath="${build.compat.class.path}" 
              destdir="${build.compat.samples}"  excludes="${exclude}"
              debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samplesj1.dir}/SimpleTransform" classpath="${build.compat.jar}:${build.xalan.jar}:${java.class.path}"

  +    <javac srcdir="${samplesj1.dir}/SimpleTransform" classpath="${build.compat.class.path}"

              destdir="${build.compat.samples}"  excludes="${exclude}"
              debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samplesj1.dir}/TransformToDom" classpath="${build.compat.jar}:${build.xalan.jar}:${java.class.path}"

  +    <javac srcdir="${samplesj1.dir}/TransformToDom" classpath="${build.compat.class.path}"

              destdir="${build.compat.samples}"  excludes="${exclude}"
              debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samplesj1.dir}/PureSAX" classpath="${build.compat.jar}:${build.xalan.jar}:${java.class.path}"

  +    <javac srcdir="${samplesj1.dir}/PureSAX" classpath="${build.compat.class.path}"

              destdir="${build.compat.samples}"  excludes="${exclude}"
              debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samplesj1.dir}/UseStylesheetParam" classpath="${build.compat.jar}:${build.xalan.jar}:${java.class.path}"

  +    <javac srcdir="${samplesj1.dir}/UseStylesheetParam" classpath="${build.compat.class.path}"

              destdir="${build.compat.samples}"  excludes="${exclude}"
              debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
  -    <javac srcdir="${samplesj1.dir}/Servlet" classpath="${build.compat.jar}:${build.xalan.jar}:${java.class.path}"

  +    <javac srcdir="${samplesj1.dir}/Servlet" classpath="${build.compat.class.path}"

              destdir="${build.compat.samples}" excludes="${exclude}"
              debug="${build.debug}" bootclasspathref="xslt.boot.class.path" />
       <jar   jarfile="${build.compat.samples}/xalanjcompatsamples.jar" basedir="${build.compat.samples}"
               includes="*.class"/> 
        <!--put the servlet in a separate jar -->
  -     <javac srcdir="${samplesj1.dir}/Servlet" classpath="${build.compat.jar}:${build.xalan.jar}:${java.class.path}"

  +     <javac srcdir="${samplesj1.dir}/Servlet" classpath="${build.compat.class.path}"

              destdir="${build.compat.samples}"
              debug="${build.debug}"
              bootclasspathref="xslt.boot.class.path" />
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message