Update the binary MSA to say they were binary, fixed an abstract, changed a module UiName, changed tool default values in the build.xml files to give the name of the tool, rather than all, so when building the tools, you can tell what tool it is trying to build.

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

9 files changed, 50 insertions, 65 deletions

diff --git a/EdkFatBinPkg/Fat.msa b/EdkFatBinPkg/Fat.msa
index ef1d34f..4c20d45 100644
--- a/EdkFatBinPkg/Fat.msa
+++ b/EdkFatBinPkg/Fat.msa
@@ -1,11 +1,11 @@
 <?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,
+<!--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>

@@ -16,17 +16,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Abstract>Make a FFS section for an FV that contains the FAT driver.*.FFS files are compressed FFS sections.</Abstract>

     <Description>This is the FAT 32 EFI/Tiano Driver</Description>

     <Copyright>Copyright 2004, 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,
+    <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>

+    <BinaryModule>true</BinaryModule>

     <OutputFileBasename>Fat</OutputFileBasename>

   </ModuleDefinitions>

   <SourceFiles>

@@ -38,4 +38,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

   </Externs>

-</ModuleSurfaceArea>
+</ModuleSurfaceArea>

diff --git a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
index 9040761..be332c8 100644
--- a/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
+++ b/EdkModulePkg/Application/HelloWorld/HelloWorld.msa
@@ -1,20 +1,12 @@
 <?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">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

-    <ModuleName>HelloWorld</ModuleName>

+    <ModuleName>Hello World UEFI Application</ModuleName>

     <ModuleType>UEFI_APPLICATION</ModuleType>

     <GuidValue>6987936E-ED34-44db-AE97-1FA5E4ED2116</GuidValue>

     <Version>1.0</Version>

-    <Abstract>Component description file for SecurityStub module</Abstract>

-    <Description>FIX ME!</Description>

+    <Abstract>Sample UEFI Application Reference Module</Abstract>

+    <Description>This is a shell application that will display Hello World.</Description>

     <Copyright>Copyright (c) 2004-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
diff --git a/EdkShellBinPkg/bin/Shell.msa b/EdkShellBinPkg/bin/Shell.msa
index b82ead0..04f5926 100644
--- a/EdkShellBinPkg/bin/Shell.msa
+++ b/EdkShellBinPkg/bin/Shell.msa
@@ -1,33 +1,26 @@
 <?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">

+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

   <MsaHeader>

     <ModuleName>Shell</ModuleName>

     <ModuleType>UEFI_APPLICATION</ModuleType>

     <GuidValue>c57ad6b7-0515-40a8-9d21-551652854e37</GuidValue>

     <Version>1.0</Version>

     <Abstract>Component description file for EFI Shell module.</Abstract>

-    <Description>This is a binary package containing multiple binary files, however there is

-			only a single MSA and MBD file.</Description>

+    <Description>This is a binary package containing multiple binary files, however there is only a single MSA file.</Description>

     <Copyright>Copyright (c) 2004-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

+    <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>

+

+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>

+    <BinaryModule>true</BinaryModule>

     <OutputFileBasename>Shell</OutputFileBasename>

   </ModuleDefinitions>

   <SourceFiles>

@@ -39,4 +32,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

   </Externs>

-</ModuleSurfaceArea>

+</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/Tools/Source/Common/build.xml b/Tools/Source/Common/build.xml
index 39d2baf..4fd7285 100644
--- a/Tools/Source/Common/build.xml
+++ b/Tools/Source/Common/build.xml
@@ -9,14 +9,14 @@ 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.

 -->

-<project name="Common" default="all" basedir=".">

+<project name="Common" default="Common_Jar" basedir=".">

 

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>

   <property environment="env"/>

   <property name="WORKSPACE" value="${env.WORKSPACE}"/>

   <property name="buildDir" value="build"/>

   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>

-  <target name="all" depends="install"/>

+  <target name="Common_Jar" depends="install"/>

   <target name="source">

     <mkdir dir="${buildDir}"/>

     <javac srcdir="." destdir="${buildDir}">

diff --git a/Tools/Source/Cpptasks/build.xml b/Tools/Source/Cpptasks/build.xml
index adbef6d..33300f8 100644
--- a/Tools/Source/Cpptasks/build.xml
+++ b/Tools/Source/Cpptasks/build.xml
@@ -9,13 +9,13 @@ 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.

 -->

-<project name="CppTasks" default="all" basedir=".">

