Fixed MSA files so that they have unique names and removed extra copyright and license information in the comment - these are in the header.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@990 6f19259b-4bc3-4df7-8a09-765794883524
author: lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524> 2006-07-13 13:15:21 +0000
committer: lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524> 2006-07-13 13:15:21 +0000
commit: 20fa842edbba3d578298435cceefb68cf343c430 (patch)
tree: 2130f890ca9b54ba3161ae07d93012d21885ca98 /Tools
parent: 4aca4e8213549b6a91b80dfbe16601ef250d8287 (diff)
download: edk2-platforms-20fa842edbba3d578298435cceefb68cf343c430.tar.xz
7 files changed, 553 insertions, 623 deletions
diff --git a/Tools/Source/Common/Common.msa b/Tools/Source/Common/Common.msa
index 5c1b5f853c..fa7f93a5cf 100644
--- a/Tools/Source/Common/Common.msa
+++ b/Tools/Source/Common/Common.msa
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
     <ModuleName>Common Java Classes</ModuleName>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
-      This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
-      http://opensource.org/licenses/bsd-license.php
+All rights reserved.
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the 
+BSD License which accompanies this distribution.  The full text of the 
+license may be found at
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -43,10 +33,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <OutputFileBasename>NULL</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
-    <Filename>build.xml</Filename>
-    <Filename>org/tianocore/exception/EdkException.java</Filename>
-    <Filename>org/tianocore/logger/DefaultLogger.java</Filename>
-    <Filename>org/tianocore/logger/EdkLog.java</Filename>
-    <Filename>org/tianocore/logger/LogMethod.java</Filename>
+    <Filename>build.xml</Filename>
+    <Filename>org/tianocore/exception/EdkException.java</Filename>
+    <Filename>org/tianocore/logger/DefaultLogger.java</Filename>
+    <Filename>org/tianocore/logger/EdkLog.java</Filename>
+    <Filename>org/tianocore/logger/LogMethod.java</Filename>
   </SourceFiles>
 </ModuleSurfaceArea>
diff --git a/Tools/Source/Cpptasks/CppTasks.msa b/Tools/Source/Cpptasks/CppTasks.msa
index ac64cf872c..550f9e2182 100644
--- a/Tools/Source/Cpptasks/CppTasks.msa
+++ b/Tools/Source/Cpptasks/CppTasks.msa
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
     <ModuleName>CppTasks</ModuleName>
