From 5e097248de260bf308feb061aaa312bccbdfb8e7 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Wed, 18 Jul 2001 09:53:40 +0000 Subject: [PATCH] Add the correct path to the runtime library on MacOS X in and . Based on patch submitted by: Otto Moerbeek git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269356 13f79535-47bb-0310-9956-ffa450edef68 --- .../compilers/DefaultCompilerAdapter.java | 15 +++++++++++++++ .../ant/taskdefs/rmic/DefaultRmicAdapter.java | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java index 8e5b691dd..a41901222 100644 --- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java @@ -152,6 +152,9 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { } 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 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter { + 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")); } } diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java index 6b1a14da1..ce68e333e 100644 --- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java +++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java @@ -143,6 +143,9 @@ public abstract class DefaultRmicAdapter implements RmicAdapter { } 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 @@ public abstract class DefaultRmicAdapter implements RmicAdapter { + 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;