avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From leosu...@apache.org
Subject cvs commit: avalon-excalibur/extension build.xml
Date Thu, 15 May 2003 10:56:24 GMT
leosutic    2003/05/15 03:56:23

  Modified:    extension build.xml
  Log:
  Removed the doc generation code on the grounds that the docs
  wre only placeholders and that the doc generation code didn't work.
  
  Revision  Changes    Path
  1.58      +93 -91    avalon-excalibur/extension/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/extension/build.xml,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- build.xml	16 Apr 2003 22:20:42 -0000	1.57
  +++ build.xml	15 May 2003 10:56:23 -0000	1.58
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
   <project name="Excalibur Extension" default="main" basedir=".">
  -
  +    
       <property file="${user.home}/build.properties"/>
       <property file="${basedir}/../ant.properties"/>
       <property file="${basedir}/ant.properties"/>
  @@ -9,46 +9,46 @@
       <property file="${basedir}/../libraries.properties"/>
       <property file="${basedir}/../default.properties"/>
       <property file="${basedir}/default.properties"/>
  -
  +    
       <!-- Classpath for product -->
       <path id="project.class.path">
           <pathelement location="${build.classes}"/>
           <pathelement location="${checkstyle.jar}"/>
           <pathelement path="${java.class.path}"/>
       </path>
  -
  +    
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
           <fileset dir="${jakarta-site.dir}/lib"/>
       </path>
  -
  +    
       <path id="test.class.path">
           <pathelement location="${build.testclasses}"/>
           <pathelement location="${junit.jar}"/>
           <path refid="project.class.path"/>
       </path>
       <property name="cp" refid="test.class.path"/>
  -
  +    
       <target name="main" depends="test,jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
  -
  +    
       <target name="dependencies" description="Check dependencies" unless="skip.dependencies">
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
       </target>
  -
  +    
       <target name="dependencies-test" depends="dist-jar, dependencies"
           description="Check unit test dependencies" unless="skip.dependencies">
           <!-- Need the jar to prevent recursive deps. -->
  -
  +        
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
       </target>
  -
  -
  +    
  +    
       <!-- Compiles the source code -->
       <target name="compile" depends="dependencies" description="Compiles the source code">
  -
  +        
           <mkdir dir="${build.classes}"/>
  -
  +        
           <!-- Compile all classes excluding the tests. -->
           <javac srcdir="${java.dir}"
               destdir="${build.classes}"
  @@ -59,7 +59,7 @@
               <classpath refid="project.class.path" />
               <include name="**/*.java"/>
           </javac>
  -
  +        
           <!-- copy resources to same location as .class files -->
           <copy todir="${build.classes}">
               <fileset dir="${java.dir}">
  @@ -67,20 +67,20 @@
                   <exclude name="**/package.html"/>
               </fileset>
           </copy>
  -
  +        
       </target>
  -
  +    
       <!-- Compiles the unit test source code -->
       <target name="compile-test" depends="compile, dependencies-test" description="Compiles
the source code">
           <mkdir dir="${build.testsrc}"/>
  -
  +        
           <!-- Copy over all of the tests applying test filters -->
           <copy todir="${build.testsrc}">
               <fileset dir="${test.dir}"/>
           </copy>
  -
  +        
           <mkdir dir="${build.testclasses}"/>
  -
  +        
           <!-- Compile all test classes. -->
           <javac srcdir="${build.testsrc}"
               destdir="${build.testclasses}"
  @@ -91,16 +91,16 @@
               <classpath refid="test.class.path" />
               <include name="**/*.java"/>
           </javac>
  -
  +        
           <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
                   <exclude name="**/package.html"/>
               </fileset>
           </copy>
  -
  +        
       </target>
  -
  +    
       <!-- Copies and filters the license. Used by jar and dist -->
       <target name="prepare-conf">
           <mkdir dir="${build.conf}"/>
  @@ -110,24 +110,24 @@
                   <filter token="year" value="${year}"/>
               </filterset>
           </copy>
  -
  +        
       </target>
  -
  +    
       <!-- Creates all the .jar file -->
       <target name="jar" depends="compile, prepare-conf" description="Generates the jar
