ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant WHATSNEW
Date Wed, 28 Jan 2004 23:15:45 GMT
antoine     2004/01/28 15:15:45

  Modified:    src/main/org/apache/tools/ant/taskdefs/cvslib Tag:
                        ANT_16_BRANCH ChangeLogTask.java
               docs/manual/CoreTasks Tag: ANT_16_BRANCH changelog.html
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        AbstractCvsTask.java defaults.properties
               docs/manual Tag: ANT_16_BRANCH coretasklist.html
               .        Tag: ANT_16_BRANCH WHATSNEW
  Added:       src/main/org/apache/tools/ant/taskdefs/cvslib Tag:
                        ANT_16_BRANCH CvsVersion.java
               docs/manual/CoreTasks Tag: ANT_16_BRANCH cvsversion.html
  Log:
  Merge from HEAD
  addition of <cvsversion> task
  support of branches via the tag attribute in <cvschangelog>
  PR: 13510
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.25.2.1  +26 -28    ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
  
  Index: ChangeLogTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
  retrieving revision 1.25
  retrieving revision 1.25.2.1
  diff -u -r1.25 -r1.25.2.1
  --- ChangeLogTask.java	17 Sep 2003 20:11:43 -0000	1.25
  +++ ChangeLogTask.java	28 Jan 2004 23:15:44 -0000	1.25.2.1
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -68,8 +68,8 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.Execute;
  +import org.apache.tools.ant.taskdefs.AbstractCvsTask;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.FileSet;
   
  @@ -102,9 +102,9 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
    * @since Ant 1.5
  - * @ant.task name="cvschangelog"
  + * @ant.task name="cvschangelog" category="scm"
    */
  -public class ChangeLogTask extends Task {
  +public class ChangeLogTask extends AbstractCvsTask {
       /** User list */
       private File m_usersFile;
   
  @@ -226,7 +226,6 @@
           try {
   
               validate();
  -
               final Properties userList = new Properties();
   
               loadUserlist(userList);
  @@ -239,11 +238,22 @@
                   userList.put(user.getUserID(), user.getDisplayname());
               }
   
  -            final Commandline command = new Commandline();
   
  -            command.setExecutable("cvs");
  -            command.createArgument().setValue("log");
  +            setCommand("log");
   
  +            if (getTag() != null) {
  +                CvsVersion myCvsVersion = new CvsVersion();
  +                myCvsVersion.setProject(getProject());
  +                myCvsVersion.setTaskName("cvsversion");
  +                myCvsVersion.setCvsRoot(getCvsRoot());
  +                myCvsVersion.setCvsRsh(getCvsRsh());
  +                myCvsVersion.setPassfile(getPassFile());
  +                myCvsVersion.setDest(m_dir);
  +                myCvsVersion.execute();
  +                if (myCvsVersion.supportsCvsLogWithSOption()) {
  +                    addCommandArgument("-S");
  +                }
  +            }
               if (null != m_start) {
                   final SimpleDateFormat outputDate =
                       new SimpleDateFormat("yyyy-MM-dd");
  @@ -252,8 +262,8 @@
                   final String dateRange = ">=" + outputDate.format(m_start);
   
           // Supply '-d' as a separate argument - Bug# 14397
  -                command.createArgument().setValue("-d");
  -                command.createArgument().setValue(dateRange);
  +                addCommandArgument("-d");
  +                addCommandArgument(dateRange);
               }
   
               // Check if list of files to check has been specified
  @@ -267,7 +277,7 @@
                       final String[] files = scanner.getIncludedFiles();
   
                       for (int i = 0; i < files.length; i++) {
  -                        command.createArgument().setValue(files[i]);
  +                        addCommandArgument(files[i]);
                       }
                   }
               }
  @@ -276,23 +286,11 @@
               final RedirectingStreamHandler handler =
                   new RedirectingStreamHandler(parser);
   
  -            log(command.describeCommand(), Project.MSG_VERBOSE);
  -
  -            final Execute exe = new Execute(handler);
  -
  -            exe.setWorkingDirectory(m_dir);
  -            exe.setCommandline(command.getCommandline());
  -            exe.setAntRun(getProject());
  -            try {
  -                final int resultCode = exe.execute();
  -
  -                if (Execute.isFailure(resultCode)) {
  -                    throw new BuildException("Error running cvs log");
  -                }
  -            } catch (final IOException ioe) {
  -                throw new BuildException(ioe.toString());
  -            }
  +            log(getCommand(), Project.MSG_VERBOSE);
   
  +            setDest(m_dir);
  +            setExecuteStreamHandler(handler);
  +            super.execute();
               final String errors = handler.getErrors();
   
               if (null != errors) {
  
  
  
  No                   revision
  
  Index: ChangeLogTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
  retrieving revision 1.25
  retrieving revision 1.25.2.1
  diff -u -r1.25 -r1.25.2.1
  --- ChangeLogTask.java	17 Sep 2003 20:11:43 -0000	1.25
  +++ ChangeLogTask.java	28 Jan 2004 23:15:44 -0000	1.25.2.1
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -68,8 +68,8 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.Execute;
  +import org.apache.tools.ant.taskdefs.AbstractCvsTask;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.FileSet;
   
  @@ -102,9 +102,9 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
    * @since Ant 1.5
  - * @ant.task name="cvschangelog"
  + * @ant.task name="cvschangelog" category="scm"
    */
  -public class ChangeLogTask extends Task {
  +public class ChangeLogTask extends AbstractCvsTask {
       /** User list */
       private File m_usersFile;
   
  @@ -226,7 +226,6 @@
           try {
   
               validate();
  -
               final Properties userList = new Properties();
   
               loadUserlist(userList);
  @@ -239,11 +238,22 @@
                   userList.put(user.getUserID(), user.getDisplayname());
               }
   
  -            final Commandline command = new Commandline();
   
  -            command.setExecutable("cvs");
  -            command.createArgument().setValue("log");
  +            setCommand("log");
   
  +            if (getTag() != null) {
  +                CvsVersion myCvsVersion = new CvsVersion();
  +                myCvsVersion.setProject(getProject());
  +                myCvsVersion.setTaskName("cvsversion");
  +                myCvsVersion.setCvsRoot(getCvsRoot());
  +                myCvsVersion.setCvsRsh(getCvsRsh());
  +                myCvsVersion.setPassfile(getPassFile());
  +                myCvsVersion.setDest(m_dir);
  +                myCvsVersion.execute();
  +                if (myCvsVersion.supportsCvsLogWithSOption()) {
  +                    addCommandArgument("-S");
  +                }
  +            }
               if (null != m_start) {
                   final SimpleDateFormat outputDate =
                       new SimpleDateFormat("yyyy-MM-dd");
  @@ -252,8 +262,8 @@
                   final String dateRange = ">=" + outputDate.format(m_start);
   
           // Supply '-d' as a separate argument - Bug# 14397
  -                command.createArgument().setValue("-d");
  -                command.createArgument().setValue(dateRange);
  +                addCommandArgument("-d");
  +                addCommandArgument(dateRange);
               }
   
               // Check if list of files to check has been specified
  @@ -267,7 +277,7 @@
                       final String[] files = scanner.getIncludedFiles();
   
                       for (int i = 0; i < files.length; i++) {
  -                        command.createArgument().setValue(files[i]);
  +                        addCommandArgument(files[i]);
                       }
                   }
               }
  @@ -276,23 +286,11 @@
               final RedirectingStreamHandler handler =
                   new RedirectingStreamHandler(parser);
   
  -            log(command.describeCommand(), Project.MSG_VERBOSE);
  -
  -            final Execute exe = new Execute(handler);
  -
  -            exe.setWorkingDirectory(m_dir);
  -            exe.setCommandline(command.getCommandline());
  -            exe.setAntRun(getProject());
  -            try {
  -                final int resultCode = exe.execute();
  -
  -                if (Execute.isFailure(resultCode)) {
  -                    throw new BuildException("Error running cvs log");
  -                }
  -            } catch (final IOException ioe) {
  -                throw new BuildException(ioe.toString());
  -            }
  +            log(getCommand(), Project.MSG_VERBOSE);
   
  +            setDest(m_dir);
  +            setExecuteStreamHandler(handler);
  +            super.execute();
               final String errors = handler.getErrors();
   
               if (null != errors) {
  
  
  
  No                   revision
  
  Index: ChangeLogTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
  retrieving revision 1.25
  retrieving revision 1.25.2.1
  diff -u -r1.25 -r1.25.2.1
  --- ChangeLogTask.java	17 Sep 2003 20:11:43 -0000	1.25
  +++ ChangeLogTask.java	28 Jan 2004 23:15:44 -0000	1.25.2.1
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -68,8 +68,8 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.DirectoryScanner;
   import org.apache.tools.ant.Project;
  -import org.apache.tools.ant.Task;
   import org.apache.tools.ant.taskdefs.Execute;
  +import org.apache.tools.ant.taskdefs.AbstractCvsTask;
   import org.apache.tools.ant.types.Commandline;
   import org.apache.tools.ant.types.FileSet;
   
  @@ -102,9 +102,9 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
    * @since Ant 1.5
  - * @ant.task name="cvschangelog"
  + * @ant.task name="cvschangelog" category="scm"
    */
  -public class ChangeLogTask extends Task {
  +public class ChangeLogTask extends AbstractCvsTask {
       /** User list */
       private File m_usersFile;
   
  @@ -226,7 +226,6 @@
           try {
   
               validate();
  -
               final Properties userList = new Properties();
   
               loadUserlist(userList);
  @@ -239,11 +238,22 @@
                   userList.put(user.getUserID(), user.getDisplayname());
               }
   
  -            final Commandline command = new Commandline();
   
  -            command.setExecutable("cvs");
  -            command.createArgument().setValue("log");
  +            setCommand("log");
   
  +            if (getTag() != null) {
  +                CvsVersion myCvsVersion = new CvsVersion();
  +                myCvsVersion.setProject(getProject());
  +                myCvsVersion.setTaskName("cvsversion");
  +                myCvsVersion.setCvsRoot(getCvsRoot());
  +                myCvsVersion.setCvsRsh(getCvsRsh());
  +                myCvsVersion.setPassfile(getPassFile());
  +                myCvsVersion.setDest(m_dir);
  +                myCvsVersion.execute();
  +                if (myCvsVersion.supportsCvsLogWithSOption()) {
  +                    addCommandArgument("-S");
  +                }
  +            }
               if (null != m_start) {
                   final SimpleDateFormat outputDate =
                       new SimpleDateFormat("yyyy-MM-dd");
  @@ -252,8 +262,8 @@
                   final String dateRange = ">=" + outputDate.format(m_start);
   
           // Supply '-d' as a separate argument - Bug# 14397
  -                command.createArgument().setValue("-d");
  -                command.createArgument().setValue(dateRange);
  +                addCommandArgument("-d");
  +                addCommandArgument(dateRange);
               }
   
               // Check if list of files to check has been specified
  @@ -267,7 +277,7 @@
                       final String[] files = scanner.getIncludedFiles();
   
                       for (int i = 0; i < files.length; i++) {
  -                        command.createArgument().setValue(files[i]);
  +                        addCommandArgument(files[i]);
                       }
                   }
               }
  @@ -276,23 +286,11 @@
               final RedirectingStreamHandler handler =
                   new RedirectingStreamHandler(parser);
   
  -            log(command.describeCommand(), Project.MSG_VERBOSE);
  -
  -            final Execute exe = new Execute(handler);
  -
  -            exe.setWorkingDirectory(m_dir);
  -            exe.setCommandline(command.getCommandline());
  -            exe.setAntRun(getProject());
  -            try {
  -                final int resultCode = exe.execute();
  -
  -                if (Execute.isFailure(resultCode)) {
  -                    throw new BuildException("Error running cvs log");
  -                }
  -            } catch (final IOException ioe) {
  -                throw new BuildException(ioe.toString());
  -            }
  +            log(getCommand(), Project.MSG_VERBOSE);
   
  +            setDest(m_dir);
  +            setExecuteStreamHandler(handler);
  +            super.execute();
               final String errors = handler.getErrors();
   
               if (null != errors) {
  
  
  
  1.2.2.1   +0 -0      ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java
  
  Index: CvsVersion.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/cvslib/CvsVersion.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  
  
  
  No                   revision
  No                   revision
  1.13.2.2  +49 -1     ant/docs/manual/CoreTasks/changelog.html
  
  Index: changelog.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/changelog.html,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -r1.13.2.1 -r1.13.2.2
  --- changelog.html	9 Oct 2003 21:01:06 -0000	1.13.2.1
  +++ changelog.html	28 Jan 2004 23:15:44 -0000	1.13.2.2
  @@ -23,6 +23,49 @@
       <td align="center" valign="top"><b>Required</b></td>
     </tr>
     <tr>
  +    <td colspan="3">Attributes from parent Cvs task which are meaningful here<br/>
  +    Since ant 1.6.1</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">cvsRoot</td>
  +    <td valign="top">the <code>CVSROOT</code> variable.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">cvsRsh</td>
  +    <td valign="top">the <code>CVS_RSH</code> variable.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">package</td>
  +    <td valign="top">the package/module to check out.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">port</td>
  +    <td valign="top">Port used by CVS to communicate with the server.</td>
  +    <td align="center" valign="top">No, default port 2401.</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">passfile</td>
  +    <td valign="top">Password file to read passwords from.</td>
  +    <td align="center" valign="top">No, default file ~/.cvspass.</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">failonerror</td>
  +    <td valign="top">Stop the build process if the command exits with a
  +      return code other than <code>0</code>. Defaults to false</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">tag</td>
  +    <td valign="top">query the changelog for a specific branch.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td colspan="3">Specific attributes</td>
  +  </tr>
  +  <tr>
       <td valign="top">dir</td>
       <td valign="top">The directory from which to run the CVS <em>log</em>
        command.</td>
  @@ -139,6 +182,11 @@
   anytime it encounters a change made by the user ID &quot;donaldp&quot;.
   It writes these changes into the file <code>changelog.xml</code>.</p>
   
  +<p>Generates a change log report on the <code>ANT_16_BRANCH</code>.</p>
  +<pre>
  + &lt;cvschangelog dir=&quot;c:/dev/asf/ant.head&quot; passfile=&quot;c:/home/myself/.cvspass&quot;
  +                destfile=&quot;changelogant.xml&quot; tag=&quot;ANT_16_BRANCH&quot;
/&gt;
  +</pre>
   <h4>Generate Report</h4>
   <p>Ant includes a basic XSLT stylesheet that you can use to generate 
   a HTML report based on the xml output. The following example illustrates
  @@ -173,7 +221,7 @@
   &lt;/changelog&gt;
   </pre>
   
  -<hr><p align="center">Copyright &copy; 2002-2003 Apache Software Foundation.
All rights
  +<hr><p align="center">Copyright &copy; 2002-2004 Apache Software Foundation.
All rights
   Reserved.</p>
   
   </body>
  
  
  
  No                   revision
  
  Index: changelog.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/changelog.html,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -r1.13.2.1 -r1.13.2.2
  --- changelog.html	9 Oct 2003 21:01:06 -0000	1.13.2.1
  +++ changelog.html	28 Jan 2004 23:15:44 -0000	1.13.2.2
  @@ -23,6 +23,49 @@
       <td align="center" valign="top"><b>Required</b></td>
     </tr>
     <tr>
  +    <td colspan="3">Attributes from parent Cvs task which are meaningful here<br/>
  +    Since ant 1.6.1</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">cvsRoot</td>
  +    <td valign="top">the <code>CVSROOT</code> variable.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">cvsRsh</td>
  +    <td valign="top">the <code>CVS_RSH</code> variable.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">package</td>
  +    <td valign="top">the package/module to check out.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">port</td>
  +    <td valign="top">Port used by CVS to communicate with the server.</td>
  +    <td align="center" valign="top">No, default port 2401.</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">passfile</td>
  +    <td valign="top">Password file to read passwords from.</td>
  +    <td align="center" valign="top">No, default file ~/.cvspass.</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">failonerror</td>
  +    <td valign="top">Stop the build process if the command exits with a
  +      return code other than <code>0</code>. Defaults to false</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">tag</td>
  +    <td valign="top">query the changelog for a specific branch.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td colspan="3">Specific attributes</td>
  +  </tr>
  +  <tr>
       <td valign="top">dir</td>
       <td valign="top">The directory from which to run the CVS <em>log</em>
        command.</td>
  @@ -139,6 +182,11 @@
   anytime it encounters a change made by the user ID &quot;donaldp&quot;.
   It writes these changes into the file <code>changelog.xml</code>.</p>
   
  +<p>Generates a change log report on the <code>ANT_16_BRANCH</code>.</p>
  +<pre>
  + &lt;cvschangelog dir=&quot;c:/dev/asf/ant.head&quot; passfile=&quot;c:/home/myself/.cvspass&quot;
  +                destfile=&quot;changelogant.xml&quot; tag=&quot;ANT_16_BRANCH&quot;
/&gt;
  +</pre>
   <h4>Generate Report</h4>
   <p>Ant includes a basic XSLT stylesheet that you can use to generate 
   a HTML report based on the xml output. The following example illustrates
  @@ -173,7 +221,7 @@
   &lt;/changelog&gt;
   </pre>
   
  -<hr><p align="center">Copyright &copy; 2002-2003 Apache Software Foundation.
All rights
  +<hr><p align="center">Copyright &copy; 2002-2004 Apache Software Foundation.
All rights
   Reserved.</p>
   
   </body>
  
  
  
  No                   revision
  
  Index: changelog.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/changelog.html,v
  retrieving revision 1.13.2.1
  retrieving revision 1.13.2.2
  diff -u -r1.13.2.1 -r1.13.2.2
  --- changelog.html	9 Oct 2003 21:01:06 -0000	1.13.2.1
  +++ changelog.html	28 Jan 2004 23:15:44 -0000	1.13.2.2
  @@ -23,6 +23,49 @@
       <td align="center" valign="top"><b>Required</b></td>
     </tr>
     <tr>
  +    <td colspan="3">Attributes from parent Cvs task which are meaningful here<br/>
  +    Since ant 1.6.1</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">cvsRoot</td>
  +    <td valign="top">the <code>CVSROOT</code> variable.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">cvsRsh</td>
  +    <td valign="top">the <code>CVS_RSH</code> variable.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">package</td>
  +    <td valign="top">the package/module to check out.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">port</td>
  +    <td valign="top">Port used by CVS to communicate with the server.</td>
  +    <td align="center" valign="top">No, default port 2401.</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">passfile</td>
  +    <td valign="top">Password file to read passwords from.</td>
  +    <td align="center" valign="top">No, default file ~/.cvspass.</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">failonerror</td>
  +    <td valign="top">Stop the build process if the command exits with a
  +      return code other than <code>0</code>. Defaults to false</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td valign="top">tag</td>
  +    <td valign="top">query the changelog for a specific branch.</td>
  +    <td align="center" valign="top">No</td>
  +  </tr>
  +  <tr>
  +    <td colspan="3">Specific attributes</td>
  +  </tr>
  +  <tr>
       <td valign="top">dir</td>
       <td valign="top">The directory from which to run the CVS <em>log</em>
        command.</td>
  @@ -139,6 +182,11 @@
   anytime it encounters a change made by the user ID &quot;donaldp&quot;.
   It writes these changes into the file <code>changelog.xml</code>.</p>
   
  +<p>Generates a change log report on the <code>ANT_16_BRANCH</code>.</p>
  +<pre>
  + &lt;cvschangelog dir=&quot;c:/dev/asf/ant.head&quot; passfile=&quot;c:/home/myself/.cvspass&quot;
  +                destfile=&quot;changelogant.xml&quot; tag=&quot;ANT_16_BRANCH&quot;
/&gt;
  +</pre>
   <h4>Generate Report</h4>
   <p>Ant includes a basic XSLT stylesheet that you can use to generate 
   a HTML report based on the xml output. The following example illustrates
  @@ -173,7 +221,7 @@
   &lt;/changelog&gt;
   </pre>
   
  -<hr><p align="center">Copyright &copy; 2002-2003 Apache Software Foundation.
All rights
  +<hr><p align="center">Copyright &copy; 2002-2004 Apache Software Foundation.
All rights
   Reserved.</p>
   
   </body>
  
  
  
  1.1.2.1   +0 -0      ant/docs/manual/CoreTasks/cvsversion.html
  
  Index: cvsversion.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/cvsversion.html,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  No                   revision
  No                   revision
  1.26.2.2  +15 -4     ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
  
  Index: AbstractCvsTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
  retrieving revision 1.26.2.1
  retrieving revision 1.26.2.2
  diff -u -r1.26.2.1 -r1.26.2.2
  --- AbstractCvsTask.java	22 Sep 2003 15:42:37 -0000	1.26.2.1
  +++ AbstractCvsTask.java	28 Jan 2004 23:15:45 -0000	1.26.2.2
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2004 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -111,7 +111,10 @@
        * the package/module to check out.
        */
       private String cvsPackage;
  -
  +    /**
  +     * the tag
  +     */
  +    private String tag;
       /**
        * the default command.
        */
  @@ -609,6 +612,14 @@
   
           return this.cvsPackage;
       }
  +    /**
  +     * tag or branch
  +     * @return tag or branch
  +     * @since ant 1.6.1
  +     */
  +    public String getTag() {
  +        return tag;
  +    }
   
       /**
        * The tag of the package/module to operate upon.
  @@ -617,8 +628,8 @@
       public void setTag(String p) {
           // Check if not real tag => set it to null
           if (p != null && p.trim().length() > 0) {
  -            addCommandArgument("-r");
  -            addCommandArgument(p);
  +            tag = p;
  +            addCommandArgument("-r" + p);
           }
       }
   
  
  
  
  1.153.2.3 +1 -0      ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties
  
  Index: defaults.properties
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/defaults.properties,v
  retrieving revision 1.153.2.2
  retrieving revision 1.153.2.3
  diff -u -r1.153.2.2 -r1.153.2.3
  --- defaults.properties	22 Jan 2004 09:22:31 -0000	1.153.2.2
  +++ defaults.properties	28 Jan 2004 23:15:45 -0000	1.153.2.3
  @@ -66,6 +66,7 @@
   basename=org.apache.tools.ant.taskdefs.Basename
   dirname=org.apache.tools.ant.taskdefs.Dirname
   cvschangelog=org.apache.tools.ant.taskdefs.cvslib.ChangeLogTask
  +cvsversion=org.apache.tools.ant.tasksdefs.cvslib.CvsVersion
   buildnumber=org.apache.tools.ant.taskdefs.BuildNumber
   concat=org.apache.tools.ant.taskdefs.Concat
   cvstagdiff=org.apache.tools.ant.taskdefs.cvslib.CvsTagDiff
  
  
  
  No                   revision
  No                   revision
  1.50.2.3  +1 -0      ant/docs/manual/coretasklist.html
  
  Index: coretasklist.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/coretasklist.html,v
  retrieving revision 1.50.2.2
  retrieving revision 1.50.2.3
  diff -u -r1.50.2.2 -r1.50.2.3
  --- coretasklist.html	12 Dec 2003 21:40:21 -0000	1.50.2.2
  +++ coretasklist.html	28 Jan 2004 23:15:45 -0000	1.50.2.3
  @@ -35,6 +35,7 @@
   <a href="CoreTasks/copyfile.html"><i>Copyfile</i></a><br>
   <a href="CoreTasks/cvs.html">Cvs</a><br>
   <a href="CoreTasks/changelog.html">CvsChangeLog</a><br>
  +<a href="CoreTasks/cvsversion.html">CvsVersion</a><br>
   <a href="CoreTasks/cvspass.html">CVSPass</a><br>
   <a href="CoreTasks/cvstagdiff.html">CvsTagDiff</a><br>
   <a href="CoreTasks/defaultexcludes.html">Defaultexcludes</a><br>
  
  
  
  No                   revision
  No                   revision
  1.503.2.31 +5 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.30
  retrieving revision 1.503.2.31
  diff -u -r1.503.2.30 -r1.503.2.31
  --- WHATSNEW	28 Jan 2004 10:33:04 -0000	1.503.2.30
  +++ WHATSNEW	28 Jan 2004 23:15:45 -0000	1.503.2.31
  @@ -48,6 +48,11 @@
     detected by Ant and treated just like Java 1.4.  You can now specify
     source="1.5" in the <javac> task.
   
  +* created new task <cvsversion>
  +
  +* added support for branch logging via the tag attribute in <cvschangelog>
  +  Bugzilla Report 13510.
  +
   Changes from Ant 1.6.B3 to Ant 1.6.0
   ====================================
   
  
  
  

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


Mime
View raw message