Using Common Definitions. Remove some unused codes.

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

diff --git a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
index d236c5b5bb586df335950045a0554e798e9dfae6..14de2d824ddfdab4d9930697434df1667e9e83f9 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/FrameworkBuildTask.java
@@ -27,6 +27,7 @@ import org.tianocore.build.fpd.FpdParserTask;
 import org.tianocore.build.global.GlobalData;\r
 import org.tianocore.build.toolchain.ConfigReader;\r
 import org.tianocore.build.toolchain.ToolChainInfo;\r
+import org.tianocore.common.definitions.ToolDefinitions;\r
 \r
 public class FrameworkBuildTask extends Task{\r
 \r
@@ -36,9 +37,11 @@ public class FrameworkBuildTask extends Task{
     \r
     private Set<File> msaFiles = new LinkedHashSet<File>();\r
     \r
-    String toolsDefFilename = "Tools" + File.separatorChar + "Conf" + File.separatorChar + "tools_def.txt";\r
+    String toolsDefFilename = ToolDefinitions.DEFAULT_TOOLS_DEF_FILE_PATH;\r
     \r
-    String targetFilename = "target.txt";\r
+    String targetFilename = ToolDefinitions.TARGET_FILE_PATH;\r
+    \r
+    String dbFilename = ToolDefinitions.FRAMEWORK_DATABASE_FILE_PATH;\r
     \r
     String activePlatform = null;\r
     \r
@@ -66,12 +69,12 @@ public class FrameworkBuildTask extends Task{
                         //\r
                         buildFiles.add(files[i]);\r
 \r
-                    } else if (files[i].getName().endsWith(".fpd")) {\r
+                    } else if (files[i].getName().endsWith(ToolDefinitions.FPD_EXTENSION)) {\r
                         //\r
                         // Second, search FPD file, if found, build it\r
                         //\r
                         fpdFiles.add(files[i]);\r
-                    } else if (files[i].getName().endsWith(".msa")) {\r
+                    } else if (files[i].getName().endsWith(ToolDefinitions.MSA_EXTENSION)) {\r
                         //\r
                         // Third, search MSA file, if found, build it\r
                         //\r
@@ -98,8 +101,7 @@ public class FrameworkBuildTask extends Task{
         //\r
         File workspacePath = new File(getProject().getProperty("WORKSPACE"));\r
         getProject().setProperty("WORKSPACE_DIR", workspacePath.getPath().replaceAll("(\\\\)", "/"));\r
-        GlobalData.initInfo("Tools" + File.separatorChar + "Conf" + File.separatorChar + "FrameworkDatabase.db",\r
-                workspacePath.getPath(), toolsDefFilename);\r
+        GlobalData.initInfo(dbFilename, workspacePath.getPath(), toolsDefFilename);\r
         \r
 \r
         \r
@@ -114,7 +116,7 @@ public class FrameworkBuildTask extends Task{
         if (msaFiles.size() > 1) {\r
             throw new BuildException("Having more than one MSA file in a directory is not allowed!");\r
         } else if (msaFiles.size() == 1 && activePlatform == null) {\r
-            throw new BuildException("If trying to build a single module, please set ACTIVE_PLATFORM in file [Tool/Conf/target.txt]. ");\r
+            throw new BuildException("If trying to build a single module, please set ACTIVE_PLATFORM in file [" + targetFilename + "]. ");\r
         } else if (msaFiles.size() == 1 && activePlatform != null) {\r
             //\r
             // Build the single module\r
@@ -137,7 +139,7 @@ public class FrameworkBuildTask extends Task{
         //\r
         // Build every FPD files (PLATFORM build)\r
         //\r
-        if (buildFile.getName().endsWith(".fpd")) {\r
+        if (buildFile.getName().endsWith(ToolDefinitions.FPD_EXTENSION)) {\r
             System.out.println("Processing the FPD file [" + buildFile.getPath() + "] ..>> ");\r
             FpdParserTask fpdParserTask = new FpdParserTask();\r
             fpdParserTask.setType(type);\r
@@ -149,7 +151,7 @@ public class FrameworkBuildTask extends Task{
         //\r
         // Build every MSA files (SINGLE MODULE BUILD)\r
         //\r
-        else if (buildFile.getName().endsWith(".msa")) {\r
+        else if (buildFile.getName().endsWith(ToolDefinitions.MSA_EXTENSION)) {\r
             File tmpFile = new File(GlobalData.getWorkspacePath() + File.separatorChar + activePlatform);\r
             System.out.println("Using the FPD file [" + tmpFile.getPath() + "] for the active platform. ");\r
             System.out.println("Processing the MSA file [" + buildFile.getPath() + "] ..>> ");\r
@@ -242,25 +244,27 @@ public class FrameworkBuildTask extends Task{
     \r
     private void readTargetFile(){\r
         try {\r
-            String[][] targetFileInfo = ConfigReader.parse(getProject().getProperty("WORKSPACE_DIR"), "Tools" + File.separatorChar + "Conf" + File.separatorChar + targetFilename);\r
+            String targetFile = getProject().getProperty("WORKSPACE_DIR") + File.separatorChar + targetFilename;\r
+            \r
+            String[][] targetFileInfo = ConfigReader.parse(targetFile);\r
             \r
             //\r
             // Get ToolChain Info from target.txt\r
             //\r
             ToolChainInfo envToolChainInfo = new ToolChainInfo(); \r
-            String str = getValue("TARGET", targetFileInfo);\r
+            String str = getValue(ToolDefinitions.TARGET_KEY_TARGET, targetFileInfo);\r
             if (str == null || str.trim().equals("")) {\r
                 envToolChainInfo.addTargets("*");\r
             } else {\r
                 envToolChainInfo.addTargets(str);\r
             }\r
-            str = getValue("TOOL_CHAIN_TAG", targetFileInfo);\r
+            str = getValue(ToolDefinitions.TARGET_KEY_TOOLCHAIN, targetFileInfo);\r
             if (str == null || str.trim().equals("")) {\r
                 envToolChainInfo.addTagnames("*");\r
             } else {\r
                 envToolChainInfo.addTagnames(str);\r
             }\r
-            str = getValue("TARGET_ARCH", targetFileInfo);\r
+            str = getValue(ToolDefinitions.TARGET_KEY_ARCH, targetFileInfo);\r
             if (str == null || str.trim().equals("")) {\r
                 envToolChainInfo.addArchs("*");\r
             } else {\r
@@ -268,15 +272,15 @@ public class FrameworkBuildTask extends Task{
             }\r
             GlobalData.setToolChainEnvInfo(envToolChainInfo);\r
             \r
-            str = getValue("TOOL_CHAIN_CONF", targetFileInfo);\r
+            str = getValue(ToolDefinitions.TARGET_KEY_TOOLS_DEF, targetFileInfo);\r
             if (str != null && str.trim().length() > 0) {\r
                 toolsDefFilename = str;\r
             }\r
             \r
-            str = getValue("ACTIVE_PLATFORM", targetFileInfo);\r
+            str = getValue(ToolDefinitions.TARGET_KEY_ACTIVE_PLATFORM, targetFileInfo);\r
             if (str != null && ! str.trim().equals("")) {\r
                 if ( ! str.endsWith(".fpd")) {\r
-                    throw new BuildException("FPD file's extension must be \".fpd\"!");\r
+                    throw new BuildException("FPD file's extension must be \"" + ToolDefinitions.FPD_EXTENSION + "\"!");\r
                 }\r
                 activePlatform = str;\r
             }\r