From b395a08d05526a305a0c3cc4a07ecf10ff872fd5 Mon Sep 17 00:00:00 2001
From: ajfish <ajfish@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 8 Dec 2009 01:55:00 +0000
Subject: Fix the UnixPkg default to have the tools come from a seperate
 BaseTools project. When the fixes are checked into edk2 we can move it back
 to pointing to tools in edk2.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9538 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Xcode/xcode_project/xcode_project.xcodeproj/project.pbxproj  | 5 -----
 UnixPkg/build.sh                                                 | 9 +++++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/UnixPkg/Xcode/xcode_project/xcode_project.xcodeproj/project.pbxproj b/UnixPkg/Xcode/xcode_project/xcode_project.xcodeproj/project.pbxproj
index 199700f9ce..87eb84de33 100644
--- a/UnixPkg/Xcode/xcode_project/xcode_project.xcodeproj/project.pbxproj
+++ b/UnixPkg/Xcode/xcode_project/xcode_project.xcodeproj/project.pbxproj
@@ -6,15 +6,10 @@
 	objectVersion = 45;
 	objects = {
 
-/* Begin PBXFileReference section */
-		F27EDBED101FA6FC0097B575 /* PciIoKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PciIoKit.h; path = ../../Sec/PciIoKit.h; sourceTree = SOURCE_ROOT; };
-/* End PBXFileReference section */
-
 /* Begin PBXGroup section */
 		08FB7794FE84155DC02AAC07 /* xcode_project */ = {
 			isa = PBXGroup;
 			children = (
-				F27EDBED101FA6FC0097B575 /* PciIoKit.h */,
 			);
 			name = xcode_project;
 			sourceTree = "<group>";
diff --git a/UnixPkg/build.sh b/UnixPkg/build.sh
index 2770019a1f..16da8d0515 100755
--- a/UnixPkg/build.sh
+++ b/UnixPkg/build.sh
@@ -22,7 +22,11 @@ if [ -z "$WORKSPACE" ]
 then
   echo Initializing workspace
   cd ..
-  export EDK_TOOLS_PATH=`pwd`/BaseTools
+# This version is for the tools in the BaseTools project.
+# this assumes svn pulls have the same root dir
+  export EDK_TOOLS_PATH=`pwd`/../BaseTools
+# This version is for the tools source in edk2
+#  export EDK_TOOLS_PATH=`pwd`/BaseTools
   echo $EDK_TOOLS_PATH
   source edksetup.sh BaseTools
 else
@@ -90,7 +94,8 @@ done
 #
 echo $PATH
 echo `which build`
-build -p $WORKSPACE/EdkShellPkg/EdkShellPkg.dsc -a IA32 -t $TARGET_TOOLS $1 $2 $3 $4 $5 $6 $7 $8
+# Uncomment this if you want to build the shell. 
+#build -p $WORKSPACE/EdkShellPkg/EdkShellPkg.dsc -a IA32 -t $TARGET_TOOLS $1 $2 $3 $4 $5 $6 $7 $8
 build -p $WORKSPACE/UnixPkg/UnixPkg.dsc         -a IA32 -t $TARGET_TOOLS $1 $2 $3 $4 $5 $6 $7 $8
 exit $?
 
-- 
cgit v1.2.3