Temporary workaround--determine the target architecture from an environment variable...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@457 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
index 1f5e4ecf6d8e362e9eae18a7935a2a135c5234ac..f9340758b31931e021e058a33e536f3d940ede39 100644 (file)
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFvImageTask.java
@@ -56,17 +56,24 @@ public class GenFvImageTask extends Task implements EfiDefine{
             path = path + File.separatorChar;\r
         }\r
         \r
-        if (arch.equalsIgnoreCase("")){\r
-            command = path + "GenFvImage";\r
+        // FIXME arch should be passed via schema attributes.\r
+        arch=System.getenv("ARCH");\r
+        if (arch == null) {\r
+          arch = "";\r
         }\r
-        if (arch.equalsIgnoreCase("ia32")){\r
-            command = path + "GenFvImage_IA32";\r
+        // FIXME end\r
+\r
+        if (arch.equalsIgnoreCase("IA32")){\r
+            command = path + "GenFvImage_Ia32";\r
         }   \r
-        if (arch.equalsIgnoreCase("x64")){\r
+        else if (arch.equalsIgnoreCase("X64")){\r
             command = path + "GenFvImage_X64";\r
         }\r
-        if (arch.equalsIgnoreCase("ipf")){\r
-            command = path + "GenFvImage_IPF";\r
+        else if (arch.equalsIgnoreCase("IPF")){\r
+            command = path + "GenFvImage_Ipf";\r
+        }\r
+        else {\r
+            command = path + "GenFvImage";\r
         }\r
         String argument = infFile;\r
         \r
@@ -151,4 +158,4 @@ public class GenFvImageTask extends Task implements EfiDefine{
     public void setArch(String arch) {\r
         this.arch = arch;\r
     }   \r
-}
\ No newline at end of file
+}\r