avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-sandbox/cache .cvsignore ant.properties.sample build.xml default.properties
Date Mon, 17 Mar 2003 20:19:15 GMT
bloritsch    2003/03/17 12:19:14

  Modified:    cache    .cvsignore ant.properties.sample build.xml
                        default.properties
  Log:
  update build to function on sandbox
  
  Revision  Changes    Path
  1.4       +1 -0      avalon-sandbox/cache/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/cache/.cvsignore,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- .cvsignore	21 Mar 2002 01:16:30 -0000	1.3
  +++ .cvsignore	17 Mar 2003 20:19:12 -0000	1.4
  @@ -4,5 +4,6 @@
   distributions
   dist
   excalibur-*
  +velocity.log*
   *.el
   *.ipr
  
  
  
  1.7       +1 -5      avalon-sandbox/cache/ant.properties.sample
  
  Index: ant.properties.sample
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/cache/ant.properties.sample,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ant.properties.sample	8 Feb 2003 14:40:38 -0000	1.6
  +++ ant.properties.sample	17 Mar 2003 20:19:13 -0000	1.7
  @@ -26,10 +26,6 @@
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  -# ----- Avalon Framework, version 4.1 or later -----
  -avalon-framework.home=${basedir}/../../avalon
  -avalon-framework.lib=${avalon-framework.home}/build/lib
  -avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
   
   
   # --------------------------------------------------
  
  
  
  1.38      +107 -39   avalon-sandbox/cache/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/cache/build.xml,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- build.xml	20 Feb 2003 14:09:32 -0000	1.37
  +++ build.xml	17 Mar 2003 20:19:13 -0000	1.38
  @@ -1,6 +1,6 @@
   <?xml version="1.0"?>
   
  -<project name="Excalibur Cache" default="main" basedir=".">
  +<project name="AvalonDataSource" default="main" basedir=".">
   
       <property file="${user.home}/build.properties"/>
       <property file="${basedir}/../ant.properties"/>
  @@ -13,15 +13,16 @@
       <path id="project.class.path">
           <pathelement location="${build.classes}"/>
           <pathelement location="${avalon-framework.jar}"/>
  +        <pathelement location="${excalibur-i18n.jar}"/>
           <pathelement location="${checkstyle.jar}"/>
  +        <pathelement location="${xml-apis.jar}"/>
           <pathelement path="${java.class.path}"/>
  +        <fileset dir="lib" includes="**/*.jar"/>
       </path>
   
       <path id="tools.class.path">
           <pathelement location="${junit.jar}"/>
  -        <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">
  @@ -34,20 +35,9 @@
       <target name="main" depends="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">
  +    <target name="compile" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -73,7 +63,7 @@
       </target>
   
       <!-- Compiles the unit test source code -->
  -    <target name="compile-test" depends="compile, dependencies-test" description="Compiles
the source code">
  +    <target name="compile-test" depends="compile" description="Compiles the source code">
           <mkdir dir="${build.testsrc}"/>
   
           <!-- Copy over all of the tests applying test filters -->
  @@ -94,6 +84,13 @@
               <include name="**/*.java"/>
           </javac>
   
  +        <!-- copy the java source files across so we can read them in for tests -->
  +        <copy todir="${build.testclasses}">
  +            <fileset dir="${test.dir}">
  +                <include name="**/data/**/*.java"/>
  +            </fileset>
  +        </copy>
  +
           <copy todir="${build.testclasses}">
               <fileset dir="${test.dir}">
                   <exclude name="**/*.java"/>
  @@ -123,11 +120,11 @@
               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="1.0"/>
  -              <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  -              <attribute name="Implementation-Version" value="${package-version}"/>
  +                <attribute name="Extension-Name" value="${name}"/>
  +                <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Specification-Version" value="1.0"/>
  +                <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
  +                <attribute name="Implementation-Version" value="${package-version}"/>
               </manifest>
               <exclude name="**/test/**"/>
               <zipfileset dir="${build.conf}" prefix="META-INF/">
  @@ -144,6 +141,14 @@
               sourcepath="${java.dir}"
               destdir="${dist.javadocs}">
               <classpath refid="project.class.path" />
  +            <group title="Info API" packages="org.apache.avalon.framework.info.*" />
  +            <group title="Info Tools API" packages="org.apache.avalon.framework.tools.*"
/>
  +            <tag name="todo" description="To do:" scope="all" />
  +            <tag name="avalon.component" enabled="false" description="Component:" scope="types"
/>
  +            <tag name="avalon.service" enabled="false" description="Service:" scope="types"
/>
  +            <tag name="avalon.context" enabled="false" description="Context:" scope="methods"
/>
  +            <tag name="avalon.entry" enabled="false" description="Context:" scope="methods"
/>
  +            <tag name="avalon.dependency" enabled="false" description="Context:" scope="methods"
/>
               <doclet name="com.sun.tools.doclets.standard.Standard">
                   <param name="-author"/>
                   <param name="-version"/>
  @@ -155,6 +160,7 @@
                   <param name="-bottom"
                       value="&quot;Copyright &#169; ${year} Apache Jakarta Project.
