geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject cvs commit: incubator-geronimo/etc project.xml
Date Thu, 14 Aug 2003 15:43:25 GMT
jstrachan    2003/08/14 08:43:25

  Modified:    .        project.xml maven.xml
               etc      project.xml
  Log:
  fixed the recursive build process so that it can build the full website in one go
  
  Revision  Changes    Path
  1.12      +3 -7      incubator-geronimo/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/project.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.xml	14 Aug 2003 10:04:40 -0000	1.11
  +++ project.xml	14 Aug 2003 15:43:25 -0000	1.12
  @@ -66,12 +66,8 @@
     <!-- =================== -->
     
     <build>
  -    <!--
  -       | HACK: this is a quick hack as we've only got 1 module so far
  -       |       switching to a multi-project reactor based build real soon
  -     -->
  -    <sourceDirectory>${basedir}/modules/core/src/java</sourceDirectory>
  -    <unitTestSourceDirectory>${basedir}/modules/core/src/test</unitTestSourceDirectory>
  +    <sourceDirectory></sourceDirectory>
  +    <unitTestSourceDirectory></unitTestSourceDirectory>
   
       <resources>
         <resource>
  
  
  
  1.10      +16 -13    incubator-geronimo/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/maven.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- maven.xml	14 Aug 2003 12:37:50 -0000	1.9
  +++ maven.xml	14 Aug 2003 15:43:25 -0000	1.10
  @@ -125,19 +125,22 @@
       </j:scope>
     </goal>
     
  -  <goal name="site:tocvs" prereqs="modules:copy-site"
  +  <!-- site, modules:copy-site -->
  +  
  +  <goal name="site:tocvs" prereqs=""
     	description="Creates the entire website and copies it to the local CVS repository so
that it can be checked in to update the Incubator site">
     	
  -  	<j:choose xmlns="jelly:ant">
  -  	  <j:when test="${empty(geronimo.cvs.docdir)}">
  -  	    <echo>You must define a variable called geronimo.cvs.docdir to copy documentation
to CVS</echo>
  -  	  </j:when>
  -  	  <j:otherwise>
  -        <mkdir dir="${geronimo.cvs.docdir}"/>
  -        <copy todir="${geronimo.cvs.docdir}">
  -          <fileset dir="${basedir}/target/docs"/>
  -   	    </copy>
  -  	  </j:otherwise>
  -  	</j:choose>
  +  	<!-- a dummy scope tag to change XML namespace to ant -->
  +  	<j:scope xmlns="jelly:ant">
  +  	  <j:if test="${empty(geronimo.cvs.docdir)}">
  +  	    <j:set var="geronimo.cvs.docdir" value="../incubator-site/build/site/projects/geronimo"/>
  +  	  </j:if>
  +  	  
  +  	    
  +      <mkdir dir="${geronimo.cvs.docdir}"/>
  +      <copy todir="${geronimo.cvs.docdir}">
  +        <fileset dir="${basedir}/target/docs"/>
  +   	  </copy>
  +  	</j:scope>
     </goal>
   </project>
  
  
  
  1.5       +2 -2      incubator-geronimo/etc/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	14 Aug 2003 10:54:42 -0000	1.4
  +++ project.xml	14 Aug 2003 15:43:25 -0000	1.5
  @@ -17,7 +17,7 @@
     <organization>
       <name>Apache Software Foundation</name>
       <url>http://incubator.apache.org/</url>
  -    <logo>/images/group-logo.gif</logo>
  +    <logo>http://incubator.apache.org/images/group-logo.gif</logo>
     </organization>
   
     <inceptionYear>2003</inceptionYear>
  
  
  

Mime
View raw message