brett       2004/07/05 13:58:49

  Modified:    .        Tag: MAVEN-1_0-BRANCH maven.xml
  Log:
  fix seed repo generation, add plugin install profile generation for later use
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.97.2.30 +38 -4     maven/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven/maven.xml,v
  retrieving revision 1.97.2.29
  retrieving revision 1.97.2.30
  diff -u -r1.97.2.29 -r1.97.2.30
  --- maven.xml 3 Jul 2004 01:50:37 -0000       1.97.2.29
  +++ maven.xml 5 Jul 2004 20:58:49 -0000       1.97.2.30
  @@ -208,6 +208,36 @@
       </j:forEach>
     </goal>
   
  +  <goal name="maven:build-plugin-profile">
  +    <maven:reactor
  +      basedir="${maven.plugins.directory}"
  +      includes="${maven.plugins.includes}"
  +      excludes="${maven.plugins.excludes}"
  +      postProcessing="true"
  +      banner="Gathering"
  +      ignoreFailures="false"
  +    />
  +    <j:file name="${maven.build.dir}/plugin-profile.xml"
  +        omitXmlDeclaration="false"
  +        outputMode="xml"
  +        prettyPrint="true">
  +      <plugins>
  +        <j:forEach var="reactorProject" items="${reactorProjects}">
  +          <j:set var="version" 
value="${reactorProject.versions[size(reactorProject.versions)-1]}" />
  +          <j:if test="${version.tag == 'HEAD'}">
  +            <j:set var="version" 
value="${reactorProject.versions[size(reactorProject.versions)-2]}" />
  +          </j:if>
  +          <j:if test="${version == null}">
  +            <ant:echo>WARNING: no version for ${reactorProject})</ant:echo>
  +          </j:if>
  +          <j:if test="${version != null}">
  +            <plugin artifactId="${reactorProject.artifactId}" groupId="maven" 
version="${version}" />
  +          </j:if>
  +        </j:forEach>
  +      </plugins>
  +    </j:file>
  +  </goal>
  +
   <!--
     <goal name="maven:install">
       <i:ask 
  @@ -381,10 +411,13 @@
     </goal>
   
     <goal name="maven:build-seed-repo">
  -    <j:set var="prevRepo" value="${maven.repo.local}" />
  -    <j:set var="prevSkip" value="${maven.test.skip}" />
  +    <j:set var="prevRepoLocal" value="${maven.repo.local}" />
  +    <j:set var="prevRepoRemote" value="${maven.repo.remote}" />
       <j:set var="repoLocal" value="${basedir}/target/seed-repo" />
  -    <j:set var="maven.repo.local" value="${repoLocal}" scope="parent" />
  +    <j:set var="maven.repo.local" value="${repoLocal}" />
  +    <j:set var="maven.repo.remote" value="file:${prevRepoLocal},${prevRepoRemote}" 
/>
  +<echo>maven.repo.local = ${maven.repo.local}</echo>
  +<echo>maven.repo.remote = ${maven.repo.remote}</echo>
       <ant:delete dir="${repoLocal}" />
       <maven:maven 
descriptor="src/test/touchstone-build/src/reactor-build/default/project.xml" 
goals="java:compile,site" />
       <ant:mkdir dir="${maven.build.dir}/installer" />
  @@ -399,7 +432,8 @@
           </j:forEach>
         </ant:tarfileset>
       </ant:tar>
  -    <j:set var="maven.repo.local" value="${prevRepo}" />
  +    <j:set var="maven.repo.local" value="${prevRepoLocal}" />
  +    <j:set var="maven.repo.remote" value="${prevRepoRemote}" />
     </goal>
   </project>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to