files">
  -
  +        
           <mkdir dir="${build.lib}"/>
  -
  +        
           <jar jarfile="${build.lib}/${jar.name}"
               basedir="${build.classes}"
               compress="${build.compress}">
               <manifest>
  -              <attribute name="Extension-Name" value="${name}"/>
  -              <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Specification-Version" value="${version}"/>
  -              <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Implementation-Version" value="${package-version}"/>
  -              <attribute name="Implementation-Vendor-Id" value="ASF"/>
  +                <attribute name="Extension-Name" value="${name}"/>
  +                <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Specification-Version" value="${version}"/>
  +                <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Implementation-Version" value="${package-version}"/>
  +                <attribute name="Implementation-Vendor-Id" value="ASF"/>
               </manifest>
               <exclude name="**/test/**"/>
               <zipfileset dir="${build.conf}" prefix="META-INF/">
  @@ -135,10 +135,10 @@
               </zipfileset>
           </jar>
       </target>
  -
  +    
       <!-- Creates all the Javadocs -->
       <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.javadocs">
  -
  +        
           <mkdir dir="${dist.javadocs}"/>
           <javadoc packagenames="org.apache.*"
               sourcepath="${java.dir}"
  @@ -157,22 +157,22 @@
               </doclet>
           </javadoc>
       </target>
  -
  +    
       <target name="test" depends="compile-test" description="Perform the unit tests"
unless="skip.tests">
  -
  +        
           <echo message="Performing Unit Tests" />
  -
  +        
           <mkdir dir="${build.tests}"/>
  -
  +        
           <junit fork="true"
               haltonfailure="${junit.failonerror}"
               printsummary="yes"
               dir="${build.tests}">
               <classpath refid="test.class.path"/>
  -
  +            
               <formatter type="xml"/>    <!-- xml reports for junitreport -->
               <formatter type="plain" usefile="false"/>  <!-- text reports for humans
    -->
  -
  +            
               <batchtest todir="${build.tests}">
                   <fileset dir="${build.testclasses}">
                       <include name="**/test/*TestCase.class"/>
  @@ -180,34 +180,34 @@
                   </fileset>
               </batchtest>
           </junit>
  -
  +        
       </target>
  -
  +    
       <target name="test-reports" depends="test" description="Generate Reports for the
unit tests">
  -
  +        
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkBSF"/>
  -
  +        
           <mkdir dir="${build.reports}/junit"/>
  -
  +        
           <junitreport todir="${build.reports}/junit">
               <fileset dir="${build.tests}">
                   <include name="TEST-*.xml"/>
               </fileset>
               <report format="frames" todir="${build.reports}/junit"/>
           </junitreport>
  -
  +        
           <!-- Clean up the xml reports used by the junitreport task -->
           <!--
           <delete>
  -            <fileset dir="${build.tests}" includes="TEST-*.xml"/>
  -            <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
  +        <fileset dir="${build.tests}" includes="TEST-*.xml"/>
  +        <fileset dir="${build.tests}" includes="TESTS-*.xml"/>
           </delete>
           -->
  -
  +        
       </target>
  -
  +    
       <target name="checkstyle" if="do.checkstyle" description="Checkstyle">
  -
  +        
           <!-- this invocation of checkstyle requires that checkstyle be downloaded and
setup -->
           <!-- thats why you are required to define do.checkstyle property to generate
the report -->
           <taskdef name="checkstyle"
  @@ -242,41 +242,41 @@
               <formatter type="xml" toFile="${build.dir}/checkstyle-results.xml"/>
           </checkstyle>
       </target>
  -
  +    
       <target name="checkstyle-report"
           depends="checkstyle"
           if="do.checkstyle"
           description="Generate Checkstyle Report">
  -
  +        
           <mkdir dir="${build.reports}/checkstyle"/>
           <property name="checkstyle.pathhack" location="."/>
           <style style="${tools.dir}/etc/checkstyle-frames.xsl" in="${build.dir}/checkstyle-results.xml"
               out="${build.reports}/checkstyle/delete-me.html">
               <param name="pathhack" expression="${checkstyle.pathhack}"/>
           </style>
  -
  +        
       </target>
  -
  +    
       <!-- Creates the distribution -->
       <target name="dist"
           depends="dist-jar, test-reports, checkstyle-report, javadocs, docs"
           description="Generates a distribution (jar + docs + javadocs + unit tests + checkstyle
