]> git.proxmox.com Git - mirror_edk2.git/commitdiff
Updated the SPD and MSA files for Tools - created some new MSA files as well.
authorlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 4 Jul 2006 04:13:48 +0000 (04:13 +0000)
committerlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Tue, 4 Jul 2006 04:13:48 +0000 (04:13 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@731 6f19259b-4bc3-4df7-8a09-765794883524

Tools/JavaResources.msa
Tools/Source/Common/Common.msa [new file with mode: 0644]
Tools/Source/Cpptasks/CppTasks.msa [new file with mode: 0644]
Tools/Source/FrameworkTasks/FrameworkTasks.msa [new file with mode: 0644]
Tools/Source/FrameworkWizard/FrameworkWizard.msa [new file with mode: 0644]
Tools/Source/GenBuild/GenBuild.msa [new file with mode: 0644]
Tools/Source/Tools.msa [deleted file]
Tools/ToolResources.msa
Tools/Tools.spd

index d3fc29d5525944589a6afeeb7c13bf6948fd4946..7696cbd6cce931fb44690bceefa1f80b99795315 100644 (file)
@@ -1,58 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >\r
   <MsaHeader>\r
-    <BaseName>JavaResources</BaseName>\r
-    <ModuleType>BASE</ModuleType>\r
-    <ComponentType>CUSTOM_BUILD</ComponentType>\r
-    <Guid>faf22a0f-10fc-428e-b311-fe506a9c0b2d</Guid>\r
+    <ModuleName>Java Resources</ModuleName>\r
+    <ModuleType>TOOL</ModuleType>\r
+    <GuidValue>faf22a0f-10fc-428e-b311-fe506a9c0b2d</GuidValue>\r
     <Version>2.0</Version>\r
-    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>\r
+    <Abstract>This is the EFI/Tiano Java Tool Resources Module</Abstract>\r
     <Description>\r
-      This Module provides the EFI/Tiano Tools and resources that are used to create EFI/Tiano\r
-      Modules and Platform Binary Files (PBF)\r
-      These resources and tools do not require compilation.  (The three JAR files are provided,\r
-      Pre-compiled, and do not require additional compilation, the sources are provided, but\r
-      will not be built under normal procedures.\r
+      This Module provides the EFI/Tiano Tools and resources that are used to \r
+      create EFI/Tiano Modules and Platform Binary Files (PBF.)\r
+      These resources and tools do not require compilation.\r
     </Description>\r
     <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>\r
     <License>\r
-      All rights reserved. This program and the accompanying materials\r
-      are licensed and made available under the terms and conditions of the BSD License\r
-      which accompanies this distribution.  The full text of the license may be found at\r
+      All rights reserved.\r
+\r
+      This program and the accompanying materials are licensed and made available \r
+      under the terms and conditions of the BSD License which accompanies this \r
+      distribution.  The full text of the license may be found at\r
       http://opensource.org/licenses/bsd-license.php\r
+\r
       THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
     </License>\r
-    <CreatedDate>2006-03-23 12:00</CreatedDate>\r
-    <ModifiedDate>2006-06-01 17:25</ModifiedDate>\r
-    <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </MsaHeader>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">SurfaceArea</LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename Path="Conf" FileType="db">FrameworkDatabase.db</Filename>\r
-    <Filename Path="Conf" FileType="txt">cygwin_tools.txt</Filename>\r
-    <Filename Path="Conf" FileType="txt">gcc_tools.txt</Filename>\r
-    <Filename Path="Conf" FileType="txt">intel_tools.txt</Filename>\r
-    <Filename Path="Conf" FileType="txt">msft_tools.txt</Filename>\r
-    <Filename Path="Conf" FileType="txt">tools_def.template</Filename>\r
-    <Filename Path="Conf" FileType="txt">winddk_tools.txt</Filename>\r
-  </SourceFiles>\r
-  <Includes>\r
-    <PackageName>Base</PackageName>\r
-  </Includes>\r
-  <BuildOptions>\r
-    <Option>DO_NOT_COMPILE</Option>\r
-  </BuildOptions>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>IA32 X64</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>NULL</OutputFileBasename>\r
+  </ModuleDefinitions>\r
 </ModuleSurfaceArea>\r
diff --git a/Tools/Source/Common/Common.msa b/Tools/Source/Common/Common.msa
new file mode 100644 (file)
index 0000000..7b0d63f
--- /dev/null
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >\r
+  <MsaHeader>\r
+    <ModuleName>Common Java Classes</ModuleName>\r
+    <ModuleType>TOOL</ModuleType>\r
+    <GuidValue>5d6c499e-53fd-430e-9285-2d7811b924e8</GuidValue>\r
+    <Version>2.0</Version>\r
+    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>\r
+    <Description>\r
+      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano\r
+      Modules and Platform Binary Files (PBF)\r
+      These tools require compilation only once if the Developer Workstation and\r
+      the Developer's choice of HOST tool chain are stable.  If the developer\r
+      updates either the OS or the HOST tool chain, these tools should be rebuilt.\r
+    </Description>\r
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>\r
+    <License>\r
+      All rights reserved.\r
+      This program and the accompanying materials\r
+      are licensed and made available under the terms and conditions of the \r
+      BSD License which accompanies this distribution.  The full text of the \r
+      license may be found at\r
+      http://opensource.org/licenses/bsd-license.php\r
+\r
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+    </License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </MsaHeader>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>NULL</OutputFileBasename>\r
+  </ModuleDefinitions>\r
+  <SourceFiles>\r
+    <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>\r
+</ModuleSurfaceArea>\r
diff --git a/Tools/Source/Cpptasks/CppTasks.msa b/Tools/Source/Cpptasks/CppTasks.msa
new file mode 100644 (file)
index 0000000..270b330
--- /dev/null
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >\r
+  <MsaHeader>\r
+    <ModuleName>CppTasks</ModuleName>\r
+    <ModuleType>TOOL</ModuleType>\r
+    <GuidValue>5d6c499e-53fd-430e-9285-2d7811b924e8</GuidValue>\r
+    <Version>2.0</Version>\r
+    <Abstract>This is the EFI/Tiano Tool CppTasks</Abstract>\r
+    <Description>\r
+      This is a customized cpptasks which includes EFI extensions for\r
+      static and dynamic linking, assembly and acp compiles\r
+    </Description>\r
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>\r
+    <License>\r
+      All rights reserved.\r
+      This program and the accompanying materials\r
+      are licensed and made available under the terms and conditions of the \r
+      BSD License which accompanies this distribution.  The full text of the \r
+      license may be found at\r
+      http://opensource.org/licenses/bsd-license.php\r
+\r
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+    </License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </MsaHeader>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>NULL</OutputFileBasename>\r
+  </ModuleDefinitions>\r
+  <SourceFiles>\r
+    <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>\r
+</ModuleSurfaceArea>\r
diff --git a/Tools/Source/FrameworkTasks/FrameworkTasks.msa b/Tools/Source/FrameworkTasks/FrameworkTasks.msa
new file mode 100644 (file)
index 0000000..3de4c21
--- /dev/null
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >\r
+  <MsaHeader>\r
+    <ModuleName>Framework Tasks</ModuleName>\r
+    <ModuleType>TOOL</ModuleType>\r
+    <GuidValue>5d6c499e-53fd-430e-9285-2d7811b924e8</GuidValue>\r
+    <Version>2.0</Version>\r
+    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>\r
+    <Description>\r
+      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano\r
+      Modules and Platform Binary Files (PBF)\r
+      These tools require compilation only once if the Developer Workstation and\r
+      the Developer's choice of HOST tool chain are stable.  If the developer\r
+      updates either the OS or the HOST tool chain, these tools should be rebuilt.\r
+    </Description>\r
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>\r
+    <License>\r
+      All rights reserved.\r
+      This program and the accompanying materials\r
+      are licensed and made available under the terms and conditions of the \r
+      BSD License which accompanies this distribution.  The full text of the \r
+      license may be found at\r
+      http://opensource.org/licenses/bsd-license.php\r
+\r
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+    </License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </MsaHeader>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>NULL</OutputFileBasename>\r
+  </ModuleDefinitions>\r
+  <SourceFiles>\r
+    <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>
+  </SourceFiles>\r
+</ModuleSurfaceArea>\r
diff --git a/Tools/Source/FrameworkWizard/FrameworkWizard.msa b/Tools/Source/FrameworkWizard/FrameworkWizard.msa
new file mode 100644 (file)
index 0000000..4ac7a6a
--- /dev/null
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >\r
+  <MsaHeader>\r
+    <ModuleName>Framework Wizard</ModuleName>\r
+    <ModuleType>TOOL</ModuleType>\r
+    <GuidValue>5d6c499e-53fd-430e-9285-2d7811b924e8</GuidValue>\r
+    <Version>2.0</Version>\r
+    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>\r
+    <Description>\r
+      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano\r
+      Modules and Platform Binary Files (PBF)\r
+      These tools require compilation only once if the Developer Workstation and\r
+      the Developer's choice of HOST tool chain are stable.  If the developer\r
+      updates either the OS or the HOST tool chain, these tools should be rebuilt.\r
+    </Description>\r
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>\r
+    <License>\r
+      All rights reserved.\r
+      This program and the accompanying materials\r
+      are licensed and made available under the terms and conditions of the \r
+      BSD License which accompanies this distribution.  The full text of the \r
+      license may be found at\r
+      http://opensource.org/licenses/bsd-license.php\r
+\r
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+    </License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </MsaHeader>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>NULL</OutputFileBasename>\r
+  </ModuleDefinitions>\r
+  <SourceFiles>\r
+    <Filename>build.xml</Filename>
+    <Filename>MANIFEST.MF</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/About.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/Clone.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/Identification.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/OpenFile.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/OpeningFileType.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/OpeningModuleList.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/OpeningModuleType.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/OpeningPackageList.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/OpeningPackageType.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/OpeningPlatformList.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/common/OpeningPlatformType.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/ui/ExitConfirm.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/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/ILayoutManager.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/XmlConfig.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/FrameworkWizardUI.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/BootModes/BootModesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/BootModes/BootModesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/DataHubs/DataHubsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/DataHubs/DataHubsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Events/EventsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Events/EventsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Externs/ExternsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Externs/ExternsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Guids/GuidsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Guids/GuidsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/HiiPackages/HiiPackagesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/HiiPackages/HiiPackagesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Hobs/HobsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Hobs/HobsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/LibraryClass/LibraryClassIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/LibraryClass/LibraryClassVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/ModuleIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/PackageDependencies/PackageDependenciesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/PackageDependencies/PackageDependenciesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/PcdCoded/PcdCodedIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/PcdCoded/PcdCodedVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Ppis/PpisIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Ppis/PpisVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Protocols/ProtocolsIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Protocols/ProtocolsVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/SourceFiles/SourceFilesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/SourceFiles/SourceFilesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/SystemTables/SystemTablesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/SystemTables/SystemTablesVector.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/Variables/VariablesIdentification.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/module/Identification/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/NewFileChooser.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/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/SelectModuleBelong.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/workspace/ui/SwitchWorkspace.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/workspace/Workspace.java</Filename>
+    <Filename>src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java</Filename>
+  </SourceFiles>\r
+</ModuleSurfaceArea>\r
diff --git a/Tools/Source/GenBuild/GenBuild.msa b/Tools/Source/GenBuild/GenBuild.msa
new file mode 100644 (file)
index 0000000..3fa6347
--- /dev/null
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >\r
+  <MsaHeader>\r
+    <ModuleName>GenBuild</ModuleName>\r
+    <ModuleType>TOOL</ModuleType>\r
+    <GuidValue>5d6c499e-53fd-430e-9285-2d7811b924e8</GuidValue>\r
+    <Version>2.0</Version>\r
+    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>\r
+    <Description>\r
+      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano\r
+      Modules and Platform Binary Files (PBF)\r
+      These tools require compilation only once if the Developer Workstation and\r
+      the Developer's choice of HOST tool chain are stable.  If the developer\r
+      updates either the OS or the HOST tool chain, these tools should be rebuilt.\r
+    </Description>\r
+    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>\r
+    <License>\r
+      All rights reserved.\r
+      This program and the accompanying materials\r
+      are licensed and made available under the terms and conditions of the \r
+      BSD License which accompanies this distribution.  The full text of the \r
+      license may be found at\r
+      http://opensource.org/licenses/bsd-license.php\r
+\r
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+    </License>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
+  </MsaHeader>\r
+  <ModuleDefinitions>\r
+    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+    <BinaryModule>false</BinaryModule>\r
+    <OutputFileBasename>NULL</OutputFileBasename>\r
+  </ModuleDefinitions>\r
+  <SourceFiles>\r
+    <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>\r
+</ModuleSurfaceArea>\r
diff --git a/Tools/Source/Tools.msa b/Tools/Source/Tools.msa
deleted file mode 100644 (file)
index 08ff6d2..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >\r
-  <MsaHeader>\r
-    <ModuleName>Tools</ModuleName>\r
-    <ModuleType>BASE</ModuleType>\r
-    <ComponentType>CUSTOM_BUILD</ComponentType>\r
-    <GuidValue>5d6c499e-53fd-430e-9285-2d7811b924e8</GuidValue>\r
-    <Version>2.0</Version>\r
-    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>\r
-    <Description>\r
-      This Module provides the EFI/Tiano Tools that are used to create EFI/Tiano\r
-      Modules and Platform Binary Files (PBF)\r
-      These tools require compilation only once if the Developer Workstation and\r
-      the Developer's choice of HOST tool chain are stable.  If the developer\r
-      updates either the OS or the HOST tool chain, these tools should be rebuilt.\r
-    </Description>\r
-    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>\r
-    <License>\r
-      All rights reserved. This program and the accompanying materials\r
-      are licensed and made available under the terms and conditions of the BSD License\r
-      which accompanies this distribution.  The full text of the license may be found at\r
-      http://opensource.org/licenses/bsd-license.php\r
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-    </License>\r
-    <CreatedDate>2006-02-02 09:30</CreatedDate>\r
-    <ModifiedDate>2006-06-02 11:32</ModifiedDate>\r
-    <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>\r
-  </MsaHeader>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="SOMETIMES_CONSUMED">SurfaceArea</LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename Path="Common">FrameworkDatabase.db</Filename>\r
-    <Filename Path="Conf">cygwin_tools.txt</Filename>\r
-    <Filename Path="Conf">gcc_tools.txt</Filename>\r
-    <Filename Path="Conf">intel_tools.txt</Filename>\r
-    <Filename Path="Conf">msft_tools.txt</Filename>\r
-    <Filename Path="Conf">winddk_tools.txt</Filename>\r
-    <Filename Path="Conf">tools_def.template</Filename>\r
-  </SourceFiles>\r
-  <Includes>\r
-    <PackageName>MdePkg</PackageName>\r
-  </Includes>\r
-  <Externs>\r
-    <Extern>\r
-      <ModuleEntryPoint></ModuleEntryPoint>\r
-    </Extern>\r
-  </Externs>\r
-  <BuildOptions>\r
-    <Option>DO_NOT_COMPILE</Option>\r
-  </BuildOptions>\r
-</ModuleSurfaceArea>\r
index f5719c173584c23e4bcf96b7aca0b97766073be3..1c8029d7c21da4f032c6d248a2657195c80a4581 100644 (file)
@@ -1,44 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-Copyright (c) 2006, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
--->\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >\r
-  <MsaHeader>\r
-    <BaseName>ToolResources</BaseName>\r
-    <ModuleType>BASE</ModuleType>\r
-    <ComponentType>CUSTOM_BUILD</ComponentType>\r
-    <Guid>5d6c499e-53fd-430e-9285-2d7811b924e8</Guid>\r
-    <Version>2.0</Version>\r
-    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>\r
-    <Description> This Module provides the EFI/Tiano Tools and resources that are used to create EFI/Tiano Modules and Platform Binary Files (PBF) These resources and tools do not require compilation. (The three JAR files are provided, Pre-compiled, and do not require additional compilation, the sources are provided, but will not be built under normal procedures. </Description>\r
-    <Copyright>Copyright 2005-2006, Intel Corporation</Copyright>\r
-    <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>\r
-    <Created>2006-03-30 10:05</Created>\r
-    <Specification>EFI_SPECIFICATION_VERSION    0x00000000</Specification>\r
-  </MsaHeader>\r
-  <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">SurfaceArea</LibraryClass>\r
-  </LibraryClassDefinitions>\r
-  <SourceFiles>\r
-    <Filename Path="Conf" FileType="db">FrameworkDatabase.db</Filename>\r
-    <Filename Path="Conf" FileType="txt">cygwin_tools.txt</Filename>\r
-    <Filename Path="Conf" FileType="txt">gcc_tools.txt</Filename>\r
-    <Filename Path="Conf" FileType="txt">intel_tools.txt</Filename>\r
-    <Filename Path="Conf" FileType="txt">msft_tools.txt</Filename>\r
-    <Filename Path="Conf" FileType="txt">tools_def.template</Filename>\r
-    <Filename Path="Conf" FileType="txt">winddk_tools.txt</Filename>\r
-  </SourceFiles>\r
-  <Includes>\r
-    <PackageName>Base</PackageName>\r
-  </Includes>\r
-  <BuildOptions>\r
-    <Option>DO_NOTHING</Option>\r
-  </BuildOptions>\r
-</ModuleSurfaceArea>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >
+  <MsaHeader>
+    <ModuleName>Build Tool Resources</ModuleName>
+    <ModuleType>TOOL</ModuleType>
+    <GuidValue>5d6c499e-53fd-430e-9285-2d7811b924e8</GuidValue>
+    <Version>2.0</Version>
+    <Abstract>This is the EFI/Tiano Tool Resources Module</Abstract>
+    <Description>
+      This Module provides the EFI/Tiano Tools and resources that are used to
+      create EFI/Tiano Modules and Platform Binary Files (PBF) These resources
+      and tools do not require compilation. (The three JAR files are provided,
+      Pre-compiled, and do not require additional compilation, the sources are
+      provided, but will not be built under normal procedures.
+    </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 ToolCode="NULL">Conf/FrameworkDatabase.db</Filename>
+    <Filename ToolCode="NULL">Conf/tools_def.template</Filename>
+    <Filename ToolCode="NULL">Conf/target.template</Filename>
+    <Filename ToolCode="NULL">Conf/BuildMacro.xml</Filename>
+    <Filename ToolCode="NULL">XMLSchema/FarManifest.xsd</Filename>
+    <Filename ToolCode="NULL">XMLSchema/FrameworkDataAttributes.xsd</Filename>
+    <Filename ToolCode="NULL">XMLSchema/FrameworkDataElements.xsd</Filename>
+    <Filename ToolCode="NULL">XMLSchema/FrameworkDataTypes.xsd</Filename>
+    <Filename ToolCode="NULL">XMLSchema/FrameworkHeaders.xsd</Filename>
+    <Filename ToolCode="NULL">XMLSchema/FrameworkPlatformDataElements.xsd</Filename>
+    <Filename ToolCode="NULL">XMLSchema/FrameworkPlatformDataTypes.xsd</Filename>
+    <Filename ToolCode="NULL">XMLSchema/NamingConvention.xsd</Filename>
+    <Filename ToolCode="NULL">XMLSchema/SurfaceArea.xsd</Filename>
+    <Filename ToolCode="NULL">Conf/Pcd/PcdDatabaseCommonDefinitions.sample</Filename>
+    <Filename ToolCode="NULL">Conf/Pcd/PcdDatabaseDxeDefinitions.sample</Filename>
+    <Filename ToolCode="NULL">Conf/Pcd/PcdDatabasePeiDefinitions.sample</Filename>
+  </SourceFiles>
+</ModuleSurfaceArea>
index 4ff6d132d121d65976aa8b3c21d7ecba4bc53d61..7d703ae7aeab31602e64417ada409307d2be2453 100644 (file)
@@ -2,39 +2,44 @@
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" >\r
   <SpdHeader>\r
     <PackageName>Tools</PackageName>\r
-    <Guid>53f84ca0-53fe-4412-b4e7-dcec602e1d49</Guid>\r
-    <Version>0.3</Version>\r
+    <GuidValue>53f84ca0-53fe-4412-b4e7-dcec602e1d49</GuidValue>\r
+    <Version>2.0</Version>\r
     <Abstract>TianoCore.org EFI Framework Tools</Abstract>\r
-    <Description> This package provides the tools needed to create EFI/Framework platform\r
-      binary files (PBF) and EFI/Framework Modules that can be incorporated into a PBF. \r
-      Source Code is provided for all C and Java applications. This package also provides \r
-      the directory structure and templates for configuration files.\r
+    <Description>\r
+      This package provides the tools needed to create EFI/Framework platform\r
+      binary files (PBF) and EFI/Framework Modules that can be incorporated \r
+      into a PBF.  Source Code is provided for all C and Java applications. \r
+      This package also provides the directory structure and templates for \r
+      configuration files.\r
     </Description>\r
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
     <License>\r
       All rights reserved.\r
+\r
       This program and the accompanying materials are licensed and made available\r
       under the terms and conditions of the BSD License which accompanies this\r
       distribution. The full text of the license may be found at\r
       http://opensource.org/licenses/bsd-license.php\r
+\r
       THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
     </License>\r
-    <ReadOnly>false</ReadOnly>\r
-    <RePackage>true</RePackage>\r
-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION     0x00000052</Specification>\r
+    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </SpdHeader>\r
+  <PackageDefinitions>\r
+    <ReadOnly>false</ReadOnly>\r
+    <RePackage>false</RePackage>\r
+  </PackageDefinitions>\r
   <MsaFiles>\r
-  <!--\r
-    <MsaFile>\r
-      <Filename>ToolResources.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile Guid="faf22a0f-10fc-428e-b311-fe506a9c0b2d">\r
-      <Filename>JavaResources.msa</Filename>\r
-    </MsaFile>\r
-    <MsaFile Guid="2a1b3a91-8d57-4fc3-a6c9-ae95bb699bac">\r
-      <Filename>Source/Tools.msa</Filename>\r
-    </MsaFile>\r
-    -->\r
+    <Filename>ToolResources.msa</Filename>\r
+    <Filename>JavaResources.msa</Filename>\r
+    <Filename>Source/Tools.msa</Filename>\r
+    <Filename>Source/Common/Common.msa</Filename>
+    <Filename>Source/Cpptasks/CppTasks.msa</Filename>
+    <Filename>Source/FrameworkTasks/FrameworkTasks.msa</Filename>
+    <Filename>Source/FrameworkWizard/FrameworkWizard.msa</Filename>
+    <Filename>Source/GenBuild/GenBuild.msa</Filename>
+    <Filename>Source/SurfaceArea/SurfaceArea.msa</Filename>
+    <Filename>Source/TianoTools/TianoTools.msa</Filename>
   </MsaFiles>\r
 </PackageSurfaceArea>\r