--- a/src/share/tools/ProjectCreator/BuildConfig.java	Sat Feb 11 11:15:32 2012 -0800
+++ b/src/share/tools/ProjectCreator/BuildConfig.java	Sat Feb 11 23:35:44 2012 +0100
@@ -68,18 +68,20 @@
         if (value != null) {
             outDir = value;
         }
-        if (outDir.endsWith("debug")) {
+        if(outDir.endsWith("fastdebug")) {
+            outDir = outDir.substring(0, outDir.lastIndexOf("fastdebug") - 1);
+        } else if (outDir.endsWith("debug")) {
             outDir = outDir.substring(0, outDir.lastIndexOf("debug") - 1);
-        } else if(outDir.endsWith("fastdebug")) {
-            outDir = outDir.substring(0, outDir.lastIndexOf("fastdebug") - 1);
         }
         
         if (!build.equals("product")) {
             outDir += Util.sep + build;
         }
         outDir += Util.sep + "jre" + Util.sep + "bin";
-        if (flavour.equals("compiler1")) {
+        if (flavour.equals("graal")) {
             outDir += Util.sep + "graal";
+        } else if (flavour.equals("compiler1")) {
+            outDir += Util.sep + "client";
         } else {
             outDir += Util.sep + "server";
         }
@@ -126,7 +128,6 @@
         tree.addSubdirToIgnore("Codemgr_wsdata");
         tree.addSubdirToIgnore("deleted_files");
         tree.addSubdirToIgnore("SCCS");
-        tree.setVerbose(true);
         if (startAt != null) {
             tree.readDirectory(sourceBase + File.separator + startAt);
         } else {
@@ -576,6 +577,28 @@
    }
 }
 
+class GraalDebugConfig extends GenericDebugNonKernelConfig {
+    String getOptFlag() {
+        return getCI().getNoOptFlag();
+    }
+
+    GraalDebugConfig() {
+        initNames("graal", "debug", "jvm.dll");
+        init(getIncludes(), getDefines());
+    }
+}
+
+class GraalFastDebugConfig extends GenericDebugNonKernelConfig {
+    String getOptFlag() {
+        return getCI().getOptFlag();
+    }
+
+    GraalFastDebugConfig() {
+        initNames("graal", "fastdebug", "jvm.dll");
+        init(getIncludes(), getDefines());
+    }
+}
+
 class C1DebugConfig extends GenericDebugNonKernelConfig {
     String getOptFlag() {
         return getCI().getNoOptFlag();
@@ -655,6 +678,13 @@
     }
 }
 
+class GraalProductConfig extends ProductConfig {
+    GraalProductConfig() {
+        initNames("graal", "product", "jvm.dll");
+        init(getIncludes(), getDefines());
+    }
+}
+
 class C1ProductConfig extends ProductConfig {
     C1ProductConfig() {
         initNames("compiler1", "product", "jvm.dll");