donaldp 02/03/30 15:51:33
Modified: docs/manual/CoreTasks changelog.html
src/main/org/apache/tools/ant/taskdefs/cvslib
ChangeLogTask.java
Log:
Rename basedir to dir and make it default to basedir if not specified
Revision Changes Path
1.7 +2 -2 jakarta-ant/docs/manual/CoreTasks/changelog.html
Index: changelog.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/changelog.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changelog.html 29 Mar 2002 01:55:59 -0000 1.6
+++ changelog.html 30 Mar 2002 23:51:33 -0000 1.7
@@ -19,9 +19,9 @@
<td align="center" valign="top"><b>Required</b></td>
</tr>
<tr>
- <td valign="top">basedir</td>
+ <td valign="top">dir</td>
<td valign="top">the directory from which to run "cvs
log".</td>
- <td align="center" valign="top">Yes</td>
+ <td align="center" valign="top">No, will default to projects basedir</td>
</tr>
<tr>
<td valign="top">destfile</td>
1.4 +9 -10
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
Index: ChangeLogTask.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ChangeLogTask.java 30 Mar 2002 03:08:18 -0000 1.3
+++ ChangeLogTask.java 30 Mar 2002 23:51:33 -0000 1.4
@@ -100,7 +100,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jeff Martin</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Peter Donald</a>
- * @version $Revision: 1.3 $ $Date: 2002/03/30 03:08:18 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/30 23:51:33 $
* @ant.task name="changelog"
*/
public class ChangeLogTask
@@ -113,7 +113,7 @@
private Vector m_cvsUsers = new Vector();
/** Input dir */
- private File m_basedir;
+ private File m_dir;
/** Output file */
private File m_destfile;
@@ -138,9 +138,9 @@
/**
* Set the base dir for cvs.
*/
- public void setBasedir( final File basedir )
+ public void setDir( final File dir )
{
- m_basedir = basedir;
+ m_dir = dir;
}
/**
@@ -261,7 +261,7 @@
final RedirectingStreamHandler handler =
new RedirectingStreamHandler( parser );
final Execute exe = new Execute( handler );
- exe.setWorkingDirectory( m_basedir );
+ exe.setWorkingDirectory( m_dir );
exe.setCommandline( command.getCommandline() );
exe.setAntRun( getProject() );
try
@@ -290,19 +290,18 @@
private void validate()
throws BuildException
{
- if( null == m_basedir )
+ if( null == m_dir )
{
- final String message = "Basedir must be set.";
- throw new BuildException( message );
+ m_dir = getProject().getBaseDir();
}
if( null == m_destfile )
{
final String message = "Destfile must be set.";
throw new BuildException( message );
}
- if( !m_basedir.exists() )
+ if( !m_dir.exists() )
{
- final String message = "Cannot find base dir " +
m_basedir.getAbsolutePath();
+ final String message = "Cannot find base dir " +
m_dir.getAbsolutePath();
throw new BuildException( message );
}
if( null != m_usersFile && !m_usersFile.exists() )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