+<project name="CppTasks" default="CppTasks" basedir=".">

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>

   <property environment="env"/>

   <property name="workspace" value="${env.WORKSPACE}"/>

   <property name="buildDir" value="build"/>

   <property name="installLocation" value="${workspace}/Tools/Jars"/>

-  <target name="all" depends="install"/>

+  <target name="CppTasks" depends="install"/>

   <target name="init">

     <uptodate property="jar.newer" targetfile="${installLocation}/cpptasks.jar">

       <srcfiles dir="net" includes="**"/>

diff --git a/Tools/Source/FrameworkTasks/build.xml b/Tools/Source/FrameworkTasks/build.xml
index 664a8da..ac3639c 100644
--- a/Tools/Source/FrameworkTasks/build.xml
+++ b/Tools/Source/FrameworkTasks/build.xml
@@ -9,13 +9,13 @@ 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.

 -->

-<project name="FrameworkTasks" default="all">

+<project name="FrameworkTasks" default="FrameworkTasks">

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>

   <property environment="env"/>

   <property name="workspace" value="${env.WORKSPACE}"/>

   <property name="buildDir" value="build"/>

   <property name="installLocation" value="${workspace}/Tools/Jars"/>

-  <target name="all" depends="install"/>

+  <target name="FrameworkTasks" depends="install"/>

   <target name="source">

     <mkdir dir="${buildDir}"/>

     <javac srcdir="." destdir="${buildDir}">

diff --git a/Tools/Source/FrameworkWizard/build.xml b/Tools/Source/FrameworkWizard/build.xml
index e49824b..b9fc0b4 100644
--- a/Tools/Source/FrameworkWizard/build.xml
+++ b/Tools/Source/FrameworkWizard/build.xml
@@ -9,7 +9,7 @@ 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.

 -->

-<project name="FrameworkWizard" default="all" basedir=".">

+<project name="FrameworkWizard" default="FrameworkWizard" basedir=".">

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>

   <property environment="env"/>

   <property name="WORKSPACE" value="${env.WORKSPACE}"/>

@@ -20,7 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="buildDir" value="build"/>

   <property name="resourceDir" value="rsc"/>

   <property name="installLocation" value="${WORKSPACE}/Tools/bin"/>

-  <target name="all" depends="install"/>

+  <target name="FrameworkWizard" depends="install"/>

   <target name="source">

     <mkdir dir="${buildDir}"/>

     <javac srcdir="src" destdir="${buildDir}">

diff --git a/Tools/Source/GenBuild/build.xml b/Tools/Source/GenBuild/build.xml
index 73a114b..e40e756 100644
--- a/Tools/Source/GenBuild/build.xml
+++ b/Tools/Source/GenBuild/build.xml
@@ -9,7 +9,7 @@ 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.

 -->

-<project name="GenBuild" default="all" basedir=".">

+<project name="GenBuild" default="GenBuild" basedir=".">

 

   <taskdef resource="net/sf/antcontrib/antlib.xml"/>

   <property environment="env"/>

@@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </path>

   <property name="buildDir" value="build"/>

   <property name="installLocation" value="${WORKSPACE}/Tools/Jars"/>

-  <target name="all" depends="install"/>

+  <target name="GenBuild" depends="install"/>

   <target name="source">

     <mkdir dir="${buildDir}"/>

     <javac srcdir="." destdir="${buildDir}">

diff --git a/Tools/build.xml b/Tools/build.xml
index 54d3920..cc23685 100644
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -13,6 +13,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

   <property environment="env"/>

 

+  <target name="all" depends="C_Code"/>

+

+  <target name="C_Code" depends="JavaCode">

+    <subant target="" inheritall="false">

+      <filelist dir="."

+        files="

+          Source/TianoTools/build.xml

+          "/>

+    </subant>

+  </target>

+

   <target name="JavaCode" depends="SurfaceArea">

     <subant target="" verbose="true" inheritall="false">

       <!-- Note: this is an ordered list. The projects have dependencies between them. -->

@@ -27,8 +38,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>

   </target>

 

-  <target name="all" depends="C_Code"/>

-

   <target name="SurfaceArea" depends="makeCatalog">

     <subant target="" verbose="true" inheritall="false">

       <filelist dir="."

@@ -38,15 +47,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </subant>

   </target>

 

-  <target name="C_Code" depends="JavaCode">

-    <subant target="" inheritall="false">

-      <filelist dir="."

-        files="

-          Source/TianoTools/build.xml

-          "/>

-    </subant>

-  </target>

-

   <target name="makeCatalog">

     <echo file="XMLSchema/catalog.xml">

       <![CDATA[<?xml version="1.0"?>