avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-components/cornerstone/site maven.xml project.xml
Date Sun, 28 Mar 2004 09:11:06 GMT
mcconnell    2004/03/28 01:11:06

  Modified:    cornerstone maven.xml project.properties project.xml
               cornerstone/site/etc site.jsl
  Added:       cornerstone .cvsignore
  Removed:     cornerstone/site maven.xml project.xml
  Log:
  Clean build using RC2.
  
  Revision  Changes    Path
  1.2       +356 -39   avalon-components/cornerstone/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	28 Mar 2004 08:13:02 -0000	1.1
  +++ maven.xml	28 Mar 2004 09:11:05 -0000	1.2
  @@ -1,53 +1,370 @@
  -<project default="build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
  -  <property file="${basedir}/project.properties"/>
  -  <property file="${basedir}/../project.properties"/>
  +<project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
   
  -  <goal name="avalon:build">
  -    <attainGoal name="avalon:install"/>
  -  </goal>
  +  <!--
  +  ==============================================================================
  +  switches 
  +  ==============================================================================
  +  -->
   
  -  <goal name="avalon:install"
  -    description="Install the sub-project jars." >
  -    <maven:reactor
  -      basedir="${basedir}"
  +  <ant:property name="avalon.snapshot" value="true"/>
  +
  +  <!--
  +  ==============================================================================
  +  derived properties 
  +  ==============================================================================
  +  -->
  +
  +  <ant:property name="maven.dist.assembly.dir"
  +    value="${maven.build.dir}/temp"/>
  +  <ant:property name="maven.dist.bin.archive.dir"
  +    value="${maven.dist.assembly.dir}/bin"/>
  +  <ant:property name="maven.dist.src.archive.dir"
  +    value="${maven.dist.assembly.dir}/src"/>
  +  <ant:property name="maven.dist.bin.assembly.dir"
  +    value="${maven.dist.assembly.dir}/bin/avalon-${pom.currentVersion}"/>
  +  <ant:property name="maven.dist.src.assembly.dir"
  +    value="${maven.dist.assembly.dir}/src/${pom.artifactId}"/>
  +  <ant:property name="maven.dist.dir"
  +    value="${maven.build.dir}/distributions"/>
  +
  +  <!--
  +  ==============================================================================
  +  structural properties 
  +  ==============================================================================
  +  -->
  +
  +  <ant:property name="pom.specificationVersion" value="1.0"/>
  +  <ant:property name="pom.organization.identifier" value="ASF"/>
  +  <ant:property file="project.properties"/>
  +
  +  <!--
  +  ==============================================================================
  +  build the repository package
  +  ==============================================================================
  +  -->
  +
  +  <goal name="avalon:build" description="Build the Logging system.">
  +
  +    <maven:reactor basedir="${basedir}"
         includes="**/project.xml"
  -      excludes="project.xml,site/*"
  +      excludes="project.xml,site/project.xml"
         goals="jar:install"
  -      banner="Installing:"
  -      ignoreFailures="false" />
  +      banner="Building:"
  +      ignoreFailures="false"
  +      postProcessing="true" />
  +
  +    <ant:copy todir="${maven.build.dir}/jars">
  +      <j:forEach var="child" items="${reactorProjects}">
  +        <ant:fileset dir="${child.file.parentFile}/target">
  +          <ant:include name="${child.artifactId}-${child.currentVersion}.jar"/>
  +          <ant:include name="${child.artifactId}-${child.currentVersion}.jar.meta"/>
  +        </ant:fileset>
  +      </j:forEach>
  +    </ant:copy>
  +    <j:forEach var="child" items="${reactorProjects}">
  +      <j:set var="path" value="${child.artifactId}-${child.currentVersion}"/>
  +      <util:file var="jarFile" name="${maven.build.dir}/jars/${path}.jar"/>
  +      <j:if test="${jarFile.exists()}">
  +        <checksum file="${jarFile}"/>
  +        <j:if test="${maven_gpg_exe != null}">
  +          <ant:exec executable="${maven_gpg_exe}">
  +            <ant:arg value="-a"/>
  +            <ant:arg value="--yes"/>
  +            <ant:arg value="-b"/>
  +            <ant:arg value="${jarFile}"/>
  +          </ant:exec>
  +        </j:if>
  +      </j:if>
  +      <util:file var="metaFile" name="${maven.build.dir}/jars/${path}.jar.meta"/>
  +      <j:if test="${metaFile.exists()}">
  +        <checksum file="${metaFile}"/>
  +        <j:if test="${maven_gpg_exe != null}">
  +          <ant:exec executable="${maven_gpg_exe}">
  +            <ant:arg value="-a"/>
  +            <ant:arg value="--yes"/>
  +            <ant:arg value="-b"/>
  +            <ant:arg value="${metaFile}"/>
  +          </ant:exec>
  +        </j:if>
  +      </j:if>
  +    </j:forEach>
     </goal>
   
  -  <goal name="avalon:site"
  -    description="Build the project site." >
  +  <!--
  +  ==============================================================================
  +  clean all subprojects
  +  ==============================================================================
  +  -->
  +
  +  <goal name="avalon:clean" prereqs="clean" description="Clean all subprojects.">
       <maven:reactor
         basedir="${basedir}"
  -      includes="project.xml,site/project.xml"
  -      goals="site"
  -      banner="Building site:"
  -      ignoreFailures="false" />
  +      includes="**/project.xml"
  +      excludes="**/target/**,project.xml"
  +      goals="clean:clean"
  +      banner="Cleaning subproject:"
  +      ignoreFailures="true"/>
     </goal>
   
  -  <goal name="avalon:clean"
  -    description="Clean up build artifacts" >
  -    <maven:reactor
  -      basedir="${basedir}"
  +  <!--
  +  ==============================================================================
  +  build the site documentation
  +  ==============================================================================
  +  -->
  +
  +  <goal name="avalon:site" prereqs="xavalon:css-copy,xjavadoc,site"/>
  +
  +  <goal name="xavalon:css-copy">
  +    <ant:mkdir dir="${maven.build.dir}/docs/style"/>
  +    <ant:copy toDir="${maven.build.dir}/docs/style">
  +      <fileset dir="${basedir}/site/etc">
  +        <include name="maven.css"/>
  +        <include name="tigris.css"/>
  +      </fileset>
  +    </ant:copy>
  +  </goal>
  +
  +  <!--
  +  ==============================================================================
  +  build a formal distribution
  +  ==============================================================================
  +  -->
  +
  +  <goal name="avalon:dist" prereqs="avalon:build,avalon:site,xdist"/>
  +
  +  <goal name="xdist"
  +    prereqs="xdist:build"
  +    description="Build a complete distribution.">
  +  </goal>
  +        
  +  <goal
  +    name="xdist:build"
  +    prereqs="xdist:build-setup,xdist:build-bin,xdist:build-src"
  +    description="Build a complete distribution.">
  +  </goal>
  +
  +  <goal
  +    name="xdist:build-setup"
  +    description="Set up directories for a distribution build">
  +    <ant:delete dir="${maven.dist.dir}"/>
  +    <ant:mkdir dir="${maven.dist.dir}"/>
  +
  +    <j:choose>
  +      <j:when test="${avalon.snapshot}">
  +        <maven:snapshot project="${pom}"/>
  +        <j:set var="timestamp" value="${snapshotSignature.substring(12)}"/>
  +        <j:set var="binary.name" value="${maven.final.name}-${timestamp}-dist"/>
  +        <j:set var="source.name" value="${maven.final.name}-${timestamp}-src"/>
  +        <echo>Snapshot Packaging: ${timestamp}</echo>
  +      </j:when>
  +      <j:otherwise>
  +        <j:set var="binary.name" value="${maven.final.name}-dist"/>
  +        <j:set var="source.name" value="${maven.final.name}-src"/>
  +        <echo>Release Packaging: ${pom.currentVersion}</echo>
  +      </j:otherwise>
  +    </j:choose>
  +
  +  </goal>
  +
  +  <goal
  +    name="xdist:build-bin" 
  +    prereqs="xdist:prepare-bin-filesystem"
  +    description="Build the binary distribution.">
  +
  +    <!-- Create a tar.gz file -->
  +    <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${binary.name}.tar">
  +      <ant:tarfileset dir="${maven.dist.bin.archive.dir}"/>
  +    </ant:tar>
  +
  +    <ant:gzip 
  +      zipfile="${maven.dist.dir}/${binary.name}.tar.gz"
  +      src="${maven.dist.dir}/${binary.name}.tar"
  +    />
  +    <ant:delete file="${maven.dist.dir}/${binary.name}.tar"/>
  +    <checksum file="${maven.dist.dir}/${binary.name}.tar.gz"/>
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
  +        <ant:arg value="-a"/>
  +        <ant:arg value="-b"/>
  +        <ant:arg value="${maven.dist.dir}/${binary.name}.tar.gz"/>
  +      </ant:exec>
  +    </j:if>
  +
  +    <!-- Create a zip file -->
  +    <ant:zip zipfile="${maven.dist.dir}/${binary.name}.zip">
  +      <ant:zipfileset dir="${maven.dist.bin.archive.dir}"/>
  +    </ant:zip>
  +    <checksum file="${maven.dist.dir}/${binary.name}.zip"/>
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
  +        <ant:arg value="-a"/>
  +        <ant:arg value="-b"/>
  +        <ant:arg value="${maven.dist.dir}/${binary.name}.zip"/>
  +      </ant:exec>
  +    </j:if>
  +  </goal>
  +
  +  <goal
  +    name="xdist:build-src"
  +    prereqs="xdist:prepare-src-filesystem"
  +    description="Build the source distribution.">
  + 
  +    <!-- Create a tar.gz file -->
  +    <ant:tar longfile="gnu" tarfile="${maven.dist.dir}/${source.name}.tar">
  +      <ant:tarfileset dir="${maven.dist.src.archive.dir}"/>
  +    </ant:tar>
  +    <ant:gzip 
  +      zipfile="${maven.dist.dir}/${source.name}.tar.gz" 
  +      src="${maven.dist.dir}/${source.name}.tar"
  +    />
  +    <ant:delete file="${maven.dist.dir}/${source.name}.tar"/>
  +    <checksum file="${maven.dist.dir}/${source.name}.tar.gz"/>
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
  +        <ant:arg value="-a"/>
  +        <ant:arg value="-b"/>
  +        <ant:arg value="${maven.dist.dir}/${source.name}.tar.gz"/>
  +      </ant:exec>
  +    </j:if>
  +
  +    <!-- Create a zip file -->
  +    <ant:zip zipfile="${maven.dist.dir}/${source.name}.zip">
  +      <ant:zipfileset dir="${maven.dist.src.archive.dir}"/>
  +    </ant:zip>
  +    <checksum file="${maven.dist.dir}/${source.name}.zip"/>
  +    <j:if test="${maven_gpg_exe != null}">
  +      <ant:exec executable="${maven_gpg_exe}">
  +        <ant:arg value="-a"/>
  +        <ant:arg value="-b"/>
  +        <ant:arg value="${maven.dist.dir}/${source.name}.zip"/>
  +      </ant:exec>
  +    </j:if>
  +  </goal>
  +
  +  <goal
  +    name="xdist:prepare-bin-filesystem" 
  +    description="Builds the binary files.">
  +
  +    <ant:delete dir="${maven.dist.bin.assembly.dir}"/>
  +    <ant:mkdir dir="${maven.dist.bin.assembly.dir}"/>
  +    <ant:echo>
  +      +-------------------------------------------------------+
  +      | C R E A T I N G  B I N A R Y  D I S T R I B U T I O N |
  +      +-------------------------------------------------------+
  +    </ant:echo>
  +    <ant:copy todir="${maven.dist.bin.assembly.dir}">
  +      <ant:fileset dir=".">
  +        <ant:include name="LICENSE*"/>
  +        <ant:include name="README*"/>
  +      </ant:fileset>
  +    </ant:copy>
  +
  +    <!-- Copy Jars -->
  +    <ant:copy todir="${maven.dist.bin.assembly.dir}">
  +      <ant:fileset dir="${maven.build.dir}">
  +        <ant:include name="jars/**"/>
  +      </ant:fileset>
  +    </ant:copy>
  +
  +    <!-- Copy Docs -->
  +    <ant:copy todir="${maven.dist.bin.assembly.dir}">
  +      <ant:fileset dir="${maven.build.dir}">
  +        <ant:include name="docs/**"/>
  +      </ant:fileset>
  +    </ant:copy>
  +
  +  </goal>
  +
  +  <goal
  +    name="xdist:prepare-src-filesystem"
  +    description="Builds the source distribution file system.">
  +    <ant:delete dir="${maven.dist.src.assembly.dir}" />
  +    <ant:mkdir dir="${maven.dist.src.assembly.dir}" />
  +
  +    <ant:echo>
  +      +-------------------------------------------------------+
  +      | C R E A T I N G  S O U R C E  D I S T R I B U T I O N |
  +      +-------------------------------------------------------+
  +    </ant:echo>
  +
  +    <ant:copy todir="${maven.dist.src.assembly.dir}">
  +      <ant:fileset dir=".">
  +        <ant:include name="LICENSE*"/>
  +        <ant:include name="project.properties"/>
  +        <ant:include name="maven.xml"/>
  +        <ant:include name="project.xml"/>
  +      </ant:fileset>
  +    </ant:copy>
  +
  +    <maven:reactor basedir="${basedir}"
         includes="**/project.xml"
  -      excludes="project.xml,site/*"
  -      goals="clean"
  -      banner="Cleaning:"
  -      ignoreFailures="false" />
  -    <attainGoal name="clean"/>
  -  </goal>
  -
  -  <goal name="avalon:dist"
  -      description="Build binary distributions" >
  -      <maven:reactor
  -        basedir="${basedir}"
  -        includes="**/project.xml"
  -        excludes="project.xml,site/*"
  -        goals="dist"
  -        banner="Building distribution:"
  -        ignoreFailures="false" />
  +      excludes="project.xml"
  +      banner="Building:"
  +      ignoreFailures="false"
  +      postProcessing="true" />
  +    <ant:copy todir="${maven.dist.src.assembly.dir}">
  +      <j:forEach var="child" items="${reactorProjects}">
  +        <ant:fileset dir="${child.file.parentFile}">
  +          <ant:exclude name="**/target/**"/>
  +          <ant:exclude name="**/*.log"/>
  +        </ant:fileset>
  +      </j:forEach>
  +    </ant:copy>
  +
  +    <ant:copy todir="${maven.dist.src.assembly.dir}/site">
  +      <ant:fileset dir="site"/>
  +    </ant:copy>
  +
  +  </goal>
  +
  +
  +  <goal name="xjavadoc">
  +
  +    <maven:reactor basedir="${basedir}"
  +      includes="**/project.xml"
  +      excludes="project.xml,site/*.*,**/target/**/*.*"
  +      banner="Site Prep:"
  +      ignoreFailures="false"
  +      postProcessing="true" />
  +
  +    <ant:path id="template.classpath">
  +      <j:forEach var="child" items="${reactorProjects}">
  +        <j:set var="deps" value="${child.dependencies}"/>
  +        <j:forEach var="dep" items="${deps}">
  +          <ant:pathelement 
  +            path="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
  +        </j:forEach>
  +      </j:forEach>
  +    </ant:path>
  +
  +    <ant:mkdir dir="${maven.build.dir}/docs/api" />
  +    <ant:property name="copyright"
  +      value="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved."
