ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From umag...@apache.org
Subject cvs commit: jakarta-ant/src/script ant
Date Fri, 31 May 2002 20:41:48 GMT
umagesh     2002/05/31 13:41:48

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        AbstractCvsTask.java CVSPass.java
               src/script Tag: ANT_15_BRANCH ant
  Log:
  Make CVS Tasks work under CygWin
  
  Submitted by: John Morrison <john.r.morrison@ntlworld.com>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.27 +1 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.26
  retrieving revision 1.263.2.27
  diff -u -r1.263.2.26 -r1.263.2.27
  --- WHATSNEW	30 May 2002 15:20:31 -0000	1.263.2.26
  +++ WHATSNEW	31 May 2002 20:41:47 -0000	1.263.2.27
  @@ -16,6 +16,7 @@
   
   Fixed bugs:
   -----------
  +* Make CVS Tasks to work under Cygwin.
   
   * Fix LineContains to handle huge files elegantly without causing
   Stack Overflows.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.1  +8 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
  
  Index: AbstractCvsTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- AbstractCvsTask.java	25 Apr 2002 12:14:49 -0000	1.12
  +++ AbstractCvsTask.java	31 May 2002 20:41:48 -0000	1.12.2.1
  @@ -276,17 +276,16 @@
            * Need a better cross platform integration with <cvspass>, so
            * use the same filename.
            */
  -        /* But currently we cannot because 'cvs log' is not working
  -         * with a pass file.
  -        if(passFile == null){
  +        if(passFile == null) {
   
  -            File defaultPassFile = new File(System.getProperty("user.home") 
  +            File defaultPassFile = new File(
  +                System.getProperty("cygwin.user.home",
  +                    System.getProperty("user.home")) 
                   + File.separatorChar + ".cvspass");
   
               if(defaultPassFile.exists())
                   this.setPassfile(defaultPassFile);
           }
  -         */
   
           if (passFile != null) {
               Environment.Variable var = new Environment.Variable();
  @@ -313,6 +312,10 @@
           exe.setAntRun(project);
           if (dest == null) {
               dest = project.getBaseDir();
  +        }
  +
  +        if (!dest.exists()) {
  +            dest.mkdirs();
           }
   
           exe.setWorkingDirectory(dest);
  
  
  
  1.13.2.1  +5 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java
  
  Index: CVSPass.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/CVSPass.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- CVSPass.java	16 Apr 2002 07:15:18 -0000	1.13
  +++ CVSPass.java	31 May 2002 20:41:48 -0000	1.13.2.1
  @@ -72,7 +72,7 @@
    * Adds an new entry to a CVS password file
    *
    * @author <a href="jeff@custommonkey.org">Jeff Martin</a>
  - * @version $Revision: 1.13 $
  + * @version $Revision: 1.13.2.1 $
    *
    * @since Ant 1.4
    *
  @@ -110,7 +110,10 @@
        * Create a CVS task using the default cvspass file location.
        */
       public CVSPass(){
  -        passFile = new File(System.getProperty("user.home") + "/.cvspass");
  +        passFile = new File(
  +            System.getProperty("cygwin.user.home",
  +                System.getProperty("user.home"))
  +            + File.separatorChar + ".cvspass");
       }
   
       /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.19.2.2  +1 -0      jakarta-ant/src/script/ant
  
  Index: ant
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/script/ant,v
  retrieving revision 1.19.2.1
  retrieving revision 1.19.2.2
  diff -u -r1.19.2.1 -r1.19.2.2
  --- ant	3 May 2002 08:45:22 -0000	1.19.2.1
  +++ ant	31 May 2002 20:41:48 -0000	1.19.2.2
  @@ -175,6 +175,7 @@
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
     CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
     LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
  +  ANT_OPTS="$ANT_OPTS -Dcygwin.user.home="`cygpath --path --windows "$HOME"`
   fi
   
   "$JAVACMD" -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main
$ANT_ARGS "$@"
  
  
  

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


Mime
View raw message