EmulatorPkg: Match paths/names for Xcode with new package naming scheme.

signed-off-by:andrewfish

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

diff --git a/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh b/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh
index 09d1a280d97f743eb5096c61b253a20ba96f05cc..6e432dd81eda9e768ebe55555d1e41efea2dc2bc 100755 (executable)
--- a/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh
+++ b/EmulatorPkg/Unix/Xcode/xcode_project32/XcodeBuild.sh
@@ -19,6 +19,5 @@ set -e
 #
 # Source the workspace and set up the environment variables we need
 #
 #
 # Source the workspace and set up the environment variables we need
 #

-cd ../..
-echo `pwd`
-./build.sh $1 $2 $3 $4 $5 $6 $8
+cd ../../..
+./build.sh -a IA32 $1 $2 $3 $4 $5 $6 $8

diff --git a/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser
index 026a84544dcc99b7a557f318dc7fca820551b53c..85913859c347a3713243287d482e1d1bc795cbe1 100644 (file)
--- a/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser
+++ b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser
@@ -152,13 +152,13 @@
                showTypeColumn = 0;
                sourceDirectories = (
                );
                showTypeColumn = 0;
                sourceDirectories = (
                );

-               startupPath = ../../../../Build/EmuUnixIa32/DEBUG_XCLANG/IA32;
+               startupPath = ../../../../Build/Emulator32/DEBUG_XCLANG/IA32;

        };
        BA11A1020FB10BCE00D06FEC /* Host.dll */ = {
                isa = PBXFileReference;
                lastKnownFileType = "compiled.mach-o.executable";
                name = Host.dll;
        };
        BA11A1020FB10BCE00D06FEC /* Host.dll */ = {
                isa = PBXFileReference;
                lastKnownFileType = "compiled.mach-o.executable";
                name = Host.dll;

-               path = ../../../../Build/EmuUnixIa32/DEBUG_XCLANG/IA32/Host;
+               path = ../../../../Build/Emulator32/DEBUG_XCLANG/IA32/Host;

                sourceTree = SOURCE_ROOT;
        };
        BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */ = {
                sourceTree = SOURCE_ROOT;
        };
        BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */ = {

diff --git a/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh b/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh
index 634b1b025cc4a7d5975ed9c2b250846d059bee5d..ac26dc60c4ee0c66ea3a6a0c3871994249d765e0 100755 (executable)
--- a/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh
+++ b/EmulatorPkg/Unix/Xcode/xcode_project64/XcodeBuild.sh
@@ -19,6 +19,5 @@ set -e
 #
 # Source the workspace and set up the environment variables we need
 #
 #
 # Source the workspace and set up the environment variables we need
 #

-cd ../..
-echo `pwd`
-./build64.sh $1 $2 $3 $4 $5 $6 $8
+cd ../../..
+./build.sh $1 $2 $3 $4 $5 $6 $8

diff --git a/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser
index 3cc5f92d3637ce594a0418f8853b2e362a93d1d5..7e7ce697af72431e6cfd6c7da984ecc598e792f7 100644 (file)
--- a/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser
+++ b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser
@@ -152,13 +152,13 @@
                showTypeColumn = 0;
                sourceDirectories = (
                );
                showTypeColumn = 0;
                sourceDirectories = (
                );

-               startupPath = ../../../../Build/EmuUnixX64/DEBUG_XCLANG/X64;
+               startupPath = ../../../../Build/Emulator/DEBUG_XCLANG/X64;

        };
        BA11A1020FB10BCE00D06FEC /* Host.dll */ = {
                isa = PBXFileReference;
                lastKnownFileType = "compiled.mach-o.executable";
                name = Host.dll;
        };
        BA11A1020FB10BCE00D06FEC /* Host.dll */ = {
                isa = PBXFileReference;
                lastKnownFileType = "compiled.mach-o.executable";
                name = Host.dll;

-               path = ../../../../Build/EmuUnixX64/DEBUG_XCLANG/X64/Host;
+               path = ../../../../Build/Emulator/DEBUG_XCLANG/X64/Host;

                sourceTree = SOURCE_ROOT;
        };
        BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */ = {
                sourceTree = SOURCE_ROOT;
        };
        BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */ = {