From 7d55c33f170142c8b2f4e4b4774a1c0f9820550d Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 1 Apr 2016 15:44:57 -0700
Subject: [PATCH] [osx] Use a more reliable hack for the getting the .xcscheme
 file into place

---
 platform/osx/scripts/osxsdk.xcscheme | 99 ++++++++++++++++++++++++++++
 platform/osx/scripts/test.sh         | 13 +---
 2 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100644 platform/osx/scripts/osxsdk.xcscheme

diff --git a/platform/osx/scripts/osxsdk.xcscheme b/platform/osx/scripts/osxsdk.xcscheme
new file mode 100644
index 000000000..e8a7f2ff5
--- /dev/null
+++ b/platform/osx/scripts/osxsdk.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8E4ECCDD911E8B357970AAED"
+               BuildableName = "Mapbox.framework"
+               BlueprintName = "osxsdk"
+               ReferencedContainer = "container:../build/osx-x86_64/gyp/osx.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "968E0619FB16F6A55E27CDF3"
+               BuildableName = "osxtest.xctest"
+               BlueprintName = "osxtest"
+               ReferencedContainer = "container:../build/osx-x86_64/gyp/osx.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8E4ECCDD911E8B357970AAED"
+            BuildableName = "Mapbox.framework"
+            BlueprintName = "osxsdk"
+            ReferencedContainer = "container:../build/osx-x86_64/gyp/osx.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8E4ECCDD911E8B357970AAED"
+            BuildableName = "Mapbox.framework"
+            BlueprintName = "osxsdk"
+            ReferencedContainer = "container:../build/osx-x86_64/gyp/osx.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8E4ECCDD911E8B357970AAED"
+            BuildableName = "Mapbox.framework"
+            BlueprintName = "osxsdk"
+            ReferencedContainer = "container:../build/osx-x86_64/gyp/osx.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/platform/osx/scripts/test.sh b/platform/osx/scripts/test.sh
index 98b22a9b9..f72895d85 100755
--- a/platform/osx/scripts/test.sh
+++ b/platform/osx/scripts/test.sh
@@ -9,17 +9,8 @@ OSX_PROJ_PATH=./build/osx-x86_64/gyp/osx.xcodeproj
 
 export BUILDTYPE=${BUILDTYPE:-Release}
 
-if [[ ! -e "${OSX_PROJ_PATH}/xcshareddata/xcschemes/osxsdk.xcscheme" ]]; then
-    # Generate schemes
-    open -g "${OSX_PROJ_PATH}"
-    sleep 20
-    
-    # Share osxsdk scheme
-    mkdir -pv "${OSX_PROJ_PATH}/xcshareddata/xcschemes/"
-    mv -v \
-        "${OSX_PROJ_PATH}/xcuserdata/${USER}.xcuserdatad/xcschemes/osxsdk.xcscheme" \
-        "${OSX_PROJ_PATH}/xcshareddata/xcschemes/"
-fi
+mkdir -p "${OSX_PROJ_PATH}/xcshareddata/xcschemes"
+cp platform/osx/scripts/osxsdk.xcscheme "${OSX_PROJ_PATH}/xcshareddata/xcschemes/osxsdk.xcscheme"
 
 xcodebuild -verbose \
     -sdk macosx${OSX_SDK_VERSION} \