avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From leosu...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/microcontainer build.xml default.properties
Date Thu, 27 Jun 2002 14:34:12 GMT
leosutic    2002/06/27 07:34:12

  Modified:    microcontainer build.xml default.properties
  Log:
  no message
  
  Revision  Changes    Path
  1.3       +54 -76    jakarta-avalon-excalibur/microcontainer/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/microcontainer/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	27 Jun 2002 09:45:46 -0000	1.2
  +++ build.xml	27 Jun 2002 14:34:12 -0000	1.3
  @@ -23,12 +23,15 @@
           <pathelement location="${tools.jar}"/>
           <fileset dir="${tools.dir}/lib"/>
           <fileset dir="${tools.dir}/ext"/>
  +        <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"/>
  +        <pathelement location="${excalibur-collections.jar}"/>
  +        <pathelement location="${excalibur-pool.jar}"/>
       </path>
       <property name="cp" refid="test.class.path"/>
       
  @@ -46,6 +49,8 @@
           <!-- Need the jar to prevent recursive deps. -->
           
           <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkJUnit"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
  +        <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCollections"/>
       </target>
       
       <!-- Compiles the source code -->
  @@ -109,6 +114,10 @@
           <java classname="org.apache.excalibur.microcontainer.util.test.DataSourceFactoryRunner"
               fork="yes">
               <classpath refid="test.class.path" />
  +            <arg value="org.gjt.mm.mysql.Driver"/>
  +            <arg value="jdbc:mysql://localhost/"/>
  +            <arg value="sa,"/>
  +            <arg value="SHOW DATABASES;"/>
           </java>
       </target>
       
  @@ -269,8 +278,8 @@
       
       <!-- Creates the distribution -->
       <target name="dist"
  -        depends="dist-jar, test-reports, checkstyle-report, javadocs"
  -        description="Generates a distribution (jar + javadocs + unit tests + checkstyle
reports)">
  +        depends="dist-jar, test-reports, checkstyle-report, javadocs, docs"
  +        description="Generates a distribution (jar + javadocs + unit tests + docs + checkstyle
reports)">
           
           
           <copy file="${build.conf}/LICENSE.txt" todir="${dist.dir}"/>
  @@ -280,6 +289,7 @@
           
           <zip zipfile="${dist.base}/${dist.name}-bin.zip" compress="true">
               <zipfileset dir="${dist.dir}" prefix="${dist.name}"/>
  +            <zipfileset dir="${docs.dir}" prefix="${dist.name}/docs"/>
           </zip>
           
           <!--
  @@ -327,84 +337,48 @@
           
       </target>
       
  -    <!-- Setup the filters -->
  -    <target name="setup-filters">
  -        <filter token="Name" value="Avalon ${Name}"/>
  -        <filter token="name" value="${dir-name}"/>
  -        <filter token="version" value="${version}"/>
  -        <filter token="year" value="${year}"/>
  -        <filter token="status" value="${status}"/>
  -        <filter token="release" value="${release}"/>
  -        <filter token="short-version" value="${short.version}"/>
  -        
  -        <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  -        <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
  -        <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
  -        <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
  -        <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  -        <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
  -        
  -        <filter token="year" value="${year}"/>
  -        <filter token="AVALON_BASE" value="${avalon.base}"/>
  -        <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  -        <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  -        <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  -        <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  -        <filter token="TESTLET_BASE" value="${testlet.base}"/>
  -    </target>
  -    
  -    
  -    <!-- Prepares the documentation directory -->
  -    <target name="docs" depends="setup-filters"> <!-- depends="javadocs" description="Generates
the Docs" -->
  -        <mkdir dir="${docs.dir}"/>
  -        
  -        <mkdir dir="${build.context}"/>
  -        <mkdir dir="${build.xdocs}"/>
  -        <mkdir dir="${build.docs}"/>
  -        <mkdir dir="${build.dir}/work"/>
  -        
  -        <!-- Base pointers for non-xdocs documentation. Override these in .ant.properties
to link to local docs -->
  -        <copy todir="${build.context}" filtering="on" overwrite="yes">
  -            <fileset dir="${context.dir}">
  -                <exclude name="diagrams/**"/>
  -                <exclude name="resources/**"/>
  -                <exclude name="xdocs"/>
  -            </fileset>
  -        </copy>
  +    <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
  +            velocity.jar is in your classpath. The easiest way to build
  +            the documentation is to checkout jakarta-site CVS and specify
  +            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>
           
  -        <copy todir="${build.context}/xdocs" filtering="on" overwrite="yes">
  -            <fileset dir="${xdocs.dir}"/>
  -        </copy>
  +        <anakia basedir="${xdocs.dir}"
  +            destdir="${docs.dir}"
  +            style="docs.vsl"
  +            projectfile="stylesheets/project.xml"
  +            includes="**/*.xml"
  +            excludes="stylesheets/**"
  +            velocitypropertiesfile="../site/src/stylesheets/velocity.properties"
  +            />
           
  -        <copy todir="${build.context}/resources" filtering="off" overwrite="yes">
  -            <fileset dir="${context.dir}/resources"/>
  +        <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>
  -        
  -        <java classname="org.apache.cocoon.Main" fork="true">
  -            <arg value="-c${build.context}/"/>
  -            <arg value="-d${build.docs}"/>
  -            <arg value="-w${build.dir}/work"/>
  -            <arg value="-l${build.dir}/work/cocoon.log"/>
  -            <arg value="-uINFO"/>
  -            <arg value="-f${xdocs.dir}/${dir-name}.uris"/>
  -            <classpath>
  -                <path refid="tools.class.path"/>
  -                <fileset dir="${tools.dir}/ext"/>
  -            </classpath>
  -        </java>
  -        
  -        <copy todir="${docs.dir}">
  -            <fileset dir="${build.docs}">
  -                <include name="**"/>
  -            </fileset>
  -        </copy>
  -        
  -        <!-- hack for stupid transport on api link -->
  -        <replace file="${docs.dir}/index.html" token="index.html.xml" value="index.html"/>
  -        
       </target>
       
       <target name="site" depends="javadocs, docs" description=" Places Docs ready for
hosting on website">
  @@ -415,9 +389,13 @@
                   <include name="**"/>
               </fileset>
           </copy>
  -        
  +        <copy todir="../site/dist/docs/${dir-name}/api">
  +            <fileset dir="${dist.javadocs}">
  +                <include name="**"/>
  +            </fileset>
  +        </copy>        
       </target>
  -    
  +        
       <!-- Cleans up build and distribution directories -->
       <target name="clean" description="Cleans up the project">
           <delete file="checkstyle.cache"/>
  
  
  
  1.3       +3 -0      jakarta-avalon-excalibur/microcontainer/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/microcontainer/default.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- default.properties	27 Jun 2002 09:45:46 -0000	1.2
  +++ default.properties	27 Jun 2002 14:34:12 -0000	1.3
  @@ -72,6 +72,9 @@
   excalibur-datasource.lib=${excalibur-datasource.home}
   excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.0.jar
   
  +# ----- Velocity
  +jakarta-site.dir=${basedir}/../../jakarta-site
  +
   # ----- Cocoon stuff
   build.context = ${build.dir}/documentation
   build.docs = ${build.dir}/docs
  
  
  

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


Mime
View raw message