<attrib> doesn't like to be called with parallel. <chgrp> and <chown> should also disable the addsourcefile attribute. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274607 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -246,7 +246,7 @@ Other changes: | |||||
| * New filterreader <escapeunicode/>. | * 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 | * <cab>'s basedir attribute is now optional if you specify nested | ||||
| filesets. Bugzilla Report 18046. | filesets. Bugzilla Report 18046. | ||||
| @@ -10,7 +10,7 @@ | |||||
| <h2><a name="chmod">Chmod</a></h2> | <h2><a name="chmod">Chmod</a></h2> | ||||
| <h3>Description</h3> | <h3>Description</h3> | ||||
| <p>Changes the permissions of a file or all files inside specified | <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> | 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 | <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 | tasks</a>, on how the inclusion/exclusion of files works, and how to | ||||
| @@ -92,7 +92,7 @@ the tests succeed. | |||||
| <li>unix (for all Unix and Unix-like operating systems)</li> | <li>unix (for all Unix and Unix-like operating systems)</li> | ||||
| <li>netware (for Novell NetWare)</li> | <li>netware (for Novell NetWare)</li> | ||||
| <li>os/2 (for OS/2)</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>win9x for Microsoft Windows 95 and 98</li> | ||||
| <li>z/os for z/OS and OS/390</li> | <li>z/os for z/OS and OS/390</li> | ||||
| <li>os/400 for OS/400</li> | <li>os/400 for OS/400</li> | ||||
| @@ -59,14 +59,6 @@ elements.</p> | |||||
| If set to <i>dir</i>, only the directories are considered.</td> | If set to <i>dir</i>, only the directories are considered.</td> | ||||
| <td align="center" valign="top">No, default is <i>file</i></td> | <td align="center" valign="top">No, default is <i>file</i></td> | ||||
| </tr> | </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 <= 0 for | |||||
| unlimited. Defaults to unlimited.</td> | |||||
| <td align="center" valign="top">No</td> | |||||
| </tr> | |||||
| <tr> | <tr> | ||||
| <td valign="top">verbose</td> | <td valign="top">verbose</td> | ||||
| <td valign="top">Whether to print a summary after execution or not. | <td valign="top">Whether to print a summary after execution or not. | ||||
| @@ -263,7 +263,6 @@ public class Chmod extends ExecuteOn { | |||||
| } | } | ||||
| protected boolean isValidOs() { | protected boolean isValidOs() { | ||||
| return (Os.isFamily("unix") || Os.isFamily("tandem")) | |||||
| && super.isValidOs(); | |||||
| return Os.isFamily("unix") && super.isValidOs(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -231,8 +231,7 @@ public class Execute { | |||||
| String[] cmd = {"command.com", "/c", "set" }; | String[] cmd = {"command.com", "/c", "set" }; | ||||
| return cmd; | 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 | // On most systems one could use: /bin/sh -c env | ||||
| // Some systems have /bin/env, others /usr/bin/env, just try | // Some systems have /bin/env, others /usr/bin/env, just try | ||||
| @@ -95,18 +95,32 @@ public abstract class AbstractAccessTask | |||||
| addFileset(fs); | addFileset(fs); | ||||
| } | } | ||||
| /** | |||||
| * @ant.attribute ignore="true" | |||||
| */ | |||||
| public void setCommand(Commandline cmdl) { | public void setCommand(Commandline cmdl) { | ||||
| throw new BuildException(taskType + | throw new BuildException(taskType + | ||||
| " doesn\'t support the command attribute", | " doesn\'t support the command attribute", | ||||
| getLocation()); | getLocation()); | ||||
| } | } | ||||
| /** | |||||
| * @ant.attribute ignore="true" | |||||
| */ | |||||
| public void setSkipEmptyFilesets(boolean skip) { | public void setSkipEmptyFilesets(boolean skip) { | ||||
| throw new BuildException(taskType + " doesn\'t support the " | throw new BuildException(taskType + " doesn\'t support the " | ||||
| + "skipemptyfileset attribute", | + "skipemptyfileset attribute", | ||||
| getLocation()); | getLocation()); | ||||
| } | } | ||||
| /** | |||||
| * @ant.attribute ignore="true" | |||||
| */ | |||||
| public void setAddsourcefile(boolean b) { | |||||
| throw new BuildException(getTaskType() | |||||
| + " doesn\'t support the addsourcefile attribute", getLocation()); | |||||
| } | |||||
| protected boolean isValidOs() { | protected boolean isValidOs() { | ||||
| return Os.isFamily("unix") && super.isValidOs(); | return Os.isFamily("unix") && super.isValidOs(); | ||||
| } | } | ||||
| @@ -1,7 +1,7 @@ | |||||
| /* | /* | ||||
| * The Apache Software License, Version 1.1 | * 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. | * reserved. | ||||
| * | * | ||||
| * Redistribution and use in source and binary forms, with or without | * Redistribution and use in source and binary forms, with or without | ||||
| @@ -120,18 +120,59 @@ public class Attrib extends ExecuteOn { | |||||
| super.checkConfiguration(); | super.checkConfiguration(); | ||||
| } | } | ||||
| /** | |||||
| * @ant.attribute ignore="true" | |||||
| */ | |||||
| public void setExecutable(String e) { | public void setExecutable(String e) { | ||||
| throw new BuildException(taskType + | throw new BuildException(taskType + | ||||
| " doesn\'t support the executable attribute", | " doesn\'t support the executable attribute", | ||||
| getLocation()); | getLocation()); | ||||
| } | } | ||||
| /** | |||||
| * @ant.attribute ignore="true" | |||||
| */ | |||||
| public void setCommand(String e) { | public void setCommand(String e) { | ||||
| throw new BuildException(taskType + | throw new BuildException(taskType + | ||||
| " doesn\'t support the command attribute", | " doesn\'t support the command attribute", | ||||
| getLocation()); | 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()); | |||||
| } | |||||
| protected boolean isValidOs() { | protected boolean isValidOs() { | ||||
| return Os.isFamily("windows") && super.isValidOs(); | return Os.isFamily("windows") && super.isValidOs(); | ||||
| } | } | ||||