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/windows Attrib.java
Date Fri, 23 May 2003 13:40:38 GMT
bodewig     2003/05/23 06:40:37

  Modified:    .        WHATSNEW
               docs/manual/CoreTasks chmod.html conditions.html
               docs/manual/OptionalTasks attrib.html
               src/main/org/apache/tools/ant/taskdefs Chmod.java
                        Execute.java
               src/main/org/apache/tools/ant/taskdefs/optional/unix
                        AbstractAccessTask.java
               src/main/org/apache/tools/ant/taskdefs/optional/windows
                        Attrib.java
  Log:
  NonStop Kernel is Unix as far as Ant is concerned.
  
  <attrib> doesn't like to be called with parallel.
  
  <chgrp> and <chown> should also disable the addsourcefile attribute.
  
  Revision  Changes    Path
  1.423     +1 -1      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.422
  retrieving revision 1.423
  diff -u -r1.422 -r1.423
  --- WHATSNEW	19 May 2003 15:37:31 -0000	1.422
  +++ WHATSNEW	23 May 2003 13:40:34 -0000	1.423
  @@ -246,7 +246,7 @@
   
   * New filterreader <escapeunicode/>.
   
  -* Support for HP's NonStop (Tandem) OS has been added.
  +* Support for HP's NonStop Kernel (Tandem) OS has been added.
   
   * <cab>'s basedir attribute is now optional if you specify nested
     filesets.  Bugzilla Report 18046.
  
  
  
  1.13      +1 -1      ant/docs/manual/CoreTasks/chmod.html
  
  Index: chmod.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/chmod.html,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- chmod.html	21 May 2003 08:55:35 -0000	1.12
  +++ chmod.html	23 May 2003 13:40:36 -0000	1.13
  @@ -10,7 +10,7 @@
   <h2><a name="chmod">Chmod</a></h2>
   <h3>Description</h3>
   <p>Changes the permissions of a file or all files inside specified
  -directories. Right now it has effect only under Unix or NonStop (Tandem).
  +directories. Right now it has effect only under Unix or NonStop Kernel (Tandem).
   The permissions are also UNIX style, like the argument for the chmod command.</p>
   <p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory
