1. Removed the unnecessary #include statements and include files

2. Removed the unnecessary library and include path from MSA files


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

Tools/Source/TianoTools/VfrCompile/EfiVfr.h

@@ -23,11 +23,11 @@ Abstract:
 #ifndef _EFI_VFR_H_
 #define _EFI_VFR_H_
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
-#include "InternalFormRepresentation.h"
 #include <string.h>
 
+#include <Common/UefiBaseTypes.h>
+#include <Common/InternalFormRepresentation.h>
+
 //
 // This number should be incremented with each change to the VFR compiler.
 // We write the version to the output list file for debug purposes.

Tools/Source/TianoTools/VfrCompile/VfrCompile.g

@@ -21,15 +21,16 @@ Abstract:
 
 #header<<
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
-#include <CommonLib.h>
-#include <MultiPhase.h>
+#include <Common/UefiBaseTypes.h>
+#include <Common/MultiPhase.h>
+#include <Common/InternalFormRepresentation.h>
+#include <Protocol/UgaDraw.h>
+#include <Protocol/Hii.h>
+
+#include "CommonLib.h"
 #include "EfiUtilityMsgs.h"
 #include "EfiVfr.h"
 #include "VfrServices.h"
-#include <UgaDraw.h>
-#include <Hii.h>
 
 #include <ctype.h>
 #ifndef __GNUC__

Tools/Source/TianoTools/VfrCompile/VfrServices.cpp

@@ -22,15 +22,16 @@ Abstract:
 #include <stdio.h>    // for FILE routines
 #include <stdlib.h>   // for malloc() and free()
 
-#include <Base.h>
-#include <UefiBaseTypes.h>
-#include <MultiPhase.h>
+#include <Common/UefiBaseTypes.h>
+#include <Common/MultiPhase.h>
+#include <Common/InternalFormRepresentation.h>
+#include <Protocol/UgaDraw.h>  // for EFI_UGA_PIXEL definition
+#include <Protocol/Hii.h>
+
 #include "EfiUtilityMsgs.h"
 #include "EfiVfr.h"
 #include "VfrServices.h"
 
-#include <UgaDraw.h>
-#include <Hii.h>
 
 static const char *mSourceFileHeader[] = {
   "//",

Tools/Source/TianoTools/VfrCompile/build.xml

@@ -77,25 +77,25 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         </then>
       </elseif>
     </if>
-		<condition property="CheckDepends">
-		  <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">
-			  <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" 
+    <condition property="CheckDepends">
+      <uptodate targetfile="${WORKSPACE}/Tools/bin/VfrCompile${ext_exe}">
+        <srcfiles dir="${WORKSPACE}/Tools/Source/TianoTools/VfrCompile" 
         includes="EfiVfrParser.cpp DLGLexer.cpp VfrCompile.cpp VfrCompile.g VfrServices.cpp parser.dlg"/>
-			</uptodate>
-		</condition>
+      </uptodate>
+    </condition>
 
     <condition property="gxx_extra_libs" value="stdc++ System gcc_s.10.4 gcc">
       <os family="mac"/>
-	</condition>
-		
+  </condition>
+    
     <condition property="gxx_extra_libs" value="stdc++">
       <os name="linux"/>
-	</condition>
-		
+  </condition>
+    
     <condition property="gxx_extra_libs" value="stdc++">
       <os family="windows"/>
-	</condition>
-		
+  </condition>
+    
   </target>
 
   <target name="Antlr" depends="init" unless="CheckDepends">
@@ -122,11 +122,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <fileset dir="${basedir}/Pccts/h" 
         includes="${FileSetPccts}" />
 
-      <includepath path="${env.WORKSPACE}/Tools/Source/TianoTools/Pccts/h"/>
+      <includepath path="${PACKAGE_DIR}/Pccts/h"/>
       <includepath path="${PACKAGE_DIR}/Include"/>
       <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
-      <includepath path="${PACKAGE_DIR}/Include/Common"/>
-      <includepath path="${PACKAGE_DIR}/Include/Protocol"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
       <libset dir="${LIB_DIR}" libs="CommonTools"/>
       <syslibset libs="${gxx_extra_libs}" if="gcc"/>