Change GenBuildLogger format.

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / global / OutputManager.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
index 773fe3e94922b395e06c1fade0e6712af65704b7..2c70326202fdabf164573ff5ff5300d3fded99fd 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/global/OutputManager.java
@@ -86,7 +86,6 @@ public class OutputManager {
       @param type the module build type (MODULE or UNIFIED)\r
     **/\r
     public void update(Project project) {\r
-//        GlobalData.log.info("" + userdir + ":" + type);\r
         //\r
         // Default mode is UNIFIED. \r
         //\r
@@ -124,16 +123,18 @@ public class OutputManager {
             }\r
         }\r
         \r
+        //\r
+        // Define TARGET_DIR\r
+        //\r
+        String targetDir = buildDir + File.separatorChar + project.getProperty("TARGET")\r
+                                    + "_" + project.getProperty("TOOLCHAIN");\r
+        \r
         //\r
         // Define BIN_DIR and FV_DIR\r
         //\r
-        String binDir = buildDir + File.separatorChar + project.getProperty("TARGET")\r
-                                 + File.separatorChar + project.getProperty("TOOLCHAIN") \r
-                                 + File.separatorChar + project.getProperty("ARCH") ;\r
+        String binDir = targetDir + File.separatorChar + project.getProperty("ARCH") ;\r
         \r
-        String fvDir = buildDir + File.separatorChar + project.getProperty("TARGET")\r
-                                + File.separatorChar + project.getProperty("TOOLCHAIN") \r
-                                + File.separatorChar + "FV";\r
+        String fvDir = targetDir + File.separatorChar + "FV";\r
         \r
         //\r
         // Define DEST_DIR_OUTPUT and DEST_DIR_DEBUG\r
@@ -145,6 +146,7 @@ public class OutputManager {
         // Set properties\r
         //\r
         project.setProperty("BUILD_DIR", buildDir.replaceAll("(\\\\)", "/"));\r
+        project.setProperty("TARGET_DIR", targetDir.replaceAll("(\\\\)", "/"));\r
         project.setProperty("FV_DIR", fvDir.replaceAll("(\\\\)", "/"));\r
         project.setProperty("BIN_DIR", binDir.replaceAll("(\\\\)", "/"));\r
         project.setProperty("DEST_DIR_DEBUG", (destDir + File.separatorChar + "DEBUG").replaceAll("(\\\\)", "/"));\r
@@ -183,6 +185,7 @@ public class OutputManager {
                 buildDir = GlobalData.getWorkspacePath() + File.separatorChar + userdir;\r
             }\r
         }\r
+        \r
         //\r
         // Set to property\r
         //\r