bodewig 2003/03/14 08:01:04
Modified: . WHATSNEW
docs/manual/CoreTasks chmod.html conditions.html
pathconvert.html
src/main/org/apache/tools/ant/taskdefs Chmod.java
Execute.java PathConvert.java
src/main/org/apache/tools/ant/taskdefs/condition Os.java
Log:
Add support for HP's NonStop Server (formerly known by several names,
including Tandem).
Submitted by: Mirko Zeibig <Mirko dot Zeibig at t dash systems dot com>
Revision Changes Path
1.366 +3 -1 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.365
retrieving revision 1.366
diff -u -r1.365 -r1.366
--- WHATSNEW 14 Mar 2003 15:24:10 -0000 1.365
+++ WHATSNEW 14 Mar 2003 16:01:03 -0000 1.366
@@ -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:
@@ -162,6 +162,8 @@
can be found at http://www.jcraft.com/jsch/index.html
* New filterreader <escapeunicode/>.
+
+* Support for HP's NonStop (Tandem) OS has been added.
Changes from Ant 1.5.2 to Ant 1.5.3
===================================
1.10 +3 -2 ant/docs/manual/CoreTasks/chmod.html
Index: chmod.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/chmod.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- chmod.html 22 Jun 2002 23:38:27 -0000 1.9
+++ chmod.html 14 Mar 2003 16:01:03 -0000 1.10
@@ -9,7 +9,8 @@
<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.
+<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>
<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
@@ -102,7 +103,7 @@
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
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>
</body>
1.17 +2 -1 ant/docs/manual/CoreTasks/conditions.html
Index: conditions.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/conditions.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- conditions.html 1 Dec 2002 01:30:08 -0000 1.16
+++ conditions.html 14 Mar 2003 16:01:03 -0000 1.17
@@ -92,6 +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>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>
@@ -315,7 +316,7 @@
</table>
<hr>
-<p align="center">Copyright © 2001-2002 Apache Software
+<p align="center">Copyright © 2001-2003 Apache Software
Foundation. All rights Reserved.</p>
</body>
1.11 +2 -2 ant/docs/manual/CoreTasks/pathconvert.html
Index: pathconvert.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/pathconvert.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pathconvert.html 9 Jul 2002 21:05:51 -0000 1.10
+++ pathconvert.html 14 Mar 2003 16:01:03 -0000 1.11
@@ -31,7 +31,7 @@
<td valign="top">targetos</td>
<td valign="top">
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
<code>pathsep</code> and <code>dirsep</code>
according to the specified target architecture.
@@ -176,7 +176,7 @@
</p>
<hr>
-<p align="center">Copyright © 2001-2002 Apache Software Foundation.
+<p align="center">Copyright © 2001-2003 Apache Software Foundation.
All rights Reserved.</p>
</body>
</html>
1.36 +3 -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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- Chmod.java 7 Mar 2003 11:23:00 -0000 1.35
+++ Chmod.java 14 Mar 2003 16:01:03 -0000 1.36
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -255,6 +255,7 @@
}
protected boolean isValidOs() {
- return Os.isFamily("unix") && super.isValidOs();
+ return (Os.isFamily("unix") || Os.isFamily("tandem"))
+ && super.isValidOs();
}
}
1.52 +5 -1 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Execute.java 19 Feb 2003 07:57:29 -0000 1.51
+++ Execute.java 14 Mar 2003 16:01:03 -0000 1.52
@@ -232,6 +232,10 @@
} else if (Os.isFamily("z/os")) {
String[] cmd = {"/bin/env"};
return cmd;
+ } else if (Os.isFamily("tandem")) {
+// String[] cmd = {"/bin/sh -c env"};
+ String[] cmd = {"/bin/env"};
+ return cmd;
} else if (Os.isFamily("unix")) {
// Generic UNIX
// Alternatively one could use: /bin/sh -c env
1.24 +3 -3
ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java
Index: PathConvert.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/PathConvert.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- PathConvert.java 10 Feb 2003 14:13:36 -0000 1.23
+++ PathConvert.java 14 Mar 2003 16:01:03 -0000 1.24
@@ -1,7 +1,7 @@
/*
* 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.
*
* Redistribution and use in source and binary forms, with or without
@@ -202,7 +202,7 @@
*/
public static class TargetOs extends EnumeratedAttribute {
public String[] getValues() {
- return new String[]{"windows", "unix", "netware", "os/2"};
+ return new String[]{"windows", "unix", "netware", "os/2",
"tandem"};
}
}
@@ -269,7 +269,7 @@
// validateSetup code, the same assumptions can be made as
// with windows - that ; is the path separator
- targetWindows = !targetOS.equals("unix");
+ targetWindows = !targetOS.equals("unix") &&
!targetOS.equals("tandem");
}
/**
1.24 +4 -1
ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
Index: Os.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Os.java 7 Mar 2003 11:23:05 -0000 1.23
+++ Os.java 14 Mar 2003 16:01:04 -0000 1.24
@@ -95,6 +95,7 @@
* <li>mac</li>
* <li>netware</li>
* <li>os/2</li>
+ * <li>tandem</li>
* <li>unix</li>
* <li>windows</li>
* <li>win9x</li>
@@ -214,6 +215,8 @@
isFamily = pathSep.equals(";") && !isFamily("netware");
} else if (family.equals("mac")) {
isFamily = osName.indexOf("mac") > -1;
+ } else if (family.equals("tandem")) {
+ isFamily = osName.indexOf("nonstop_kernel") > -1;
} else if (family.equals("unix")) {
isFamily = pathSep.equals(":")
&& (!isFamily("mac") || osName.endsWith("x"));
