dion        2003/07/30 19:38:30

  Modified:    src/plugins-build/antlr plugin.jelly
  Log:
  Fix for the fact that maven.compile.src.set is no longer available
  
  Revision  Changes    Path
  1.3       +7 -5      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly      26 Mar 2003 12:32:49 -0000      1.2
  +++ plugin.jelly      31 Jul 2003 02:38:30 -0000      1.3
  @@ -19,13 +19,14 @@
           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"/>
  -
  -      <maven:addPath id="maven.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"/>
  -
  +-->
         <util:tokenize var="grammars" delim=" ">
            ${maven.antlr.grammars}
         </util:tokenize>
  @@ -39,6 +40,7 @@
     </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