reports)">
  -
  +        
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../avalon/KEYS" todir="${dist.dir}"/>
  -
  +        
           <zip zipfile="${dist.dir}/src.zip" compress="false">
               <zipfileset dir="src/java"/>
           </zip>
  -
  +        
           <mkdir dir="${dist.base}"/>
  -
  +        
           <zip zipfile="${dist.base}/${dist.name}.zip" compress="true">
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
               <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
       </target>
  -
  +    
       <!-- Creates a mini jar-only distribution -->
       <target name="dist-jar" depends="jar">
           <mkdir dir="${dist.dir}"/>
  @@ -286,25 +286,25 @@
               </fileset>
           </copy>
       </target>
  -
  +    
       <!-- Creates a minimal distribution -->
       <target name="dist.lite"
           depends="dist-jar, test, javadocs"
           description="Generates a minimal distribution (jar + javadocs)">
  -
  +        
           <copy file="../LICENSE.txt" todir="${dist.dir}"/>
           <copy file="../avalon/KEYS" todir="${dist.dir}"/>
  -
  +        
       </target>
  -
  -
  +    
  +    
       <target name="anakia-avail">
           <available classname="org.apache.velocity.anakia.AnakiaTask"
               property="AnakiaTask.present">
               <classpath refid="tools.class.path"/>
           </available>
       </target>
  -
  +    
       <target name="anakia-check" depends="anakia-avail" unless="AnakiaTask.present">
           <echo>
               AnakiaTask is not present! Please check to make sure that
  @@ -313,13 +313,14 @@
               jakarta-site.dir property.
           </echo>
       </target>
  -
  +    
       <target name="docs" depends="anakia-check" description="Generate documentation and
website">
  +        <!--
           <taskdef name="anakia"
               classname="org.apache.velocity.anakia.AnakiaTask">
               <classpath refid="tools.class.path"/>
           </taskdef>
  -
  +        
           <anakia basedir="${xdocs.dir}"
               destdir="${docs.dir}"
               style="docs.vsl"
  @@ -328,31 +329,32 @@
               excludes="menu.xml"
               velocitypropertiesfile="../site/src/stylesheets/velocity.properties"
               />
  -
  -     <copy todir="${docs.dir}" filtering="off">
  -      <fileset dir="../site/src" includes="css/*.css" />
  -      <fileset dir="${xdocs.dir}">
  -        <include name="**/images/**"/>
  -        <include name="**/*.gif"/>
  -        <include name="**/*.jpg"/>
  -        <include name="**/*.png"/>
  -        <include name="**/*.css"/>
  -        <include name="**/*.js"/>
  -      </fileset>
  -    </copy>
  +        
  +        <copy todir="${docs.dir}" filtering="off">
  +            <fileset dir="../site/src" includes="css/*.css" />
  +            <fileset dir="${xdocs.dir}">
  +                <include name="**/images/**"/>
  +                <include name="**/*.gif"/>
  +                <include name="**/*.jpg"/>
  +                <include name="**/*.png"/>
  +                <include name="**/*.css"/>
  +                <include name="**/*.js"/>
  +            </fileset>
  +        </copy>
  +        -->
       </target>
  -
  +    
       <target name="site" depends="docs" description=" Places Docs ready for hosting on
website">
  -
  -      <mkdir dir="../site/dist/docs/${dir-name}"/>
  -      <copy todir="../site/dist/docs/${dir-name}">
  -        <fileset dir="${docs.dir}">
  -          <include name="**"/>
  -        </fileset>
  -      </copy>
  -
  +        
  +        <mkdir dir="../site/dist/docs/${dir-name}"/>
  +        <copy todir="../site/dist/docs/${dir-name}">
  +            <fileset dir="${docs.dir}">
  +                <include name="**"/>
  +            </fileset>
  +        </copy>
  +        
       </target>
  -
  +    
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
           <delete file="checkstyle.cache"/>
  @@ -365,9 +367,9 @@
               <fileset dir="." includes="**/*~" defaultexcludes="no"/>
           </delete>
       </target>
  -
  +    
       <target name="real-clean" depends="clean" description="Cleans up the project, including
distributions">
           <delete dir="${dist.base}" />
       </target>
  -
  +    
   </project>
  
  
  

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


Mime
View raw message