@@ -22,15 +12,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
-      This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
-      http://opensource.org/licenses/bsd-license.php
+All rights reserved.
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the 
+BSD License which accompanies this distribution.  The full text of the 
+license may be found at
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -40,190 +30,190 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <OutputFileBasename>NULL</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
-    <Filename>build.xml</Filename>
-    <Filename>cpptasks.mf</Filename>
-    <Filename>cpptasks.tasks</Filename>
-    <Filename>cpptasks.types</Filename>
-    <Filename>javadoc.xml</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/AboutCCTask.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ArchEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/arm/ADSLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/AslcompilerDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/AslcompilerEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/AssemblerDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/AssemblerEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/CCTask.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractAslcompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractAssembler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/Aslcompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/AslcompilerConfiguration.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/Assembler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/AssemblerConfiguration.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompilerConfiguration.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineAssembler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineAssemblerConfiguration.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/Compiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/Linker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/LinkType.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/Processor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/CompilerDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/CompilerEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/CompilerParam.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/CPUEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/CUtil.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/DependencyInfo.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/DependencyTable.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioAslcompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioAssembler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/DistributerDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/DistributerMap.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/FileVisitor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/GccAssembler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/GccLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/GccProcessor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/GppLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/gcc/LdLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/hp/aCCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/hp/aCCLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelProcessor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin32Aslcompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/LinkerDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/LinkerEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/LinkerParam.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ObjectFileCollector.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/OptimizationEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/os390/OS390Linker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/os390/OS390Processor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/os400/IccCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/os400/IccLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/os400/IccProcessor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/OSFamilyEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/OutputTypeEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/AbstractParser.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/AbstractParserState.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/BranchState.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/CParser.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/FilenameState.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/FortranParser.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/LetterState.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/Parser.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/PostE.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/PrecompileDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/PrecompileExceptDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ProcessorDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ProcessorEnumValue.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ProcessorParam.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/RuntimeType.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/SourceHistory.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/SubsystemEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/sun/C89CCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/sun/C89Linker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/sun/C89Processor.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/TargetDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/TargetHistory.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/TargetHistoryTable.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/TargetInfo.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/TargetMatcher.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/ti/ClxxLinker.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/AslcompilerArgument.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/AssemblerArgument.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/CommandLineArgument.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/CompilerArgument.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/ConditionalPath.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/DefineArgument.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/DefineSet.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/FlexLong.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/IncludePath.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/LibrarySet.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/LinkerArgument.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/SystemIncludePath.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/types/UndefineArgument.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/userdefine/UserDefineArgument.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/userdefine/UserDefineCompiler.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/userdefine/UserDefineDef.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java</Filename>
-    <Filename>net/sf/antcontrib/cpptasks/VersionInfo.java</Filename>
+    <Filename>build.xml</Filename>
+    <Filename>cpptasks.mf</Filename>
+    <Filename>cpptasks.tasks</Filename>
+    <Filename>cpptasks.types</Filename>
+    <Filename>javadoc.xml</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/AboutCCTask.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ArchEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/arm/ADSCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/arm/ADSLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/arm/ADSLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/AslcompilerDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/AslcompilerEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/AssemblerDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/AssemblerEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandCfgParser.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/borland/CfgFilenameState.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/borland/ConsumeToSpaceOrNewLine.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/borland/QuoteBranchState.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/CCTask.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/CCTaskProgressMonitor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compaq/CompaqVisualFortranLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractAslcompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractAssembler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/AbstractProcessor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/Aslcompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/AslcompilerConfiguration.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/Assembler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/AssemblerConfiguration.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CaptureStreamHandler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineAslcompilerConfiguration.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineAssembler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineAssemblerConfiguration.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineCompilerConfiguration.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineFortranCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CommandLineLinkerConfiguration.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/Compiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/CompilerConfiguration.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/Linker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/LinkerConfiguration.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/LinkType.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/PrecompilingCommandLineCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/PrecompilingCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/Processor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/ProcessorConfiguration.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/compiler/ProgressMonitor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/CompilerDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/CompilerEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/CompilerParam.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/CPUEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/CUtil.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/DependencyInfo.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/DependencyTable.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioAslcompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioAssembler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioCompatibleLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioMIDLCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioProcessor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/devstudio/DevStudioResourceCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/DistributerDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/DistributerMap.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/DistributerProtocolEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/FileVisitor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/AbstractArLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/AbstractLdLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GccLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GccLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GccProcessor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/GppLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/LdLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccProcessor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GppLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/LdLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/GccAssembler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/GccLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/GccLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/GccProcessor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/GppLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/gcc/LdLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/hp/aCCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/hp/aCCLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ibm/VisualAgeLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelLinux32CCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelLinux32Linker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelLinux64CCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelLinux64Linker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelProcessor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin32Aslcompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin32Librarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin32Linker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/LinkerDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/LinkerEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/LinkerParam.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ObjectFileCollector.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/OptimizationEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/os390/OS390CCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/os390/OS390Linker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/os390/OS390Processor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/os400/IccCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/os400/IccLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/os400/IccProcessor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/OSFamilyEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/OutputTypeEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/AbstractParser.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/AbstractParserState.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/BranchState.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/CaseInsensitiveLetterState.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/CParser.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/FilenameState.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/FortranParser.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/LetterState.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/Parser.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/PostE.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/WhitespaceOrCaseInsensitiveLetterState.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/parser/WhitespaceOrLetterState.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/PrecompileDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/PrecompileExceptDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ProcessorDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ProcessorEnumValue.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ProcessorParam.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/RuntimeType.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/SourceHistory.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/SubsystemEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/sun/C89CCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/sun/C89Linker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/sun/C89Processor.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/sun/ForteCCLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/TargetDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/TargetHistory.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/TargetHistoryTable.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/TargetInfo.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/TargetMatcher.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ti/ClxxCCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ti/ClxxLibrarian.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/ti/ClxxLinker.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/AslcompilerArgument.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/AssemblerArgument.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/CommandLineArgument.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/CompilerArgument.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/ConditionalFileSet.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/ConditionalPath.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/DefineArgument.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/DefineSet.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/FlexLong.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/IncludePath.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/LibrarySet.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/LibraryTypeEnum.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/LinkerArgument.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/SystemIncludePath.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/SystemLibrarySet.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/types/UndefineArgument.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/userdefine/CommandLineUserDefine.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/userdefine/UserDefineArgument.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/userdefine/UserDefineCompiler.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/userdefine/UserDefineDef.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/userdefine/UserDefineMapping.java</Filename>
+    <Filename>net/sf/antcontrib/cpptasks/VersionInfo.java</Filename>
   </SourceFiles>
 </ModuleSurfaceArea>
