@@ -191,21 +191,21 @@ public static Iterable<JDKToolsLibrary> makeFromRuntime(GlobalModel model) {
       list.add(new JDKToolsLibrary(version, null, compiler, debugger, javadoc));
     }
 
-    if (JavaVersion.JAVA_6.compareTo(version.majorVersion())>=0) {
-      // at least Java 6, try Eclipse compiler
-      msg("                 at least Java 6, try EclipseCompiler");
-      // provide "UNKNOWN 6.0" as version
-      FullVersion eclipseVersion = JavaVersion.parseFullVersion(JavaVersion.JAVA_6.fullVersion().versionString(),
-                                                                "Eclipse","");
-      msg("                 version for Eclipse: "+eclipseVersion);
-      compiler = getCompilerInterface("edu.rice.cs.drjava.model.compiler.EclipseCompiler", eclipseVersion);
-      msg("                 compiler="+compiler.getClass().getName());
-      if (compiler!=NoCompilerAvailable.ONLY) {
-        // if we have found a compiler, add it
-        msg("                 compiler found");
-        list.add(new JDKToolsLibrary(eclipseVersion, null, compiler, debugger, javadoc));
-      }
-    }
+//    if (JavaVersion.JAVA_6.compareTo(version.majorVersion())>=0) {
+//      // at least Java 6, try Eclipse compiler
+//      msg("                 at least Java 6, try EclipseCompiler");
+//      // provide "UNKNOWN 6.0" as version
+//      FullVersion eclipseVersion = JavaVersion.parseFullVersion(JavaVersion.JAVA_6.fullVersion().versionString(),
+//                                                                "Eclipse","");
+//      msg("                 version for Eclipse: "+eclipseVersion);
+//      compiler = getCompilerInterface("edu.rice.cs.drjava.model.compiler.EclipseCompiler", eclipseVersion);
+//      msg("                 compiler="+compiler.getClass().getName());
+//      if (compiler!=NoCompilerAvailable.ONLY) {
+//        // if we have found a compiler, add it
+//        msg("                 compiler found");
+//        list.add(new JDKToolsLibrary(eclipseVersion, null, compiler, debugger, javadoc));
+//      }
+//    }
     msg("                 compilers found: "+list.size());
 
     if (list.size()==0) {
 
@@ -111,16 +111,6 @@ public class JarJDKToolsLibrary extends JDKToolsLibrary {
       "com.sun.xml.internal.rngom",
       "com.sun.xml.internal.xsom",
       "org.relaxng",
-//        
-//      // Mint:
-//      "com.sun.tools.javac",
-//      "com.sun.tools.javac.tree",
-//      "com.sun.tools.javac.comp",
-//      "com.sun.tools.javac.main",
-//      "edu.rice.cs.mint",
-//      "edu.rice.cs.mint.comp",
-//      "edu.rice.cs.mint.runtime",
-//      "edu.rice.cs.mint.runtime.mspTree"
     });
   }
 
@@ -203,7 +193,7 @@ else if (f.getName().equals("tools.jar")) {
           File[] jars = IOUtil.attemptListFiles(libDir, IOUtil.extensionFilePredicate("jar"));
           if (jars != null) { bootClassPath.addAll(Arrays.asList(jars)); }
         }
-        bootClassPath.addAll(additionalBootClassPath);
+        if (additionalBootClassPath!=null) { bootClassPath.addAll(additionalBootClassPath); }
         if (bootClassPath.isEmpty()) { bootClassPath = null; } // null defers to the compiler's default behavior
 
         try {
@@ -455,8 +445,7 @@ public static Iterable<JarJDKToolsLibrary> search(GlobalModel model) {
         if (lib.isValid()) {
           FullVersion v = lib.version();
           Map<FullVersion, Iterable<JarJDKToolsLibrary>> mapToAddTo = results;
-          if (v.vendor().equals(JavaVersion.VendorType.UNKNOWN) ||
-              ((desc!=null)&&(desc.isCompound()))) { mapToAddTo = compoundResults; }
+          if ((desc!=null)&&(desc.isCompound())) { mapToAddTo = compoundResults; }
 
           if (mapToAddTo.containsKey(v)) { mapToAddTo.put(v, IterUtil.compose(lib, mapToAddTo.get(v))); }
           else { mapToAddTo.put(v, IterUtil.singleton(lib)); }
 
@@ -1029,6 +1029,12 @@
     <property name="nextgen-tools-1" location="${nextgen-home}/nextgen2.jar" />
     <available property="nextgen-tools" value="${nextgen-tools-1}" file="${nextgen-tools-1}" />
 
+    <property name="nextgen-tools-2" location="${nextgen-home}/jars/nextgen2.jar" />
+    <available property="nextgen-tools" value="${nextgen-tools-2}" file="${nextgen-tools-2}" />
+
+    <property name="nextgen-tools-3" location="${nextgen-home}/built" />
+    <available property="nextgen-tools" value="${nextgen-tools-3}" file="${nextgen-tools-3}/edu/rice/cs/nextgen2/compiler/Main.class" />
+
     <fail message="Can't find nextgen2.jar in the Nextgen home: ${nextgen-home}" unless="nextgen-tools" />
   </target>