diff --git a/docs/manual/CoreTasks/condition.html b/docs/manual/CoreTasks/condition.html
index 5cf0017c4..42c5fcc46 100644
--- a/docs/manual/CoreTasks/condition.html
+++ b/docs/manual/CoreTasks/condition.html
@@ -91,6 +91,21 @@ are redundant and will be ignored.
| The name of the operating system family to expect. |
No |
+
+ | name |
+ The name of the operating system to expect. |
+ No |
+
+
+ | arch |
+ The architecture of the operating system to expect. |
+ No |
+
+
+ | version |
+ The version of the operating system to expect. |
+ No |
+
Supported values for the family attribute are:
@@ -138,7 +153,7 @@ are redundant and will be ignored.
-checksum
+checksum
This condition is identical to the Checksum task, all attributes and nested
@@ -172,6 +187,14 @@ classpath.
operating system is MacOS, but not MacOS X - which Ant considers to be
in the Unix family as well.
+
+ <condition property="isSparc">
+ <os arch="sparc" />
+ </condition>
+
+sets the property isSparc if the current
+operating system is running on a sparc architecture.
+
Copyright © 2001 Apache Software
Foundation. All rights Reserved.
diff --git a/docs/manual/credits.html b/docs/manual/credits.html
index 2c8104393..dec169003 100644
--- a/docs/manual/credits.html
+++ b/docs/manual/credits.html
@@ -29,6 +29,7 @@
Sam Ruby (rubys@us.ibm.com)
Nico Seessle (nico@seessle.de)
Jon S. Stevens (jon@latchkey.com)
+ Magesh Umasankar (umagesh@apache.org)
Roger Vaughn (rvaughn@seaconinc.com)
Dave Walend (dwalend@cs.tufts.edu)
Phillip Wells (philwells@rocketmail.com)
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
index b18f1b3ff..b0110a600 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
@@ -62,14 +62,22 @@ import java.util.Locale;
* Condition that tests the OS type.
*
* @author Stefan Bodewig
+ * @author Magesh Umasankar
* @version $Revision$
*/
public class Os implements Condition {
private static final String osName =
System.getProperty("os.name").toLowerCase(Locale.US);
+ private static final String osArch =
+ System.getProperty("os.arch").toLowerCase(Locale.US);
+ private static final String osVersion =
+ System.getProperty("os.version").toLowerCase(Locale.US);
private static final String pathSep = System.getProperty("path.separator");
private String family;
+ private String name;
+ private String version;
+ private String arch;
public Os() {}
@@ -79,7 +87,7 @@ public class Os implements Condition {
/**
* Sets the desired OS family type
- *
+ *
* @param f The OS family type desired
* Possible values:
* - dos
@@ -92,12 +100,39 @@ public class Os implements Condition {
public void setFamily(String f) {family = f.toLowerCase(Locale.US);}
/**
- * Determines if the OS on which Ant is executing matches the type of
+ * Sets the desired OS name
+ *
+ * @param name The OS name
+ */
+ public void setName(String name) {
+ this.name = name.toLowerCase(Locale.US);
+ }
+
+ /**
+ * Sets the desired OS architecture
+ *
+ * @param arch The OS architecture
+ */
+ public void setArch(String arch) {
+ this.arch = arch.toLowerCase(Locale.US);
+ }
+
+ /**
+ * Sets the desired OS version
+ *
+ * @param version The OS version
+ */
+ public void setVersion(String version) {
+ this.version = version.toLowerCase(Locale.US);
+ }
+
+ /**
+ * Determines if the OS on which Ant is executing matches the type of
* that set in setFamily.
* @see Os#setFamily(String)
*/
public boolean eval() throws BuildException {
- return isFamily(family);
+ return isOs(family, name, arch, version);
}
/**
@@ -107,25 +142,93 @@ public class Os implements Condition {
* @since 1.5
*/
public static boolean isFamily(String family) {
- if (family != null) {
- if (family.equals("windows")) {
- return osName.indexOf("windows") > -1;
- } else if (family.equals("os/2")) {
- return osName.indexOf("os/2") > -1;
- } else if (family.equals("netware")) {
- return osName.indexOf("netware") > -1;
- } else if (family.equals("dos")) {
- return pathSep.equals(";") && !isFamily("netware");
- } else if (family.equals("mac")) {
- return osName.indexOf("mac") > -1;
- } else if (family.equals("unix")) {
- return pathSep.equals(":")
- && (!isFamily("mac") || osName.endsWith("x"));
+ return isOs(family, null, null, null);
+ }
+
+ /**
+ * Determines if the OS on which Ant is executing matches the
+ * given OS name.
+ *
+ * @since 1.7
+ */
+ public static boolean isName(String name) {
+ return isOs(null, name, null, null);
+ }
+
+ /**
+ * Determines if the OS on which Ant is executing matches the
+ * given OS architecture.
+ *
+ * @since 1.7
+ */
+ public static boolean isArch(String arch) {
+ return isOs(null, null, arch, null);
+ }
+
+ /**
+ * Determines if the OS on which Ant is executing matches the
+ * given OS version.
+ *
+ * @since 1.7
+ */
+ public static boolean isVersion(String version) {
+ return isOs(null, null, null, version);
+ }
+
+ /**
+ * Determines if the OS on which Ant is executing matches the
+ * given OS family, name, architecture and version
+ *
+ * @param family The OS family
+ * @param name The OS name
+ * @param arch The OS architecture
+ * @param version The OS version
+ *
+ * @since 1.7
+ */
+ public static boolean isOs(String family, String name, String arch,
+ String version) {
+ boolean retValue = false;
+
+ if (family != null || name != null || arch != null
+ || version != null) {
+
+ boolean isFamily = true;
+ boolean isName = true;
+ boolean isArch = true;
+ boolean isVersion = true;
+
+ if (family != null) {
+ if (family.equals("windows")) {
+ isFamily = osName.indexOf("windows") > -1;
+ } else if (family.equals("os/2")) {
+ isFamily = osName.indexOf("os/2") > -1;
+ } else if (family.equals("netware")) {
+ isFamily = osName.indexOf("netware") > -1;
+ } else if (family.equals("dos")) {
+ isFamily = pathSep.equals(";") && !isFamily("netware");
+ } else if (family.equals("mac")) {
+ isFamily = osName.indexOf("mac") > -1;
+ } else if (family.equals("unix")) {
+ isFamily = pathSep.equals(":")
+ && (!isFamily("mac") || osName.endsWith("x"));
+ } else {
+ throw new BuildException(
+ "Don\'t know how to detect os family \""
+ + family + "\"");
+ }
+ }
+ if (name != null) {
+ isName = name.equals(osName);
}
- throw new BuildException("Don\'t know how to detect os family \""
- + family + "\"");
+ if (arch != null) {
+ isArch = arch.equals(osArch);
+ }
+ if (version != null) {
+ isVersion = version.equals(osVersion);
+ }
+ retValue = isFamily && isName && isArch && isVersion;
}
- return false;
+ return retValue;
}
-
}