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/main/org/apache/tools/ant/taskdefs/rmic DefaultRmicAdapter.java
Date Wed, 18 Jul 2001 09:53:40 GMT
bodewig     01/07/18 02:53:40

  Modified:    src/main/org/apache/tools/ant/taskdefs/compilers
                        DefaultCompilerAdapter.java
               src/main/org/apache/tools/ant/taskdefs/rmic
                        DefaultRmicAdapter.java
  Log:
  Add the correct path to the runtime library on MacOS X in <javac> and <rmic>.
  
  Based on patch submitted by:	Otto Moerbeek <omoerbeek@mac.com>
  
  Revision  Changes    Path
  1.5       +15 -0     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultCompilerAdapter.java	2001/03/28 08:34:38	1.4
  +++ DefaultCompilerAdapter.java	2001/07/18 09:53:40	1.5
  @@ -152,6 +152,9 @@
           }
   
           if (includeJavaRuntime) {
  +            // XXX move this stuff to a separate class, code is identical to
  +            //     code in ../rmic/DefaultRmicAdapter
  +
               if (System.getProperty("java.vendor").toLowerCase().indexOf("microsoft") >=
0) {
                   // Pull in *.zip from packages directory
                   FileSet msZipFiles = new FileSet();
  @@ -178,6 +181,18 @@
                                                   + File.separator +"jre"
                                                   + File.separator + "lib"
                                                   + File.separator + "rt.jar"));
  +
  +                // Added for MacOS X
  +                classpath.addExisting(new Path(null,
  +                                               System.getProperty("java.home")
  +                                               + File.separator + ".."
  +                                               + File.separator + "Classes"
  +                                               + File.separator + "classes.jar"));
  +                classpath.addExisting(new Path(null,
  +                                               System.getProperty("java.home")
  +                                               + File.separator + ".."
  +                                               + File.separator + "Classes"
  +                                               + File.separator + "ui.jar"));
               }
           }
               
  
  
  
  1.7       +15 -0     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
  
  Index: DefaultRmicAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultRmicAdapter.java	2001/07/04 10:04:26	1.6
  +++ DefaultRmicAdapter.java	2001/07/18 09:53:40	1.7
  @@ -143,6 +143,9 @@
           }
   
           if (attributes.getIncludejavaruntime()) {
  +            // XXX move this stuff to a separate class, code is identical to
  +            //     code in ../compiler/DefaultCompilerAdapter
  +
               if (System.getProperty("java.vendor").toLowerCase().indexOf("microsoft") >=
0) {
                   // Pull in *.zip from packages directory
                   FileSet msZipFiles = new FileSet();
  @@ -176,6 +179,18 @@
                                                   + File.separator +"jre"
                                                   + File.separator + "lib"
                                                   + File.separator + "rt.jar"));
  +
  +                // Added for MacOS X
  +                classpath.addExisting(new Path(null,
  +                                               System.getProperty("java.home")
  +                                               + File.separator + ".."
  +                                               + File.separator + "Classes"
  +                                               + File.separator + "classes.jar"));
  +                classpath.addExisting(new Path(null,
  +                                               System.getProperty("java.home")
  +                                               + File.separator + ".."
  +                                               + File.separator + "Classes"
  +                                               + File.separator + "ui.jar"));
               }
           }
           return classpath;
  
  
  

Mime
View raw message