diff --git a/Tools/Source/FrameworkTasks/FrameworkTasks.msa b/Tools/Source/FrameworkTasks/FrameworkTasks.msa
index 3567b11391..eb5fe8be0f 100644
--- a/Tools/Source/FrameworkTasks/FrameworkTasks.msa
+++ b/Tools/Source/FrameworkTasks/FrameworkTasks.msa
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
     <ModuleName>Framework Tasks</ModuleName>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
-      This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
-      http://opensource.org/licenses/bsd-license.php
+All rights reserved.
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the 
+BSD License which accompanies this distribution.  The full text of the 
+license may be found at
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -43,50 +33,50 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <OutputFileBasename>NULL</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
-    <Filename>build.xml</Filename>
-    <Filename>frameworktasks.tasks</Filename>
-    <Filename>org/tianocore/framework/tasks/Compress.java</Filename>
-    <Filename>org/tianocore/framework/tasks/CompressHeader.java</Filename>
-    <Filename>org/tianocore/framework/tasks/CompressSection.java</Filename>
-    <Filename>org/tianocore/framework/tasks/CreateMtFileTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/Database.java</Filename>
-    <Filename>org/tianocore/framework/tasks/EfiCompressTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/EfiDefine.java</Filename>
-    <Filename>org/tianocore/framework/tasks/EfiRomTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/FfsHeader.java</Filename>
-    <Filename>org/tianocore/framework/tasks/FfsTypes.java</Filename>
-    <Filename>org/tianocore/framework/tasks/FileParser.java</Filename>
-    <Filename>org/tianocore/framework/tasks/FlashMapTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/FrameworkLogger.java</Filename>
-    <Filename>org/tianocore/framework/tasks/FwImageTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/GenAcpiTableTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/GenCapsuleHdrTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/GenCRC32SectionTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/GenDepexTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/GenFfsFileTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/GenFvImageTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/GenSectionTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/GenTeImageTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/GuidChkTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/IncludePath.java</Filename>
-    <Filename>org/tianocore/framework/tasks/Input.java</Filename>
-    <Filename>org/tianocore/framework/tasks/InputFile.java</Filename>
-    <Filename>org/tianocore/framework/tasks/MakeDeps.java</Filename>
-    <Filename>org/tianocore/framework/tasks/NestElement.java</Filename>
-    <Filename>org/tianocore/framework/tasks/PeiReBaseTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/SecApResetVectorFixupTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/SecFixupTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/SectFile.java</Filename>
-    <Filename>org/tianocore/framework/tasks/Section.java</Filename>
-    <Filename>org/tianocore/framework/tasks/SetStampTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/SkipExt.java</Filename>
-    <Filename>org/tianocore/framework/tasks/SplitfileTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/StrGatherTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/StripTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/Tool.java</Filename>
-    <Filename>org/tianocore/framework/tasks/ToolArg.java</Filename>
-    <Filename>org/tianocore/framework/tasks/VfrCompilerTask.java</Filename>
+    <Filename>build.xml</Filename>
+    <Filename>frameworktasks.tasks</Filename>
+    <Filename>org/tianocore/framework/tasks/Compress.java</Filename>
+    <Filename>org/tianocore/framework/tasks/CompressHeader.java</Filename>
+    <Filename>org/tianocore/framework/tasks/CompressSection.java</Filename>
+    <Filename>org/tianocore/framework/tasks/CreateMtFileTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/Database.java</Filename>
+    <Filename>org/tianocore/framework/tasks/EfiCompressTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/EfiDefine.java</Filename>
+    <Filename>org/tianocore/framework/tasks/EfiRomTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/FfsHeader.java</Filename>
+    <Filename>org/tianocore/framework/tasks/FfsTypes.java</Filename>
+    <Filename>org/tianocore/framework/tasks/FileParser.java</Filename>
+    <Filename>org/tianocore/framework/tasks/FlashMapTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/FrameworkLogger.java</Filename>
+    <Filename>org/tianocore/framework/tasks/FwImageTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/GenAcpiTableTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/GenCapsuleHdrTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/GenCRC32SectionTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/GenDepexTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/GenFfsFileTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/GenFvImageTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/GenSectionTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/GenTeImageTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/GuidChkTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/IncludePath.java</Filename>
+    <Filename>org/tianocore/framework/tasks/Input.java</Filename>
+    <Filename>org/tianocore/framework/tasks/InputFile.java</Filename>
+    <Filename>org/tianocore/framework/tasks/MakeDeps.java</Filename>
+    <Filename>org/tianocore/framework/tasks/NestElement.java</Filename>
+    <Filename>org/tianocore/framework/tasks/PeiReBaseTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/SecApResetVectorFixupTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/SecFixupTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/SectFile.java</Filename>
+    <Filename>org/tianocore/framework/tasks/Section.java</Filename>
+    <Filename>org/tianocore/framework/tasks/SetStampTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/SkipExt.java</Filename>
+    <Filename>org/tianocore/framework/tasks/SplitfileTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/StrGatherTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/StripTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/Tool.java</Filename>
+    <Filename>org/tianocore/framework/tasks/ToolArg.java</Filename>
+    <Filename>org/tianocore/framework/tasks/VfrCompilerTask.java</Filename>
     <Filename>org/tianocore/framework/tasks/ZeroDebugDataTask.java</Filename>