based
   tasks</a>, on how the inclusion/exclusion of files works, and how to
  
  
  
  1.18      +1 -1      ant/docs/manual/CoreTasks/conditions.html
  
  Index: conditions.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/conditions.html,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- conditions.html	14 Mar 2003 16:01:03 -0000	1.17
  +++ conditions.html	23 May 2003 13:40:36 -0000	1.18
  @@ -92,7 +92,7 @@
     <li>unix (for all Unix and Unix-like operating systems)</li>
     <li>netware (for Novell NetWare)</li>
     <li>os/2 (for OS/2)</li>
  -  <li>tandem (for HP's NonStop - formerly Tandem)</li>
  +  <li>tandem (for HP's NonStop Kernel - formerly Tandem)</li>
     <li>win9x for Microsoft Windows 95 and 98</li>
     <li>z/os for z/OS and OS/390</li>
     <li>os/400 for OS/400</li>
  
  
  
  1.4       +0 -8      ant/docs/manual/OptionalTasks/attrib.html
  
  Index: attrib.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/OptionalTasks/attrib.html,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- attrib.html	21 May 2003 08:55:35 -0000	1.3
  +++ attrib.html	23 May 2003 13:40:36 -0000	1.4
  @@ -60,14 +60,6 @@
       <td align="center" valign="top">No, default is <i>file</i></td>
     </tr>
     <tr>
  -    <td valign="top">maxparallel</td>
  -    <td valign="top">Limit the amount of parallelism by passing at
  -      most this many sourcefiles at once.  Set it to &lt;= 0 for
  -      unlimited.  Defaults to unlimited.</td>
  -    <td align="center" valign="top">No</td>
  -
  -  </tr>
  -  <tr>
       <td valign="top">verbose</td>
       <td valign="top">Whether to print a summary after execution or not.
         Defaults to <code>false</code>.</td>
  
  
  
  1.38      +1 -2      ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java
  
  Index: Chmod.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Chmod.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- Chmod.java	19 May 2003 12:18:08 -0000	1.37
  +++ Chmod.java	23 May 2003 13:40:37 -0000	1.38
  @@ -263,7 +263,6 @@
       }
   
       protected boolean isValidOs() {
  -        return (Os.isFamily("unix") || Os.isFamily("tandem")) 
  -            && super.isValidOs();
  +        return Os.isFamily("unix") && super.isValidOs();
       }
   }
  
  
  
  1.55      +2 -3      ant/src/main/org/apache/tools/ant/taskdefs/Execute.java
  
  Index: Execute.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Execute.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Execute.java	23 Apr 2003 15:57:43 -0000	1.54
  +++ Execute.java	23 May 2003 13:40:37 -0000	1.55
  @@ -231,8 +231,7 @@
                   String[] cmd = {"command.com", "/c", "set" };
                   return cmd;
               }
  -        } else if (Os.isFamily("z/os") || Os.isFamily("tandem") 
  -                   || Os.isFamily("unix")) {
  +        } else if (Os.isFamily("z/os") || Os.isFamily("unix")) {
               // On most systems one could use: /bin/sh -c env
   
               // Some systems have /bin/env, others /usr/bin/env, just try
  
  
  
  1.6       +14 -0     ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java
  
  Index: AbstractAccessTask.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/unix/AbstractAccessTask.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractAccessTask.java	22 Apr 2003 07:35:16 -0000	1.5
  +++ AbstractAccessTask.java	23 May 2003 13:40:37 -0000	1.6
  @@ -95,16 +95,30 @@
           addFileset(fs);
       }
   
  +    /**
  +     * @ant.attribute ignore="true"
  +     */
       public void setCommand(Commandline cmdl) {
           throw new BuildException(taskType +
                                    " doesn\'t support the command attribute",
                                    getLocation());
       }
   
  +    /**
  +     * @ant.attribute ignore="true"
  +     */
       public void setSkipEmptyFilesets(boolean skip) {
           throw new BuildException(taskType + " doesn\'t support the "
                                    + "skipemptyfileset attribute",
                                    getLocation());
  +    }
  +
  +    /**
  +     * @ant.attribute ignore="true"
  +     */
  +    public void setAddsourcefile(boolean b) {
  +        throw new BuildException(getTaskType()
  +            + " doesn\'t support the addsourcefile attribute", getLocation());
       }
   
       protected boolean isValidOs() {
  
  
  
  1.4       +42 -1     ant/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java
  
  Index: Attrib.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/windows/Attrib.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Attrib.java	10 Feb 2003 14:14:29 -0000	1.3
  +++ Attrib.java	23 May 2003 13:40:37 -0000	1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -120,15 +120,56 @@
           super.checkConfiguration();
       }
   
  +    /**
  +     * @ant.attribute ignore="true"
  +     */
       public void setExecutable(String e) {
           throw new BuildException(taskType + 
                                    " doesn\'t support the executable attribute",
                                    getLocation());
       }
   
  +    /**
  +     * @ant.attribute ignore="true"
  +     */
       public void setCommand(String e) {
           throw new BuildException(taskType + 
                                    " doesn\'t support the command attribute",
  +                                 getLocation());
  +    }
  +
  +    /**
  +     * @ant.attribute ignore="true"
  +     */
  +    public void setAddsourcefile(boolean b) {
  +        throw new BuildException(getTaskType()
  +            + " doesn\'t support the addsourcefile attribute", getLocation());
  +    }
  +
  +    /**
  +     * @ant.attribute ignore="true"
  +     */
  +    public void setSkipEmptyFilesets(boolean skip) {
  +        throw new BuildException(taskType + " doesn\'t support the "
  +                                 + "skipemptyfileset attribute",
  +                                 getLocation());
  +    }
  +
  +    /**
  +     * @ant.attribute ignore="true"
  +     */
  +    public void setParallel(boolean parallel) {
  +        throw new BuildException(getTaskType()
  +                                 + " doesn\'t support the parallel attribute",
  +                                 getLocation());
  +    }
  +
  +    /**
  +     * @ant.attribute ignore="true"
  +     */
  +    public void setMaxParallel(int max) {
  +        throw new BuildException(getTaskType()
  +                                 + " doesn\'t support the maxparallel attribute",
                                    getLocation());
       }
   
  
  
  

Mime
View raw message