bwalding    2003/09/02 19:20:53

  Modified:    src/plugins-build/antlr/xdocs changes.xml properties.xml
               src/plugins-build/antlr plugin.jelly plugin.properties
  Log:
  Allow antlr plugin users to generate files to a location other than 
${maven.build.dir}/antlr
  
  Revision  Changes    Path
  1.4       +3 -0      maven/src/plugins-build/antlr/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/antlr/xdocs/changes.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- changes.xml       25 Jul 2003 03:04:32 -0000      1.3
  +++ changes.xml       3 Sep 2003 02:20:52 -0000       1.4
  @@ -19,6 +19,9 @@
         <action dev="dion" type="add">
           Added documentation for navigation, changes, properties and goals
         </action>
  +      <action dev="bwalding" type="update">
  +        Can now use maven.antlr.target.dir to set where generated files are placed. 
Defaults to ${maven.build.dir}/antlr
  +      </action>
       </release>
   
       <release version="1.0" date="2002-07-16">
  
  
  
  1.2       +7 -1      maven/src/plugins-build/antlr/xdocs/properties.xml
  
  Index: properties.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/antlr/xdocs/properties.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- properties.xml    24 Jan 2003 03:44:36 -0000      1.1
  +++ properties.xml    3 Sep 2003 02:20:53 -0000       1.2
  @@ -26,7 +26,13 @@
             <td>No</td>
             <td>
               Must be set to allow antlr processing to happen.
  -            <strong>FIXME: It appears this property isn't used?</strong>
  +          </td>
  +        </tr>
  +        <tr>
  +          <td>maven.antlr.target.dir</td>
  +          <td>Yes - defaults to ${maven.build.dir}/antlr</td>
  +          <td>
  +            Defines where antlr will process .g files to.
             </td>
           </tr>
         </table>
  
  
  
  1.6       +3 -3      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- plugin.jelly      19 Aug 2003 04:45:08 -0000      1.5
  +++ plugin.jelly      3 Sep 2003 02:20:53 -0000       1.6
  @@ -11,7 +11,7 @@
     <goal name="antlr:prepare-filesystem"
           description="Make any necessary directories for antlr processing">
       <j:if test="${!antlrSrcDir.equals('MAVEN_ANTLR_SRC_DIR_NOT_SET')}">
  -      <ant:mkdir dir="${maven.build.dir}/antlr"/>
  +      <ant:mkdir dir="${maven.antlr.target.dir}"/>
       </j:if>
     </goal>
   
  @@ -21,7 +21,7 @@
       <j:if test="${!antlrSrcDir.equals('MAVEN_ANTLR_SRC_DIR_NOT_SET')}">
   
         <ant:path id="maven.antlr.compile.src.set"
  -            location="${maven.build.dir}/antlr"/>
  +            location="${maven.antlr.target.dir}"/>
   
         <maven:addPath id="maven.compile.src.set"
                        refid="maven.antlr.compile.src.set"/>
  @@ -30,7 +30,7 @@
            ${maven.antlr.grammars}
         </util:tokenize>
   
  -      <antlr:antlr outputDir="${maven.build.dir}/antlr">
  +      <antlr:antlr outputDir="${maven.antlr.target.dir}">
           <j:forEach var="grammar" items="${grammars.iterator()}">
             <antlr:grammar>${grammar}</antlr:grammar>
           </j:forEach>
  
  
  
  1.2       +1 -0      maven/src/plugins-build/antlr/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/antlr/plugin.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.properties 24 Jan 2003 03:44:36 -0000      1.1
  +++ plugin.properties 3 Sep 2003 02:20:53 -0000       1.2
  @@ -1 +1,2 @@
   maven.antlr.src.dir=MAVEN_ANTLR_SRC_DIR_NOT_SET
  +maven.antlr.target.dir=${maven.build.dir}/antlr
  
  
  

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

Reply via email to