All Rights Reserved.&quot;"/>
               </doclet>
  +
           </javadoc>
       </target>
   
  @@ -255,7 +261,24 @@
               <param name="pathhack" expression="${checkstyle.pathhack}"/>
           </style>
   
  -  </target>
  +    </target>
  +
  +    <target name="xdoclet" depends="main" description="Generates the XML descriptors">
  +        <taskdef name="avalon-info"
  +            classname="org.apache.avalon.framework.tools.ant.MetaGenerateTask">
  +            <classpath>
  +                <path refid="project.class.path"/>
  +                <pathelement location="${build.classes}"/>
  +            </classpath>
  +        </taskdef>
  +
  +        <mkdir dir="gen"/>
  +        <avalon-info force="true" destdir="gen" >
  +            <fileset dir="${test.dir}">
  +                <include name="**/data/*.java" />
  +            </fileset>
  +        </avalon-info>
  +    </target>
   
       <!-- Creates the distribution -->
       <target name="dist"
  @@ -285,8 +308,8 @@
               <fileset dir="${build.lib}">
                   <include name="*.jar"/>
               </fileset>
  -        </copy> 
  -    </target>   
  +        </copy>
  +    </target>
   
       <!-- Creates a minimal distribution -->
       <target name="dist.lite"
  @@ -299,20 +322,64 @@
   
       </target>
   
  -    <!-- Prepares the documentation directory -->
  -    <target name="docs"> <!-- depends="javadocs" description="Generates the Docs"
-->
  -      <ant antfile="${basedir}/../forrestbuild.xml"/>
  -    </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>        
  -  
  +
  +    <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>
  +
  +        <anakia basedir="${xdocs.dir}"
  +            destdir="${docs.dir}"
  +            style="docs.vsl"
  +            projectfile="menu.xml"
  +            includes="**/*.xml"
  +            excludes="menu.xml"
  +            velocitypropertiesfile="../site/src/stylesheets/velocity.properties"
  +            />
  +
  +     <copy
  +         file="src/java/org/apache/avalon/framework/tools/infobuilder/componentinfo.dtd"
  +         tofile="${docs.dir}/componentinfo.dtd.txt"/>
  +     <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="**/*.txt"/>
  +        <include name="**/*.jpg"/>
  +        <include name="**/*.png"/>
  +        <include name="**/*.css"/>
  +        <include name="**/*.js"/>
  +      </fileset>
  +    </copy>
  +    </target>
  +
  +    <target name="site" depends="javadocs, 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>
  +
       </target>
   
       <!-- Cleans up build and distribution directories -->
  @@ -323,6 +390,7 @@
           <delete dir="${docs.dir}" />
           <delete dir="test" /> <!-- unit testing output directory -->
           <delete>
  +            <fileset dir="." includes="velocity.*"/>
               <fileset dir="." includes="**/*~" defaultexcludes="no"/>
           </delete>
       </target>
  
  
  
  1.10      +9 -18     avalon-sandbox/cache/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/cache/default.properties,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- default.properties	6 Feb 2003 13:38:28 -0000	1.9
  +++ default.properties	17 Mar 2003 20:19:13 -0000	1.10
  @@ -5,21 +5,21 @@
   # Overridden by ../default.properties and all ant.properties
   # Not user-editable; use ant.properties files instead
   
  -name=excalibur-cache
  -Name=Excalibur Cache
  +name=avalon-cache
  +Name=Avalon Cache
   dir-name=cache
  -version=1.0a
  +version=1.0
   package-version=0.99
  -year=2001-2002
  +year=2002-2003
   
   # --------------------------------------------------
   #                REQUIRED LIBRARIES
   # --------------------------------------------------
   
  -# ----- Avalon Framework -----
  -avalon-framework.home=${basedir}/../../avalon
  -avalon-framework.lib=${avalon-framework.home}/target/lib
  -avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
  +avalon-framework.jar=${basedir}/../../jakarta-avalon/target/lib/avalon-framework.jar
  +
  +# ----- jakarta-site CVS module, latest version (Anakia) -----
  +jakarta-site.dir=${basedir}/../../jakarta-avalon-site
   
   # --------------------------------------------------
   
  @@ -39,21 +39,13 @@
   build.classes = ${build.dir}/classes
   build.tests = ${build.dir}/tests
   build.reports = ${build.dir}/reports
  +docs.dir = ${build.dir}/docs
   
   #  Set the properties for source directories
   src.dir = src
   java.dir = ${src.dir}/java
   conf.dir = ${src.dir}/conf
   test.dir = ${src.dir}/test
  -
  -#  needed by Cocoon
  -build.context = ${build.dir}/documentation
  -build.docs = ${build.dir}/docs
  -build.xdocs = ${build.dir}/xdocs
  -context.dir = ../../avalon/src/documentation
  -tools.dir = ../../avalon/tools
  -tools.jar = ${java.home}/../lib/tools.jar
  -docs.dir = ${build.dir}/docs
   xdocs.dir = ${src.dir}/xdocs
   
   #  Set the properties for distribution directories
  @@ -69,4 +61,3 @@
   #  property indicating directory where all distribution archives are placed
   dist.base = distributions
   
  -depchecker.prefix=.
  
  
  

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


Mime
View raw message