You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2001/04/22 02:12:43 UTC

cvs commit: xml-axis/java build.xml

rubys       01/04/21 17:12:43

  Modified:    java     build.xml
  Log:
  Cleanup and allow users to override via property files
  
  Revision  Changes    Path
  1.11      +39 -121   xml-axis/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	2001/03/30 17:48:30	1.10
  +++ build.xml	2001/04/22 00:12:42	1.11
  @@ -10,17 +10,7 @@
   Prerequisites:
   
      jakarta-ant from http://jakarta.apache.org
  -   jdom from http://www.jdom.org
  -   JavaMail from http://java.sun.com/products/javamail/
  -   Java Activation Framework
  -       from http://java.sun.com/products/beans/glasgow/jaf.html
  -
  -Optional additions:
  -
  -   http://www.alphaworks.ibm.com/tech/xmitoolkit
  -   http://oss.software.ibm.com/developerworks/opensource/pop3/index.html
  -   http://oss.software.ibm.com/developerworks/opensource/smtp/index.html
  -   http://java.sun.com/products/jsse/
  +   xml-xerces  from http://xml.apache.org
      
   Build Instructions:
      To build, run
  @@ -48,124 +38,51 @@
   
   <project default="compile" basedir=".">
   
  -  <target name="init">
  -    <property name="name" value="axis"/>
  -    <property name="Name" value="Axis"/>
  -    <property name="version" value="2.0"/>
  -    <property name="year" value="2001"/>
   
  -    <property name="build.compiler" value="classic"/>
  -    <property name="debug" value="on"/>
  +  <!-- Give user a chance to override without editing this file
  +       (and without typing -D each time it compiles it) -->
  +  <property file="build.properties"/>
  +  <property file="${user.home}/build.properties"/>
   
  -    <property name="src.dir" value="./src"/>
  -    <property name="docs.dir" value="./docs"/>
  -    <property name="samples.dir" value="./samples"/>
  +  <property name="name" value="axis"/>
  +  <property name="Name" value="Axis"/>
  +  <property name="year" value="2001"/>
   
  -    <property name="packages" value="org.*"/>
  +  <property name="debug" value="on"/>
   
  -    <property name="build.file" value="build.xml"/>
  +  <property name="src.dir" value="./src"/>
  +  <property name="docs.dir" value="./docs"/>
  +  <property name="samples.dir" value="./samples"/>
   
  -    <property name="build.dir" value="./build"/>
  -    <property name="build.dest" value="./build/classes"/>
  -    <property name="build.lib" value="./build/lib"/>
  -    <property name="build.samples" value="./build/samples"/>
  -    <property name="build.javadocs" value="./build/javadocs"/>
  +  <property name="packages" value="org.*"/>
   
  -    <property name="webapps" value="./webapps"/>
  +  <property name="build.file" value="build.xml"/>
   
  -    <property name="dist.dir" value="./axis-1_0"/>
  -  </target>
  -
  -  <!-- =================================================================== -->
  -  <!-- Prepares the build directory                                        -->
  -  <!-- =================================================================== -->
  -  <target name="prepare" depends="init">
  -    <mkdir dir="${build.dir}"/>
  -    <available property="bsf.present" classname="com.ibm.bsf.BSFManager" />
  -    <available property="xmi.present" classname="com.ibm.xmi.job.Job" />
  -    <available property="pop3.present" 
  -      classname="com.ibm.network.mail.pop3.event.StatusListener" />
  -    <available property="smtp.present" 
  -      classname="com.ibm.network.mail.smtp.protocol.CoreProtocolBean" />
  -    <available property="ejb.present" classname="javax.ejb.SessionBean" />
  -    <available property="ssl.present" classname="javax.net.ssl.SSLSocket" />
  -
  -    <uptodate property="javac.notRequired"
  -              targetfile="${build.lib}/${name}.jar">
  -      <srcfiles dir="${src.dir}">
  -        <patternset refid="javac.source.files"/>
  -      </srcfiles>
  -    </uptodate>
  -
  -    <uptodate property="javadoc.required"
  -              targetfile="${build.lib}/${name}.jar">
  -      <srcfiles dir="${build.dir}" includes="**/*.html"/>
  -    </uptodate>
  -
  -    <antcall target="checkDependencies"/>
  -  </target>
  +  <property name="build.dir" value="./build"/>
  +  <property name="build.dest" value="./build/classes"/>
  +  <property name="build.lib" value="./build/lib"/>
  +  <property name="build.samples" value="./build/samples"/>
  +  <property name="build.javadocs" value="./build/javadocs"/>
   
  -  <!-- =================================================================== -->
  -  <!-- Warn the user about items not being compiled                        -->
  -  <!-- =================================================================== -->
  -  <target name="checkBSF" unless="bsf.present">
  -    <echo message="Warning: BSF dependencies were not resolved."/>
  -  </target>
  -  <target name="checkXMI" unless="xmi.present">
  -    <echo message="Warning: XMI dependencies were not resolved."/>
  -  </target>
  -  <target name="checkPOP3" unless="pop3.present">
  -    <echo message="Warning: POP3 dependencies were not resolved."/>
  -  </target>
  -  <target name="checkSMTP" unless="smtp.present">
  -    <echo message="Warning: SMTP dependencies were not resolved."/>
  -  </target>
  -  <target name="checkEJB" unless="ejb.present">
  -    <echo message="Warning: EJB dependencies were not resolved."/>
  -  </target>
  -  <target name="checkSSL" unless="ssl.present">
  -    <echo message="Warning: SSL dependencies were not resolved."/>
  -  </target>
  -  <target name="checkDependencies" unless="javac.notRequired">
  -    <antcall target="checkBSF"/>
  -    <antcall target="checkXMI"/>
  -    <antcall target="checkPOP3"/>
  -    <antcall target="checkSMTP"/>
  -    <antcall target="checkEJB"/>
  -    <antcall target="checkSSL"/>
  -  </target>
  +  <property name="webapps" value="./webapps"/>
   
  -  <!-- =================================================================== -->
  -  <!-- Source files to be compiled                                         -->
  -  <!-- =================================================================== -->
  -  <patternset id="javac.source.files">
  -    <exclude name="**/InvokeBSF.java" unless="bsf.present" />
  -    <exclude name="**/XMI*.java" unless="xmi.present" />
  -    <exclude name="**/*SMTP*.java" unless="smtp.present" />
  -    <exclude name="**/*SMTP*.java" unless="pop3.present" />
  -    <exclude name="**/POP*.java" unless="smtp.present" />
  -    <exclude name="**/POP*.java" unless="pop3.present" />
  -    <exclude name="**/*EJB*.java" unless="ejb.present" />
  -    <exclude name="**/SSLUtils.java" unless="ssl.present" />
  -    <exclude name="**/old/**/*.java" />
  -  </patternset>
  +  <property name="dist.dir" value="./axis-1_0"/>
   
     <!-- =================================================================== -->
     <!-- Compiles the source directory                                       -->
     <!-- =================================================================== -->
  -  <target name="compile" depends="prepare">
  +  <target name="compile">
       <mkdir dir="${build.dest}"/>
       <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}">
  -      <patternset refid="javac.source.files"/>
  +       <classpath>
  +         <pathelement path="${java.class.path}"/>
  +         <pathelement location="${servlet.jar}"/>
  +         <pathelement location="${xerces.jar}"/>
  +       </classpath>
       </javac>
   
       <mkdir dir="${build.lib}"/>
       <jar jarfile="${build.lib}/${name}.jar" basedir="${build.dest}" />
  -
  -    <uptodate property="javadoc.required"
  -              targetfile="${build.lib}/${name}.jar">
  -      <srcfiles dir="${build.dir}" includes="**/*.html" />
  -    </uptodate>
     </target>
   
     <!-- =================================================================== -->
  @@ -195,7 +112,15 @@
     <!-- =================================================================== -->
     <!-- Creates the API documentation                                       -->
     <!-- =================================================================== -->
  -  <target name="javadocs" depends="prepare">
  +
  +  <target name="check-javadocs">
  +    <uptodate property="javadoc.required"
  +              targetfile="${build.lib}/${name}.jar">
  +      <srcfiles dir="${build.dir}" includes="**/*.html" />
  +    </uptodate>
  +  </target>
  +
  +  <target name="javadocs" depends="check-javadocs" if="javadoc.required">
       <mkdir dir="${build.javadocs}"/>
       <javadoc packagenames="${packages}"
                sourcepath="${src.dir}"
  @@ -210,16 +135,9 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Creates the API documentation if necessary                          -->
  -  <!-- =================================================================== -->
  -  <target name="javadocsIfRequired" if="javadoc.required" depends="prepare">
  -    <antcall target="javadocs"/>
  -  </target>
  -
  -  <!-- =================================================================== -->
     <!-- Creates the binary distribution                                     -->
     <!-- =================================================================== -->
  -  <target name="dist" depends="compile, javadocsIfRequired, samples" >
  +  <target name="dist" depends="compile, javadocs, samples" >
       <mkdir dir="${dist.dir}"/>
       <mkdir dir="${dist.dir}/docs"/>
       <mkdir dir="${dist.dir}/docs/apiDocs"/>
  @@ -251,7 +169,7 @@
     <!-- =================================================================== -->
     <!-- Creates the source distribution                                     -->
     <!-- =================================================================== -->
  -  <target name="srcdist" depends="init">
  +  <target name="srcdist">
       <copy todir="${dist.dir}/src">
         <fileset dir="${src.dir}"/>
       </copy>
  @@ -263,7 +181,7 @@
     <!-- =================================================================== -->
     <!-- Cleans everything                                                   -->
     <!-- =================================================================== -->
  -  <target name="clean" depends="init">
  +  <target name="clean">
       <delete dir="${build.dir}"/>
       <delete dir="${dist.dir}"/>
     </target>