-    <Filename>org/tianocore/framework/tasks/ModifyInfTask.java</Filename>
+    <Filename>org/tianocore/framework/tasks/ModifyInfTask.java</Filename>
   </SourceFiles>
 </ModuleSurfaceArea>
diff --git a/Tools/Source/FrameworkWizard/FrameworkWizard.msa b/Tools/Source/FrameworkWizard/FrameworkWizard.msa
index 1bfd716e09..233289b308 100644
--- a/Tools/Source/FrameworkWizard/FrameworkWizard.msa
+++ b/Tools/Source/FrameworkWizard/FrameworkWizard.msa
@@ -1,219 +1,209 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
-  <MsaHeader>
-    <ModuleName>Framework Wizard</ModuleName>
-    <ModuleType>TOOL</ModuleType>
-    <GuidValue>EAC548CB-1B55-4d32-B3E1-F790095BF590</GuidValue>
-    <Version>2.0</Version>
-    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>
-    <Description>
-      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano
-      Modules and Platform Binary Files (PBF)
-      These tools require compilation only once if the Developer Workstation and
-      the Developer's choice of HOST tool chain are stable.  If the developer
-      updates either the OS or the HOST tool chain, these tools should be rebuilt.
-    </Description>
-    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
-    <License>
-      All rights reserved.
-      This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
-      http://opensource.org/licenses/bsd-license.php
-
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-    </License>
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
-  </MsaHeader>
-  <ModuleDefinitions>
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
-    <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>NULL</OutputFileBasename>
-  </ModuleDefinitions>
-  <SourceFiles>
-    <Filename>build.xml</Filename>
-    <Filename>FrameworkWizard.msa</Filename>
-    <Filename>MANIFEST.MF</Filename>
-    <Filename>rsc/resources/images/logo.gif</Filename>
-    <Filename>rsc/resources/images/No.JPG</Filename>
-    <Filename>rsc/resources/images/Yes.JPG</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/About.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/Clone.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/FrameworkWizardUI.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/NewFileChooser.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/SelectModuleBelong.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/ToolChainConfig.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/DataType.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/DataValidation.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/EnumerationData.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/FileOperation.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/IDefaultTableModel.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/IFileFilter.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Log.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/SaveFile.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Tools.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/XmlConfig.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/Identification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpenFile.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningFileType.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleType.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageType.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformType.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigId.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/ArchCheckBox.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/ExitConfirm.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/IComboBox.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/IDefaultMutableTreeNode.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/IDesktopManager.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/IDialog.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/IFrame.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/IInternalFrame.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/ITree.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/StarLabel.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxList.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListCellRenderer.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListener.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListItem.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListModel.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/AggregationOperation.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/DistributeRule.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/Far.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/FarFileItem.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/FarHeader.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/FarIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/FarInterface.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/FarMd5.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/FarPackage.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/FarPlatformItem.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/Mainfest.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/ManifestInterface.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/PackageQuery.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/PackageQueryInterface.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesVector.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleDefinitions.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/PackageIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/PlatformIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/DynamicTree.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/global/Spd.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/FpdModuleIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/Identification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/ModuleIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/PackageIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/PlatformIdentification.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/workspace/Workspace.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java</Filename>
-    <Filename>src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java</Filename>
-  </SourceFiles>
-</ModuleSurfaceArea>
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
+  <MsaHeader>
+    <ModuleName>Framework Wizard</ModuleName>
+    <ModuleType>TOOL</ModuleType>
+    <GuidValue>EAC548CB-1B55-4d32-B3E1-F790095BF590</GuidValue>
+    <Version>2.0</Version>
+    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>
+    <Description>
+      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano
+      Modules and Platform Binary Files (PBF)
+      These tools require compilation only once if the Developer Workstation and
+      the Developer's choice of HOST tool chain are stable.  If the developer
+      updates either the OS or the HOST tool chain, these tools should be rebuilt.
+    </Description>
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
+    <License>
+All rights reserved.
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the 
+BSD License which accompanies this distribution.  The full text of the 
+license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+    </License>
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
+  </MsaHeader>
+  <ModuleDefinitions>
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
+    <BinaryModule>false</BinaryModule>
+    <OutputFileBasename>NULL</OutputFileBasename>
+  </ModuleDefinitions>
+  <SourceFiles>
+    <Filename>build.xml</Filename>
+    <Filename>FrameworkWizard.msa</Filename>
+    <Filename>MANIFEST.MF</Filename>
+    <Filename>rsc/resources/images/logo.gif</Filename>
+    <Filename>rsc/resources/images/No.JPG</Filename>
+    <Filename>rsc/resources/images/Yes.JPG</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/About.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/Clone.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/FrameworkWizardUI.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/NewFileChooser.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/SelectModuleBelong.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/ToolChainConfig.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/ToolChainConfigHelp.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/DataType.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/DataValidation.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/EnumerationData.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/FileOperation.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/IDefaultTableModel.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/IFileFilter.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Log.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/SaveFile.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Tools.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/XmlConfig.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/Identification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpenFile.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningFileType.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleType.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageList.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningPackageType.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformList.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningPlatformType.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigId.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/ToolChainConfigVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/ArchCheckBox.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/ExitConfirm.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/IComboBox.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/IDefaultMutableTreeNode.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/IDesktopManager.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/IDialog.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/IFrame.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/IInternalFrame.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/ITree.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/StarLabel.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxList.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListCellRenderer.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListener.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListItem.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/ui/iCheckBoxList/ICheckBoxListModel.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/AggregationOperation.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/DistributeRule.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/Far.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/FarFileItem.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/FarHeader.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/FarIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/FarInterface.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/FarMd5.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/FarPackage.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/FarPlatformItem.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/Mainfest.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/ManifestInterface.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/PackageQuery.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/PackageQueryInterface.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/BootModes/BootModesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/DataHubs/DataHubsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Events/EventsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Externs/ExternsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Guids/GuidsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/HiiPackages/HiiPackagesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Hobs/HobsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/PackageDependencies/PackageDependenciesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/PcdCoded/PcdCodedVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Ppis/PpisVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Protocols/ProtocolsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/SystemTables/SystemTablesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identifications/Variables/VariablesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleDefinitions.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/MsaHeader.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/PackageIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageDefinitions.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdPpiDecls.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/packaging/ui/SpdProtocolDecls.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/PlatformIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/DynamicTree.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/GenListDialog.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/ListEditor.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/global/Spd.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/FpdModuleIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/Identification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/ModuleIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/PackageIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/platform/ui/id/PlatformIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/workspace/Workspace.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java</Filename>
+  </SourceFiles>
+</ModuleSurfaceArea>
diff --git a/Tools/Source/GenBuild/GenBuild.msa b/Tools/Source/GenBuild/GenBuild.msa
index a0e043bda4..0fe46bb6cb 100644
--- a/Tools/Source/GenBuild/GenBuild.msa
+++ b/Tools/Source/GenBuild/GenBuild.msa
@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
     <ModuleName>GenBuild</ModuleName>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
