jvanzyl     2003/07/30 19:59:19

  Modified:    src/plugins-build/antlr plugin.jelly
  Log:
  o Add a path not a reference. The id reference is not really one anymore.
  
    New tags should be created for specifically adding the the compile source
    roots and the test compile sources roots and the AddPathTag should be
    deprecated.
  
  Revision  Changes    Path
  1.4       +4 -9      maven/src/plugins-build/antlr/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/antlr/plugin.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.jelly      31 Jul 2003 02:38:30 -0000      1.3
  +++ plugin.jelly      31 Jul 2003 02:59:19 -0000      1.4
  @@ -19,14 +19,10 @@
           description="Generate source from antlr grammars"
           prereqs="antlr:prepare-filesystem">
       <j:if test="${!antlrSrcDir.equals('MAVEN_ANTLR_SRC_DIR_NOT_SET')}">
  -<!--
  -      <ant:path id="maven.antlr.compile.src.set"
  -            location="${maven.build.dir}/antlr"/>-->
  -      <j:set var="pathToAdd">${maven.build.dir}/antlr</j:set>
  -      <j:set var="dummy">${pom.addCompileSourceRoot(pathToAdd)}</j:set>
  -<!--      <maven:addPath id="maven.compile.src.set"
  -                     refid="maven.antlr.compile.src.set"/>
  --->
  +
  +      <maven:addPath id="maven.compile.src.set"
  +                     path="${maven.build.dir}/antlr"/>
  +
         <util:tokenize var="grammars" delim=" ">
            ${maven.antlr.grammars}
         </util:tokenize>
  @@ -40,7 +36,6 @@
     </goal>
   
     <preGoal name="java:compile">
  -    <ant:echo>antlrSrcDir='${antlrSrcDir}'</ant:echo>
       <j:if test="${!antlrSrcDir.equals('MAVEN_ANTLR_SRC_DIR_NOT_SET')}">
         <attainGoal name="antlr:generate"/>
       </j:if>
  
  
  

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

Reply via email to