diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-01 15:44:57 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-01 15:44:57 -0700 |
| commit | 7d55c33f170142c8b2f4e4b4774a1c0f9820550d (patch) | |
| tree | 2b7f4c44683189b7686a1803a42fb19be3ea2341 /platform/osx | |
| parent | d5f702123084ffe5bfa65544c5e0b0965f2efa9f (diff) | |
| download | qtlocation-mapboxgl-7d55c33f170142c8b2f4e4b4774a1c0f9820550d.tar.gz | |
[osx] Use a more reliable hack for the getting the .xcscheme file into place
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/scripts/osxsdk.xcscheme | 99 | ||||
| -rwxr-xr-x | platform/osx/scripts/test.sh | 13 |
2 files changed, 101 insertions, 11 deletions
diff --git a/platform/osx/scripts/osxsdk.xcscheme b/platform/osx/scripts/osxsdk.xcscheme new file mode 100644 index 0000000000..e8a7f2ff58 --- /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 98b22a9b98..f72895d850 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} \ |