jvanzyl     02/01/22 12:23:54

  Modified:    util     build.xml
  Log:
  - removed reference to MinML, build file was probably copied from JJAR.
  
  Revision  Changes    Path
  1.6       +165 -169  jakarta-commons-sandbox/util/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/util/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml 28 Nov 2001 10:12:29 -0000      1.5
  +++ build.xml 22 Jan 2002 20:23:54 -0000      1.6
  @@ -1,87 +1,87 @@
  -<project name="Jakarta Commons Utilities" default="jar" basedir=".">
  -
  -<!--
  -        $Id: build.xml,v 1.5 2001/11/28 10:12:29 dlr Exp $
  --->
  -
  -<!-- ========== Initialize Properties =================================== -->
  -
  -
  +<project name="Jakarta Commons Utilities" default="jar" basedir=".">
  +
  +<!--
  +        $Id: build.xml,v 1.6 2002/01/22 20:23:54 jvanzyl Exp $
  +-->
  +
  +<!-- ========== Initialize Properties =================================== -->
  +
  +
     <property file="./build.properties"/>              <!-- Component loc   -->
  -  <property file="../build.properties"/>             <!-- Commons local     -->
  -  <property file="${user.home}/build.properties"/>   <!-- User local        -->
  -
  -
  -<!-- ========== Classpaths ============================================== -->
  -
  -  <path id="compile.classpath">
  -    <pathelement location="${build.home}/class"/>
  -  </path>
  -
  +  <property file="../build.properties"/>             <!-- Commons local     -->
  +  <property file="${user.home}/build.properties"/>   <!-- User local        -->
  +
  +
  +<!-- ========== Classpaths ============================================== -->
  +
  +  <path id="compile.classpath">
  +    <pathelement location="${build.home}/class"/>
  +  </path>
  +
     <path id="servlet.classpath">
       <path refid="compile.classpath"/>
       <path location="jsdk.jar"/>
     </path>
   
  -  <path id="test.classpath">
  -    <pathelement location="${build.home}/class"/>
  -    <pathelement location="${build.home}/test"/>
  -    <pathelement location="${junit.jar}"/>
  -  </path>
  -
  +  <path id="test.classpath">
  +    <pathelement location="${build.home}/class"/>
  +    <pathelement location="${build.home}/test"/>
  +    <pathelement location="${junit.jar}"/>
  +  </path>
  +
     <path id="servlet.classpath">
        <pathelement location="${servlet.jar}" />
     </path>
   
  -
  -<!-- ========== Executable Targets ====================================== -->
  -
  -  <target name="init"
  -    description="Initialize and evaluate conditionals">
  -    <echo message="-------- ${component.name} ${component.version} --------"/>
  -    <filter token="name" value="${component.name}"/>
  -    <filter token="version" value="${component.version}"/>
  -
  -    <available
  -      classname="junit.framework.TestCase"
  -      property="junit.present"
  -      classpathref="test.classpath"/>
  +
  +<!-- ========== Executable Targets ====================================== -->
  +
  +  <target name="init"
  +    description="Initialize and evaluate conditionals">
  +    <echo message="-------- ${component.name} ${component.version} --------"/>
  +    <filter token="name" value="${component.name}"/>
  +    <filter token="version" value="${component.version}"/>
  +
  +    <available
  +      classname="junit.framework.TestCase"
  +      property="junit.present"
  +      classpathref="test.classpath"/>
       <available
         classname="javax.servlet.http.HttpServletRequest"
         property="servlet.request.present"
         classpathref="servlet.classpath"/>
  -  </target>
  -
  -
  -  <target name="prepare" depends="init"
  -    description="Prepare build directory">
  -    <mkdir dir="${build.home}"/>
  -    <mkdir dir="${build.home}/class"/>
  -    <mkdir dir="${build.home}/conf"/>
  -    <mkdir dir="${build.home}/test"/>
  -  </target>
  -
  -
  -  <target name="static" depends="prepare"
  -    description="Copy static files to build directory">
  -    <tstamp/>
  -  </target>
  -
  -  <target name="compile" depends="static" 
  -      description="Compile shareable components">
  -
  -    <javac srcdir="${source.home}/java"
  +  </target>
  +
  +
  +  <target name="prepare" depends="init"
  +    description="Prepare build directory">
  +    <mkdir dir="${build.home}"/>
  +    <mkdir dir="${build.home}/class"/>
  +    <mkdir dir="${build.home}/conf"/>
  +    <mkdir dir="${build.home}/test"/>
  +  </target>
  +
  +
  +  <target name="static" depends="prepare"
  +    description="Copy static files to build directory">
  +    <tstamp/>
  +  </target>
  +
  +  <target name="compile" depends="static" 
  +      description="Compile shareable components">
  +
  +    <javac srcdir="${source.home}/java"
         excludes="org/apache/commons/util/http/RequestUtils.java,
                   org/apache/commons/util/http/ExtendedBrowserDetector.java"
  -      destdir="${build.home}/class"
  -      debug="${compile.debug}"
  -      deprecation="${compile.deprecation}"
  -      optimize="${compile.optimize}">
  -      <classpath refid="compile.classpath"/>
  -    </javac>
  -
  -  </target>
  -
  +      destdir="${build.home}/class"
  +      debug="${compile.debug}"
  +      deprecation="${compile.deprecation}"
  +      optimize="${compile.optimize}">
  +      <classpath refid="compile.classpath"/>
  +    </javac>
  +
  +  </target>
  +
     <target name="compile-request" depends="compile" if="servlet.request.present"
             description="Compiles classes dependant on the HttpServletRequest class">
   
  @@ -95,107 +95,103 @@
         <classpath refid="servlet.classpath"/>
       </javac>
     </target>
  -
  -  <target name="clean"
  -   description="Clean build and distribution directories">
  -    <delete dir="${build.home}"/>
  -    <delete dir="${dist.home}"/>
  -  </target>
  -
  -
  +
  +  <target name="clean"
  +   description="Clean build and distribution directories">
  +    <delete dir="${build.home}"/>
  +    <delete dir="${dist.home}"/>
  +  </target>
  +
  +
     <target name="all" depends="clean,compile,compile-request"
  -   description="Clean and compile all components"/>
  -
  -
  -  <target name="javadoc" depends="compile"
  -   description="Create component Javadoc documentation">
  -    <mkdir dir="${dist.home}"/>
  -    <mkdir dir="${dist.home}/docs"/>
  -    <mkdir dir="${dist.home}/docs/api"/>
  -    <javadoc sourcepath="${source.home}/java"
  -        destdir="${dist.home}/docs/api"
  -        packagenames="org.apache.commons.*"
  -        author="true"
  -        private="true"
  -        version="true"
  -        doctitle="&lt;h1&gt;${component.title}&lt;/h1&gt;"
  -        windowtitle="${component.title} (Version ${component.version})"
  -        bottom="Copyright (c) 2001 - Apache Software Foundation"/>
  -  </target>
  -
  -
  +   description="Clean and compile all components"/>
  +
  +
  +  <target name="javadoc" depends="compile"
  +   description="Create component Javadoc documentation">
  +    <mkdir dir="${dist.home}"/>
  +    <mkdir dir="${dist.home}/docs"/>
  +    <mkdir dir="${dist.home}/docs/api"/>
  +    <javadoc sourcepath="${source.home}/java"
  +        destdir="${dist.home}/docs/api"
  +        packagenames="org.apache.commons.*"
  +        author="true"
  +        private="true"
  +        version="true"
  +        doctitle="&lt;h1&gt;${component.title}&lt;/h1&gt;"
  +        windowtitle="${component.title} (Version ${component.version})"
  +        bottom="Copyright (c) 2001 - Apache Software Foundation"/>
  +  </target>
  +
  +
     <target name="jar" depends="compile,compile-request" description="Build jar">
  -       <jar jarfile="${component.jar}"
  -         basedir="${build.home}/class"
  -         manifest="${source.home}/conf/MANIFEST.MF" />
  -  </target>
  -
  -
  +       <jar jarfile="${component.jar}"
  +         basedir="${build.home}/class"
  +         manifest="${source.home}/conf/MANIFEST.MF" />
  +  </target>
  +
  +
     <target name="dist" depends="compile,compile-request,javadoc"
  -   description="Create binary distribution">
  -    <mkdir dir="${dist.home}"/>
  -    <copy file="LICENSE" todir="${dist.home}"/>
  -
  -    <!-- make a complete jar w/ the MinML2 SAX stuff -->
  -    <unzip src="${minml2.jar}" dest="${build.home}/class"/>
  -    <delete dir="${build.home}/class/META-INF" quiet="true"/>
  -
  -    <jar jarfile="${dist.home}/${component.jar}"
  -      basedir="${build.home}/class"
  -      manifest="${source.home}/conf/MANIFEST.MF"/>
  -  </target>
  -
  -
  -  <target name="install-jar" depends="jar" 
  -          description="==> Installs .jar file in ${lib.repo}">
  -    <copy todir="${lib.repo}" filtering="no">
  -      <fileset dir="${build.dir}">
  -        <include name="${component.jar}"/>
  -      </fileset>
  -    </copy>
  -  </target>
  -
  -
  -  <target name="compile-tests" depends="prepare,compile" if="junit.present"
  -          description="==> compiles the test source code">
  -    <mkdir dir="${build.home}/test"/>
  -
  -    <javac srcdir="${test.home}"
  -      destdir="${build.home}/test"
  -      excludes="**/package.html"
  -      debug="${debug}"
  -      deprecation="${deprecation}"
  -      optimize="${optimize}">
  -      <classpath refid="test.classpath"/>
  -      <classpath>
  -          <pathelement path="${build.dest}"/>
  -      </classpath>
  -    </javac>
  -  </target>
  -
  -
  -<!-- ========== Unit Test Targets ======================================= --> 
  -
  -  <target name="run-tests" depends="prepare,compile-tests" if="junit.present"
  -          description="==> Runs the unit tests">
  -
  -    <taskdef name="junit"
  -          classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
  -          <classpath refid="test.classpath"/>
  -    </taskdef>
  -
  -    <junit printsummary="no" haltonfailure="yes">
  -      <classpath>
  -        <path refid="test.classpath"/>
  -      </classpath>
  -      <formatter type="plain" usefile="false"/>
  -
  -      <batchtest>
  -        <fileset dir="${test.home}">
  -          <include name="**/*Test.java"/>
  -        </fileset>
  -      </batchtest>
  -    </junit>
  -  </target>
  -
  -</project>
  +   description="Create binary distribution">
  +    <mkdir dir="${dist.home}"/>
  +    <copy file="LICENSE" todir="${dist.home}"/>
  +
  +    <jar jarfile="${dist.home}/${component.jar}"
  +      basedir="${build.home}/class"
  +      manifest="${source.home}/conf/MANIFEST.MF"/>
  +  </target>
  +
  +
  +  <target name="install-jar" depends="jar" 
  +          description="==> Installs .jar file in ${lib.repo}">
  +    <copy todir="${lib.repo}" filtering="no">
  +      <fileset dir="${build.dir}">
  +        <include name="${component.jar}"/>
  +      </fileset>
  +    </copy>
  +  </target>
  +
  +
  +  <target name="compile-tests" depends="prepare,compile" if="junit.present"
  +          description="==> compiles the test source code">
  +    <mkdir dir="${build.home}/test"/>
  +
  +    <javac srcdir="${test.home}"
  +      destdir="${build.home}/test"
  +      excludes="**/package.html"
  +      debug="${debug}"
  +      deprecation="${deprecation}"
  +      optimize="${optimize}">
  +      <classpath refid="test.classpath"/>
  +      <classpath>
  +          <pathelement path="${build.dest}"/>
  +      </classpath>
  +    </javac>
  +  </target>
  +
  +
  +<!-- ========== Unit Test Targets ======================================= --> 
  +
  +  <target name="run-tests" depends="prepare,compile-tests" if="junit.present"
  +          description="==> Runs the unit tests">
  +
  +    <taskdef name="junit"
  +          classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
  +          <classpath refid="test.classpath"/>
  +    </taskdef>
  +
  +    <junit printsummary="no" haltonfailure="yes">
  +      <classpath>
  +        <path refid="test.classpath"/>
  +      </classpath>
  +      <formatter type="plain" usefile="false"/>
  +
  +      <batchtest>
  +        <fileset dir="${test.home}">
  +          <include name="**/*Test.java"/>
  +        </fileset>
  +      </batchtest>
  +    </junit>
  +  </target>
  +
  +</project>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to