ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/util JavaEnvUtilsTest.java
Date Wed, 22 May 2002 09:07:15 GMT
bodewig     02/05/22 02:07:15

  Modified:    src/main/org/apache/tools/ant/util Tag: ANT_15_BRANCH
                        JavaEnvUtils.java
               src/testcases/org/apache/tools/ant/util Tag: ANT_15_BRANCH
                        JavaEnvUtilsTest.java
  Log:
  Make JavaEnvUtilsTest pass on MacOS X.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +2 -1      jakarta-ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java
  
  Index: JavaEnvUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/JavaEnvUtils.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- JavaEnvUtils.java	18 Apr 2002 14:19:00 -0000	1.3
  +++ JavaEnvUtils.java	22 May 2002 09:07:15 -0000	1.3.2.1
  @@ -212,7 +212,8 @@
               return jExecutable.getAbsolutePath();
           } else {
               // fall back to JRE bin directory, also catches JDK 1.0 and 1.1
  -            // where java.home points to the root of the JDK
  +            // where java.home points to the root of the JDK and Mac OS X where
  +            // the whole directory layout is different from Sun's
               return getJreExecutable(command);
           }
       }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +2 -1      jakarta-ant/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java
  
  Index: JavaEnvUtilsTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/util/JavaEnvUtilsTest.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- JavaEnvUtilsTest.java	8 Apr 2002 18:08:08 -0000	1.2
  +++ JavaEnvUtilsTest.java	22 May 2002 09:07:15 -0000	1.2.2.1
  @@ -155,7 +155,8 @@
                          j.startsWith(javaHomeParent));
   
               if (JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_0 ||
  -                JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_1) {
  +                JavaEnvUtils.getJavaVersion() == JavaEnvUtils.JAVA_1_1 ||
  +                Os.isFamily("mac")) {
                   assertTrue(j+" is normalized and in the JRE dir",
                              j.startsWith(javaHome));
               } else {
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message