ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii DefaultNative2Ascii.java
Date Wed, 02 Feb 2005 13:46:08 GMT
bodewig     2005/02/02 05:46:08

  Modified:    .        WHATSNEW
               docs/manual/OptionalTasks native2ascii.html
               src/main/org/apache/tools/ant/taskdefs/optional
                        Native2Ascii.java
               src/main/org/apache/tools/ant/taskdefs/optional/native2ascii
                        DefaultNative2Ascii.java
  Log:
  Make native2ascii a full-blown facade task, add docs
  
  Revision  Changes    Path
  1.736     +2 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.735
  retrieving revision 1.736
  diff -u -r1.735 -r1.736
  --- WHATSNEW	28 Jan 2005 23:18:32 -0000	1.735
  +++ WHATSNEW	2 Feb 2005 13:46:08 -0000	1.736
  @@ -198,6 +198,8 @@
   
   * Added length task to get strings' and files' lengths.
   
  +* <natice2ascii> now also supports Kaffe's version.
  +
   Fixed bugs:
   -----------
   
  
  
  
  1.11      +61 -2     ant/docs/manual/OptionalTasks/native2ascii.html
  
  Index: native2ascii.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/native2ascii.html,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- native2ascii.html	19 Nov 2004 09:07:11 -0000	1.10
  +++ native2ascii.html	2 Feb 2005 13:46:08 -0000	1.11
  @@ -40,6 +40,15 @@
         and <code>&lt;patternset&gt;</code> elements.
       </p>
   
  +    <p>It is possible to use different converters. This can be selected
  +      with the <code>implementation</code> attribute.
  +      <a name="implementationvalues">Here are the choices</a>:</p>
  +    <ul>
  +      <li>default - the default converter (kaffe or sun) for the platform.</li>
  +      <li>sun (the standard converter of the JDK)</li>
  +      <li>kaffe (the standard converter of <a href="http://www.kaffe.org" target="_top">Kaffe</a>)</li>
  +    </ul>
  +
       <table border="1" cellpadding="2" cellspacing="0">
         <tr>
           <td><b>Attribute</b></td>
  @@ -49,7 +58,8 @@
         <tr>
           <td>reverse</td>
           <td>Reverse the sense of the conversion,
  -          i.e. convert from ASCII to native</td>
  +          i.e. convert from ASCII to native <b>only supported by the
  +            sun converter</b></td>
           <td align="center">No</td>
         </tr>
         <tr>
  @@ -105,8 +115,57 @@
             taken to be an exclude pattern</td>
           <td align="center">No</td>
         </tr>
  +      <tr>
  +        <td valign="top">implementation</td>
  +        <td valign="top">The converter implementation to use.
  +          If this attribute is not set, the default converter for the
  +          current VM will be used.  (See the above <a
  +          href="#implementationvalues">list</a> of valid converters.)</td>
  +        <td align="center" valign="top">No</td>
  +      </tr>
       </table>
   
  +<h3>Parameters specified as nested elements</h3>
  +
  +<h4>arg</h4>
  +
  +<p>You can specify additional command line arguments for the converter
  +with nested <code>&lt;arg&gt;</code> elements.  These elements are
  +specified like <a href="../using.html#arg">Command-line Arguments</a>
  +but have an additional attribute that can be used to enable arguments
  +only if a given converter implementation will be used.</p>
  +
  +<table border="1" cellpadding="2" cellspacing="0">
  +<tr>
  +  <td width="12%" valign="top"><b>Attribute</b></td>
  +  <td width="78%" valign="top"><b>Description</b></td>
  +  <td width="10%" valign="top"><b>Required</b></td>
  +</tr>
  +  <tr>
  +    <td valign="top">value</td>
  +    <td align="center" rowspan="4">See
  +    <a href="../using.html#arg">Command-line Arguments</a>.</td>
  +    <td align="center" rowspan="4">Exactly one of these.</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">line</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">file</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">path</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">implementation</td>
  +    <td>Only pass the specified argument if the chosen converter
  +    implementation matches the value of this attribute.  Legal values
  +    are the same as those in the above <a
  +    href="#implementationvalues">list</a> of valid compilers.)</td>
  +    <td align="center">No</td>
  +  </tr>
  +</table>
  +
       <h3>Examples</h3>
   
       <pre>
  @@ -133,6 +192,6 @@
       </p>
     </body>
   <hr>
  -<p align="center">Copyright &copy; 2000-2002,2004 The Apache Software Foundation.
