src/share/tools/ProjectCreator/WinGammaPlatform.java

rev 2073 : imported patch vcproj-64

@@ -233,17 +233,10 @@
         String name = null;
         if ((locationsInTree == null) ||
             (locationsInTree.size() == 0)) {
             filesNotFound.add(fileName);
         } else if (locationsInTree.size() > 1) {
-            // We shouldn't have duplicate file names in our workspace.
-            System.err.println();
-            System.err.println("There are multiple files named as: " + fileName);
-            System.exit(-1);
-            // The following code could be safely removed if we don't need duplicate
-            // file names.
-
             // Iterate through them, trying to find one with a
             // preferred path
         search:
             {
                 for (Iterator locIter = locationsInTree.iterator();

@@ -334,11 +327,11 @@
         String projectFileName = BuildConfig.getFieldString(null, "ProjectFileName");
         String ext = getProjectExt();
 
         String projectName = getProjectName(projectFileName, ext);
 
-        writeProjectFile(projectFileName, projectName, createAllConfigs());
+        writeProjectFile(projectFileName, projectName, createAllConfigs(BuildConfig.getFieldString(null, "PlatformName")));
     }
 
     protected void writePrologue(String[] args) {
         System.err.println("WinGammaPlatform platform-specific arguments:");
         for (int i = 0; i < args.length; i++) {

@@ -374,10 +367,16 @@
                               "BuildBase",
                               "   (Did you set the HotSpotBuildSpace environment variable?)",
                               HsArgHandler.STRING
                               ),
 
+              new HsArgRule("-platformName",
+                                      "PlatformName",
+                                      null,
+                                      HsArgHandler.STRING
+                                      ),
+
                 new HsArgRule("-projectFileName",
                               "ProjectFileName",
                               null,
                               HsArgHandler.STRING
                               ),

@@ -392,16 +391,10 @@
                               "CompilerVersion",
                               "   (Did you set the VcVersion correctly?)",
                               HsArgHandler.STRING
                               ),
 
-                new HsArgRule("-platform",
-                              "Platform",
-                              null,
-                              HsArgHandler.STRING
-                              ),
-
                 new HsArgRule("-absoluteInclude",
                               "AbsoluteInclude",
                               null,
                               HsArgHandler.VECTOR
                               ),

@@ -588,17 +581,15 @@
         }
 
         BuildConfig.putField(null, "PlatformObject", this);
     }
 
-    Vector createAllConfigs() {
+    Vector createAllConfigs(String platform) {
         Vector allConfigs = new Vector();
 
         allConfigs.add(new C1DebugConfig());
 
-        boolean b = true;
-        if (b) {
             allConfigs.add(new C1FastDebugConfig());
             allConfigs.add(new C1ProductConfig());
 
             allConfigs.add(new C2DebugConfig());
             allConfigs.add(new C2FastDebugConfig());

@@ -610,10 +601,11 @@
 
             allConfigs.add(new CoreDebugConfig());
             allConfigs.add(new CoreFastDebugConfig());
             allConfigs.add(new CoreProductConfig());
 
+        if (platform.equals("Win32")) {
             allConfigs.add(new KernelDebugConfig());
             allConfigs.add(new KernelFastDebugConfig());
             allConfigs.add(new KernelProductConfig());
         }