-      This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
-      http://opensource.org/licenses/bsd-license.php
+All rights reserved.
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the 
+BSD License which accompanies this distribution.  The full text of the 
+license may be found at
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -43,64 +33,64 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <OutputFileBasename>NULL</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
-    <Filename>build.xml</Filename>
-    <Filename>GenBuild.tasks</Filename>
-    <Filename>org/tianocore/build/autogen/AutoGen.java</Filename>
-    <Filename>org/tianocore/build/autogen/AutogenLibOrder.java</Filename>
-    <Filename>org/tianocore/build/autogen/CommonDefinition.java</Filename>
-    <Filename>org/tianocore/build/exception/AutoGenException.java</Filename>
-    <Filename>org/tianocore/build/exception/EdkException.java</Filename>
-    <Filename>org/tianocore/build/exception/GenBuildException.java</Filename>
-    <Filename>org/tianocore/build/exception/PcdAutogenException.java</Filename>
-    <Filename>org/tianocore/build/exception/TianoToolsException.java</Filename>
-    <Filename>org/tianocore/build/exception/XmlParseException.java</Filename>
-    <Filename>org/tianocore/build/FfsProcess.java</Filename>
-    <Filename>org/tianocore/build/FileProcess.java</Filename>
-    <Filename>org/tianocore/build/fpd/FpdParserTask.java</Filename>
-    <Filename>org/tianocore/build/fpd/PlatformBuildFileGenerator.java</Filename>
-    <Filename>org/tianocore/build/FrameworkBuildTask.java</Filename>
-    <Filename>org/tianocore/build/GenBuildTask.java</Filename>
-    <Filename>org/tianocore/build/global/DpFile.java</Filename>
-    <Filename>org/tianocore/build/global/DpFileList.java</Filename>
-    <Filename>org/tianocore/build/global/GenBuildLogger.java</Filename>
-    <Filename>org/tianocore/build/global/GlobalData.java</Filename>
-    <Filename>org/tianocore/build/global/OnDependency.java</Filename>
-    <Filename>org/tianocore/build/global/OutputManager.java</Filename>
-    <Filename>org/tianocore/build/global/Spd.java</Filename>
-    <Filename>org/tianocore/build/global/SurfaceAreaQuery.java</Filename>
-    <Filename>org/tianocore/build/global/VariableTask.java</Filename>
-    <Filename>org/tianocore/build/id/FpdModuleIdentification.java</Filename>
-    <Filename>org/tianocore/build/id/Identification.java</Filename>
-    <Filename>org/tianocore/build/id/ModuleIdentification.java</Filename>
-    <Filename>org/tianocore/build/id/PackageIdentification.java</Filename>
-    <Filename>org/tianocore/build/id/PlatformIdentification.java</Filename>
-    <Filename>org/tianocore/build/ModuleBuildFileGenerator.java</Filename>
-    <Filename>org/tianocore/build/OutputDirSetup.java</Filename>
-    <Filename>org/tianocore/build/pcd/action/ActionMessage.java</Filename>
-    <Filename>org/tianocore/build/pcd/action/BuildAction.java</Filename>
-    <Filename>org/tianocore/build/pcd/action/CollectPCDAction.java</Filename>
-    <Filename>org/tianocore/build/pcd/action/PCDAutoGenAction.java</Filename>
-    <Filename>org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java</Filename>
-    <Filename>org/tianocore/build/pcd/action/UIAction.java</Filename>
-    <Filename>org/tianocore/build/pcd/entity/DynamicTokenValue.java</Filename>
-    <Filename>org/tianocore/build/pcd/entity/MemoryDatabaseManager.java</Filename>
-    <Filename>org/tianocore/build/pcd/entity/SkuInstance.java</Filename>
-    <Filename>org/tianocore/build/pcd/entity/Token.java</Filename>
-    <Filename>org/tianocore/build/pcd/entity/UsageInstance.java</Filename>
-    <Filename>org/tianocore/build/pcd/exception/BuildActionException.java</Filename>
-    <Filename>org/tianocore/build/pcd/exception/EntityException.java</Filename>
-    <Filename>org/tianocore/build/pcd/exception/UIException.java</Filename>
-    <Filename>org/tianocore/build/pcd/ui/PCDDatabaseFrame.java</Filename>
-    <Filename>org/tianocore/build/toolchain/ConfigReader.java</Filename>
-    <Filename>org/tianocore/build/toolchain/ToolChainAttribute.java</Filename>
-    <Filename>org/tianocore/build/toolchain/ToolChainConfig.java</Filename>
-    <Filename>org/tianocore/build/toolchain/ToolChainElement.java</Filename>
-    <Filename>org/tianocore/build/toolchain/ToolChainInfo.java</Filename>
-    <Filename>org/tianocore/build/toolchain/ToolChainKey.java</Filename>
-    <Filename>org/tianocore/build/toolchain/ToolChainMap.java</Filename>
-    <Filename>org/tianocore/build/toolchain/ToolChainTask.java</Filename>
-    <Filename>org/tianocore/build/tools/DefaultBuildFileGenerator.java</Filename>
-    <Filename>org/tianocore/build/tools/ModuleItem.java</Filename>
-    <Filename>org/tianocore/build/tools/PackageItem.java</Filename>
+    <Filename>build.xml</Filename>
+    <Filename>GenBuild.tasks</Filename>
+    <Filename>org/tianocore/build/autogen/AutoGen.java</Filename>
+    <Filename>org/tianocore/build/autogen/AutogenLibOrder.java</Filename>
+    <Filename>org/tianocore/build/autogen/CommonDefinition.java</Filename>
+    <Filename>org/tianocore/build/exception/AutoGenException.java</Filename>
+    <Filename>org/tianocore/build/exception/EdkException.java</Filename>
+    <Filename>org/tianocore/build/exception/GenBuildException.java</Filename>
+    <Filename>org/tianocore/build/exception/PcdAutogenException.java</Filename>
+    <Filename>org/tianocore/build/exception/TianoToolsException.java</Filename>
+    <Filename>org/tianocore/build/exception/XmlParseException.java</Filename>
+    <Filename>org/tianocore/build/FfsProcess.java</Filename>
+    <Filename>org/tianocore/build/FileProcess.java</Filename>
+    <Filename>org/tianocore/build/fpd/FpdParserTask.java</Filename>
+    <Filename>org/tianocore/build/fpd/PlatformBuildFileGenerator.java</Filename>
+    <Filename>org/tianocore/build/FrameworkBuildTask.java</Filename>
+    <Filename>org/tianocore/build/GenBuildTask.java</Filename>
+    <Filename>org/tianocore/build/global/DpFile.java</Filename>
+    <Filename>org/tianocore/build/global/DpFileList.java</Filename>
+    <Filename>org/tianocore/build/global/GenBuildLogger.java</Filename>
+    <Filename>org/tianocore/build/global/GlobalData.java</Filename>
+    <Filename>org/tianocore/build/global/OnDependency.java</Filename>
+    <Filename>org/tianocore/build/global/OutputManager.java</Filename>
+    <Filename>org/tianocore/build/global/Spd.java</Filename>
+    <Filename>org/tianocore/build/global/SurfaceAreaQuery.java</Filename>
+    <Filename>org/tianocore/build/global/VariableTask.java</Filename>
+    <Filename>org/tianocore/build/id/FpdModuleIdentification.java</Filename>
+    <Filename>org/tianocore/build/id/Identification.java</Filename>
+    <Filename>org/tianocore/build/id/ModuleIdentification.java</Filename>
+    <Filename>org/tianocore/build/id/PackageIdentification.java</Filename>
+    <Filename>org/tianocore/build/id/PlatformIdentification.java</Filename>
+    <Filename>org/tianocore/build/ModuleBuildFileGenerator.java</Filename>
+    <Filename>org/tianocore/build/OutputDirSetup.java</Filename>
+    <Filename>org/tianocore/build/pcd/action/ActionMessage.java</Filename>
+    <Filename>org/tianocore/build/pcd/action/BuildAction.java</Filename>
+    <Filename>org/tianocore/build/pcd/action/CollectPCDAction.java</Filename>
+    <Filename>org/tianocore/build/pcd/action/PCDAutoGenAction.java</Filename>
+    <Filename>org/tianocore/build/pcd/action/ShowPCDDatabaseAction.java</Filename>
+    <Filename>org/tianocore/build/pcd/action/UIAction.java</Filename>
+    <Filename>org/tianocore/build/pcd/entity/DynamicTokenValue.java</Filename>
+    <Filename>org/tianocore/build/pcd/entity/MemoryDatabaseManager.java</Filename>
+    <Filename>org/tianocore/build/pcd/entity/SkuInstance.java</Filename>
+    <Filename>org/tianocore/build/pcd/entity/Token.java</Filename>
+    <Filename>org/tianocore/build/pcd/entity/UsageInstance.java</Filename>
+    <Filename>org/tianocore/build/pcd/exception/BuildActionException.java</Filename>
+    <Filename>org/tianocore/build/pcd/exception/EntityException.java</Filename>
+    <Filename>org/tianocore/build/pcd/exception/UIException.java</Filename>
+    <Filename>org/tianocore/build/pcd/ui/PCDDatabaseFrame.java</Filename>
+    <Filename>org/tianocore/build/toolchain/ConfigReader.java</Filename>
+    <Filename>org/tianocore/build/toolchain/ToolChainAttribute.java</Filename>
+    <Filename>org/tianocore/build/toolchain/ToolChainConfig.java</Filename>
+    <Filename>org/tianocore/build/toolchain/ToolChainElement.java</Filename>
+    <Filename>org/tianocore/build/toolchain/ToolChainInfo.java</Filename>
+    <Filename>org/tianocore/build/toolchain/ToolChainKey.java</Filename>
+    <Filename>org/tianocore/build/toolchain/ToolChainMap.java</Filename>
+    <Filename>org/tianocore/build/toolchain/ToolChainTask.java</Filename>
+    <Filename>org/tianocore/build/tools/DefaultBuildFileGenerator.java</Filename>
+    <Filename>org/tianocore/build/tools/ModuleItem.java</Filename>
+    <Filename>org/tianocore/build/tools/PackageItem.java</Filename>
   </SourceFiles>
 </ModuleSurfaceArea>
