including Tandem). Submitted by: Mirko Zeibig <Mirko dot Zeibig at t dash systems dot com> git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274262 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -1,4 +1,4 @@ | |||||
| Changes from Ant 1.5.2 to current CVS version | |||||
| Changes from Ant 1.5.3 to current CVS version | |||||
| ============================================= | ============================================= | ||||
| Changes that could break older environments: | Changes that could break older environments: | ||||
| @@ -163,6 +163,8 @@ Other changes: | |||||
| * New filterreader <escapeunicode/>. | * New filterreader <escapeunicode/>. | ||||
| * Support for HP's NonStop (Tandem) OS has been added. | |||||
| Changes from Ant 1.5.2 to Ant 1.5.3 | Changes from Ant 1.5.2 to Ant 1.5.3 | ||||
| =================================== | =================================== | ||||
| @@ -9,7 +9,8 @@ | |||||
| <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 directories. Right now it has effect only under Unix. | |||||
| <p>Changes the permissions of a file or all files inside specified | |||||
| directories. Right now it has effect only under Unix or NonStop (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 | ||||
| @@ -102,7 +103,7 @@ below any directory named trial) writable for members of the same | |||||
| group on a UNIX system. In addition all files belonging to a FileSet | group on a UNIX system. In addition all files belonging to a FileSet | ||||
| with <code>id</code> <code>other.shared.sources</code> get the same | with <code>id</code> <code>other.shared.sources</code> get the same | ||||
| permissions.</p> | permissions.</p> | ||||
| <hr><p align="center">Copyright © 2000-2002 Apache Software Foundation. All rights | |||||
| <hr><p align="center">Copyright © 2000-2003 Apache Software Foundation. All rights | |||||
| Reserved.</p> | Reserved.</p> | ||||
| </body> | </body> | ||||
| @@ -92,6 +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>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> | ||||
| @@ -315,7 +316,7 @@ that is "true","yes", or "on"</p> | |||||
| </table> | </table> | ||||
| <hr> | <hr> | ||||
| <p align="center">Copyright © 2001-2002 Apache Software | |||||
| <p align="center">Copyright © 2001-2003 Apache Software | |||||
| Foundation. All rights Reserved.</p> | Foundation. All rights Reserved.</p> | ||||
| </body> | </body> | ||||
| @@ -31,7 +31,7 @@ drive letters to Unix paths, and vice-versa.</p> | |||||
| <td valign="top">targetos</td> | <td valign="top">targetos</td> | ||||
| <td valign="top"> | <td valign="top"> | ||||
| The target architecture. Must be one of 'unix', 'windows', | The target architecture. Must be one of 'unix', 'windows', | ||||
| 'netware' or 'os/2'. | |||||
| 'netware', 'tandem' or 'os/2'. | |||||
| This is a shorthand mechanism for specifying both | This is a shorthand mechanism for specifying both | ||||
| <code>pathsep</code> and <code>dirsep</code> | <code>pathsep</code> and <code>dirsep</code> | ||||
| according to the specified target architecture. | according to the specified target architecture. | ||||
| @@ -176,7 +176,7 @@ list of files. | |||||
| </p> | </p> | ||||
| <hr> | <hr> | ||||
| <p align="center">Copyright © 2001-2002 Apache Software Foundation. | |||||
| <p align="center">Copyright © 2001-2003 Apache Software Foundation. | |||||
| All rights Reserved.</p> | All rights Reserved.</p> | ||||
| </body> | </body> | ||||
| </html> | </html> | ||||
| @@ -1,7 +1,7 @@ | |||||
| /* | /* | ||||
| * The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
| * | * | ||||
| * Copyright (c) 2000-2002 The Apache Software Foundation. All rights | |||||
| * Copyright (c) 2000-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 | ||||
| @@ -255,6 +255,7 @@ public class Chmod extends ExecuteOn { | |||||
| } | } | ||||
| protected boolean isValidOs() { | protected boolean isValidOs() { | ||||
| return Os.isFamily("unix") && super.isValidOs(); | |||||
| return (Os.isFamily("unix") || Os.isFamily("tandem")) | |||||
| && super.isValidOs(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -232,6 +232,10 @@ public class Execute { | |||||
| } else if (Os.isFamily("z/os")) { | } else if (Os.isFamily("z/os")) { | ||||
| String[] cmd = {"/bin/env"}; | String[] cmd = {"/bin/env"}; | ||||
| return cmd; | return cmd; | ||||
| } else if (Os.isFamily("tandem")) { | |||||
| // String[] cmd = {"/bin/sh -c env"}; | |||||
| String[] cmd = {"/bin/env"}; | |||||
| return cmd; | |||||
| } else if (Os.isFamily("unix")) { | } else if (Os.isFamily("unix")) { | ||||
| // Generic UNIX | // Generic UNIX | ||||
| // Alternatively one could use: /bin/sh -c env | // Alternatively one could use: /bin/sh -c env | ||||
| @@ -1,7 +1,7 @@ | |||||
| /* | /* | ||||
| * The Apache Software License, Version 1.1 | * The Apache Software License, Version 1.1 | ||||
| * | * | ||||
| * Copyright (c) 2001-2002 The Apache Software Foundation. All rights | |||||
| * Copyright (c) 2001-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 | ||||
| @@ -202,7 +202,7 @@ public class PathConvert extends Task { | |||||
| */ | */ | ||||
| public static class TargetOs extends EnumeratedAttribute { | public static class TargetOs extends EnumeratedAttribute { | ||||
| public String[] getValues() { | public String[] getValues() { | ||||
| return new String[]{"windows", "unix", "netware", "os/2"}; | |||||
| return new String[]{"windows", "unix", "netware", "os/2", "tandem"}; | |||||
| } | } | ||||
| } | } | ||||
| @@ -269,7 +269,7 @@ public class PathConvert extends Task { | |||||
| // validateSetup code, the same assumptions can be made as | // validateSetup code, the same assumptions can be made as | ||||
| // with windows - that ; is the path separator | // with windows - that ; is the path separator | ||||
| targetWindows = !targetOS.equals("unix"); | |||||
| targetWindows = !targetOS.equals("unix") && !targetOS.equals("tandem"); | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -95,6 +95,7 @@ public class Os implements Condition { | |||||
| * <li>mac</li> | * <li>mac</li> | ||||
| * <li>netware</li> | * <li>netware</li> | ||||
| * <li>os/2</li> | * <li>os/2</li> | ||||
| * <li>tandem</li> | |||||
| * <li>unix</li> | * <li>unix</li> | ||||
| * <li>windows</li> | * <li>windows</li> | ||||
| * <li>win9x</li> | * <li>win9x</li> | ||||
| @@ -214,6 +215,8 @@ public class Os implements Condition { | |||||
| isFamily = pathSep.equals(";") && !isFamily("netware"); | isFamily = pathSep.equals(";") && !isFamily("netware"); | ||||
| } else if (family.equals("mac")) { | } else if (family.equals("mac")) { | ||||
| isFamily = osName.indexOf("mac") > -1; | isFamily = osName.indexOf("mac") > -1; | ||||
| } else if (family.equals("tandem")) { | |||||
| isFamily = osName.indexOf("nonstop_kernel") > -1; | |||||
| } else if (family.equals("unix")) { | } else if (family.equals("unix")) { | ||||
| isFamily = pathSep.equals(":") | isFamily = pathSep.equals(":") | ||||
| && (!isFamily("mac") || osName.endsWith("x")); | && (!isFamily("mac") || osName.endsWith("x")); | ||||