svn commit: r541654 - /harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java

[ay...@apache.org]

Author: ayza
Date: Fri May 25 06:54:24 2007
New Revision: 541654

URL: http://svn.apache.org/viewvc?view=rev&rev=541654
Log:
Fixing javac to add all jars specified in sun.boot.class.path to bootclasspath. Current version failed to load kernel classes.

Modified:
    harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java

Modified: harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java?view=diff&rev=541654&r1=541653&r2=541654
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java (original)
+++ harmony/enhanced/jdktools/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Main.java Fri May 25 06:54:24 2007
@@ -18,6 +18,7 @@
 package org.apache.harmony.tools.javac;
 
 import java.io.PrintWriter;
+import java.io.File;
 import org.apache.harmony.tools.toolutils.Util;
 
 /**
@@ -82,11 +83,19 @@
      * libraries.
      */
     private String[] addBootclasspath(String[] args) {
+        StringBuilder sb = new StringBuilder();
         String[] result = new String[args.length + 2];
+
         System.arraycopy(args, 0, result, 0, args.length);
         result[args.length] = "-classpath"; //$NON-NLS-1$
-        result[args.length + 1] = System.getProperty(
-                "org.apache.harmony.boot.class.path", "."); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append(System.getProperty(
+                 "org.apache.harmony.boot.class.path", ".")); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append(File.pathSeparator);
+        sb.append(System.getProperty(
+                 "sun.boot.class.path", ".")); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append(File.pathSeparator);
+        sb.append("."); //$NON-NLS-1$
+        result[args.length + 1] = sb.toString();
         return result;
     }
 }