diff --git a/Tools/Source/SurfaceArea/SurfaceArea.msa b/Tools/Source/SurfaceArea/SurfaceArea.msa
index c9ff39d3fb..da51e90603 100644
--- a/Tools/Source/SurfaceArea/SurfaceArea.msa
+++ b/Tools/Source/SurfaceArea/SurfaceArea.msa
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
-    <ModuleName>GenBuild</ModuleName>
+    <ModuleName>Surface Area Build</ModuleName>
     <ModuleType>TOOL</ModuleType>
     <GuidValue>C21A4ED4-491E-4602-BF94-698EA54F254B</GuidValue>
     <Version>2.0</Version>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
-      This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
-      http://opensource.org/licenses/bsd-license.php
+All rights reserved.
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the 
+BSD License which accompanies this distribution.  The full text of the 
+license may be found at
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -43,6 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <OutputFileBasename>NULL</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
-    <Filename>build.xml</Filename>
+    <Filename>build.xml</Filename>
   </SourceFiles>
 </ModuleSurfaceArea>
diff --git a/Tools/Source/TianoTools/TianoTools.msa b/Tools/Source/TianoTools/TianoTools.msa
index 1ef2c5f99d..8159428fdc 100644
--- a/Tools/Source/TianoTools/TianoTools.msa
+++ b/Tools/Source/TianoTools/TianoTools.msa
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
--->
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
   <MsaHeader>