All rights
  +<p align="center">Copyright &copy; 2000-2002,2004-2005 The Apache Software Foundation.
All rights
   Reserved.</p>
   </html>
  
  
  
  1.24      +44 -1     ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java
  
  Index: Native2Ascii.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/Native2Ascii.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Native2Ascii.java	31 Jan 2005 11:48:25 -0000	1.23
  +++ Native2Ascii.java	2 Feb 2005 13:46:08 -0000	1.24
  @@ -29,6 +29,8 @@
   import org.apache.tools.ant.util.FileNameMapper;
   import org.apache.tools.ant.util.IdentityMapper;
   import org.apache.tools.ant.util.SourceFileScanner;
  +import org.apache.tools.ant.util.facade.FacadeTaskHelper;
  +import org.apache.tools.ant.util.facade.ImplementationSpecificArgument;
   
   /**
    * Converts files from native encodings to ASCII.
  @@ -44,6 +46,11 @@
       private String extension = null;  // Extension of output files if different
   
       private Mapper mapper;
  +    private FacadeTaskHelper facade = null;
  +
  +    public Native2Ascii() {
  +        facade = new FacadeTaskHelper(Native2AsciiAdapterFactory.getDefault());
  +    }
   
       /**
        * Flag the conversion to run in the reverse sense,
  @@ -115,6 +122,19 @@
       }
   
       /**
  +     * Choose the implementation for this particular task.
  +     * @param compiler the name of the compiler
  +     * @since Ant 1.6.3
  +     */
  +    public void setImplementation(String impl) {
  +        if ("default".equals(impl)) {
  +            facade.setImplementation(Native2AsciiAdapterFactory.getDefault());
  +        } else {
  +            facade.setImplementation(impl);
  +        }        
  +    }
  +
  +    /**
        * Defines the FileNameMapper to use (nested mapper element).
        *
        * @return the mapper to use for file name translations.
  @@ -139,6 +159,18 @@
           createMapper().add(fileNameMapper);
       }
   
  +    /**
  +     * Adds an implementation specific command-line argument.
  +     * @return a ImplementationSpecificArgument to be configured
  +     *
  +     * @since Ant 1.6.3
  +     */
  +    public ImplementationSpecificArgument createArg() {
  +        ImplementationSpecificArgument arg =
  +            new ImplementationSpecificArgument();
  +        facade.addImplementationArgument(arg);
  +        return arg;
  +    }
   
       /**
        * Execute the task
  @@ -230,12 +262,23 @@
   
           log("converting " + srcName, Project.MSG_VERBOSE);
           Native2AsciiAdapter ad = 
  -            Native2AsciiAdapterFactory.getAdapter(null, this);
  +            Native2AsciiAdapterFactory.getAdapter(facade.getImplementation(),
  +                                                  this);
           if (!ad.convert(this, srcFile, destFile)) {
               throw new BuildException("conversion failed");
           }
       }
   
  +    /**
  +     * Returns the (implementation specific) settings given as nested
  +     * arg elements.
  +     *
  +     * @since Ant 1.6.3
  +     */
  +    public String[] getCurrentArgs() {
  +        return facade.getArgs();
  +    }
  +
       private class ExtMapper implements FileNameMapper {
   
           public void setFrom(String s) {
  
  
  
  1.3       +3 -1      ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java
  
  Index: DefaultNative2Ascii.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/native2ascii/DefaultNative2Ascii.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultNative2Ascii.java	31 Jan 2005 11:54:41 -0000	1.2
  +++ DefaultNative2Ascii.java	2 Feb 2005 13:46:08 -0000	1.3
  @@ -50,7 +50,8 @@
       /**
        * Sets up the initial command line.
        *
  -     * <p>only the -encoding argument gets handled here.</p>
  +     * <p>only the -encoding argument and nested arg elements get
  +     * handled here.</p>
        *
        * @param cmd Command line to add to
        * @param args provides the user-setting and access to Ant's
  @@ -62,6 +63,7 @@
               cmd.createArgument().setValue("-encoding");
               cmd.createArgument().setValue(args.getEncoding());
           }
  +        cmd.addArguments(args.getCurrentArgs());
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message