/>
  +    <ant:property name="title" value="${pom.name} ${pom.currentVersion}"/>
  +    <ant:javadoc destdir="${maven.build.dir}/docs/api" 
  +	doctitle="&lt;h1&gt;${title}&lt;/h1&gt;" 
  +      noindex="false" author="true" use="true"
  +	windowtitle="${title}" 
  +      bottom="${copyright}"
  +      additionalparam="-breakiterator -J-Xmx128m "
  +      packagenames="*,org.*">
  +
  +        <j:forEach var="child" items="${reactorProjects}">
  +          <sourcepath path="${child.file.parentFile}/src/java"/>
  +        </j:forEach>
  +
  +        <j:forEach var="packageGroup" items="${pom.packageGroups}">
  +          <group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
  +        </j:forEach>
  +
  +        <classpath>
  +          <path refid="template.classpath"/>
  +	  </classpath>
  +
  +	  <link href="http://java.sun.com/j2se/1.4.2/docs/api/" />
  +	  <link href="http://avalon.apache.org/framework/api/" />
  +
  +    </ant:javadoc>
     </goal>
   
   </project>
  
  
  
  1.3       +4 -2      avalon-components/cornerstone/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	28 Mar 2004 07:48:42 -0000	1.2
  +++ project.properties	28 Mar 2004 09:11:05 -0000	1.3
  @@ -5,9 +5,11 @@
   
   maven.ui.banner.background = #fff
   maven.ui.banner.foreground = #000
  -maven.xdoc.jsl = file:/${basedir}/../site/etc/site.jsl
  -maven.javadoc.stylesheet =${basedir}/../site/etc/stylesheet.css
  +maven.xdoc.jsl = file:/${basedir}/site/etc/site.jsl
  +maven.javadoc.stylesheet =${basedir}/site/etc/stylesheet.css
   maven.license.licenseFile = ${basedir}/LICENSE.txt
  +maven.docs.src = ${basedir}/site/xdocs
  +maven.xdoc.poweredby.image=
   
   maven.checkstyle.format = avalon
   pom.organization.identifier = ASF
  
  
  
  1.2       +1 -1      avalon-components/cornerstone/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	16 Mar 2004 14:19:29 -0000	1.1
  +++ project.xml	28 Mar 2004 09:11:05 -0000	1.2
  @@ -4,7 +4,7 @@
   
     <pomVersion>3</pomVersion>
     <groupId>cornerstone</groupId>
  -  <id>cornerstone-home</id>
  +  <id>cornerstone</id>
     <name>Cornerstone Component Suite</name>
     <currentVersion>SNAPSHOT</currentVersion>
   
  
  
  
  1.1                  avalon-components/cornerstone/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  .ant.properties
  gen
  *.el
  dist
  build
  distributions
  docs
  *.ipr
  maven.log
  velocity.log
  target
  build
  
  
  
  
  
  1.2       +6 -11     avalon-components/cornerstone/site/etc/site.jsl
  
  Index: site.jsl
  ===================================================================
  RCS file: /home/cvs/avalon-components/cornerstone/site/etc/site.jsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- site.jsl	28 Mar 2004 08:13:02 -0000	1.1
  +++ site.jsl	28 Mar 2004 09:11:06 -0000	1.2
  @@ -104,17 +104,7 @@
                   </j:if>
                 </td>
   
  -              <!-- project logo and link -->
  -
  -              <td>
  -                <div align="right" id="login">
  -                  <a href='http://apachecon.com/2003/US/index.html'>
  -                    <img border='0' 
  -                      src='http://www.apache.org/~ceki/ac2003/ac2003-150.gif'/>
  -                  </a>
  -                </div>
  -              </td>
  -
  +              <td></td>
                 <!--
                 <td>
                   <div align="right" id="login">
  @@ -131,6 +121,7 @@
                   </div>
                 </td>
                 -->
  +
               </tr>
             </table>
           </div>
  @@ -186,11 +177,13 @@
                   <j:if test="${includeProjectDocumentation.equals('yes')}">
                   <div>
                     <strong>Project Documentation</strong>
  +                  <!--
                     <div>
                       <small>
                         <a href="${relativePath}/index.html">About ${pom.name}</a>
                       </small>
                     </div>
  +                  -->
                     <div>
                       <small>
                         <a href="${relativePath}/project-info.html">Project Info</a>
  @@ -291,6 +284,7 @@
                         </j:if>
                       </j:if>
                     </j:if>
  +                  <!--
                     <j:set var="devProcess" value="false"/>
                     <util:available file="${maven.docs.src}/development-process.xml">
                       <j:set var="devProcess" value="true"/>
  @@ -310,6 +304,7 @@
                         </small>
                       </div>
                     </j:if>
  +                  -->
                   </div>
                 </j:if>
                 
  
  
  

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


Mime
View raw message