-    <ModuleName>GenBuild</ModuleName>
+    <ModuleName>Tiano C Tools</ModuleName>
     <ModuleType>TOOL</ModuleType>
     <GuidValue>A169C678-3F55-4b6a-80BF-FD8B8DCAB883</GuidValue>
     <Version>2.0</Version>
@@ -25,15 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </Description>
     <Copyright>Copyright 2006, Intel Corporation</Copyright>
     <License>
-      All rights reserved.
-      This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the 
-      BSD License which accompanies this distribution.  The full text of the 
-      license may be found at
-      http://opensource.org/licenses/bsd-license.php
+All rights reserved.
+This program and the accompanying materials
+are licensed and made available under the terms and conditions of the 
+BSD License which accompanies this distribution.  The full text of the 
+license may be found at
+http://opensource.org/licenses/bsd-license.php
 
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
author	lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>	2006-07-13 13:15:21 +0000
committer	lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>	2006-07-13 13:15:21 +0000
commit	20fa842edbba3d578298435cceefb68cf343c430 (patch)
tree	2130f890ca9b54ba3161ae07d93012d21885ca98 /Tools
parent	4aca4e8213549b6a91b80dfbe16601ef250d8287 (diff)
download	edk2-platforms-20fa842edbba3d578298435cceefb68cf343c430.tar.xz