From a883ac9253f19a850fe9d60e5479428cfc8fb54d Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 18 Apr 2016 18:01:30 -0700 Subject: [osx] Build output goes to build/osx --- .ycm_extra_conf.py | 2 +- Makefile | 9 ++++----- bin/offline.sh | 2 +- platform/osx/osx.xcodeproj/project.pbxproj | 2 +- platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme | 2 +- platform/osx/osx.xcworkspace/contents.xcworkspacedata | 2 +- .../osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme | 8 ++++---- .../osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme | 8 ++++---- .../osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme | 8 ++++---- platform/osx/platform.gyp | 2 +- platform/osx/scripts/osxtest.xcscheme | 2 +- 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py index 41578b3366..632686f3d6 100644 --- a/.ycm_extra_conf.py +++ b/.ycm_extra_conf.py @@ -37,7 +37,7 @@ import ycm_core compilation_database_folders = [ 'build/linux-x86_64/Release', - 'build/osx-x86_64/Release', + 'build/osx/Release', ] subprocess.call(['make compdb'], shell=True) diff --git a/Makefile b/Makefile index 2a8e23b941..1b85ebce3f 100644 --- a/Makefile +++ b/Makefile @@ -23,10 +23,9 @@ default: #### OS X targets ############################################################## -OSX_OUTPUT_PATH = build/osx-x86_64 +OSX_OUTPUT_PATH = build/osx OSX_PROJ_PATH = $(OSX_OUTPUT_PATH)/platform/osx/platform.xcodeproj OSX_WORK_PATH = platform/osx/osx.xcworkspace -OSX_DERIVED_DATA_PATH = build/DerivedData/osx $(OSX_OUTPUT_PATH)/config.gypi: platform/osx/scripts/configure.sh .mason configure MASON_PLATFORM=osx ./configure $< $@ @@ -39,7 +38,7 @@ $(OSX_PROJ_PATH): platform/osx/platform.gyp $(OSX_OUTPUT_PATH)/config.gypi $(OSX osx: $(OSX_PROJ_PATH) set -o pipefail && xcodebuild \ - -derivedDataPath $(OSX_DERIVED_DATA_PATH) \ + -derivedDataPath $(OSX_OUTPUT_PATH) \ -configuration $(BUILDTYPE) \ -workspace $(OSX_WORK_PATH) -scheme CI build | xcpretty @@ -47,10 +46,10 @@ xproj: $(OSX_PROJ_PATH) open $(OSX_WORK_PATH) test-osx: osx node_modules/express - ulimit -c unlimited && ($(OSX_DERIVED_DATA_PATH)/Build/Products/$(BUILDTYPE)/test & pid=$$! && wait $$pid \ + ulimit -c unlimited && ($(OSX_OUTPUT_PATH)/Build/Products/$(BUILDTYPE)/test & pid=$$! && wait $$pid \ || (lldb -c /cores/core.$$pid --batch --one-line 'thread backtrace all' --one-line 'quit' && exit 1)) set -o pipefail && xcodebuild \ - -derivedDataPath $(OSX_DERIVED_DATA_PATH) \ + -derivedDataPath $(OSX_OUTPUT_PATH) \ -configuration $(BUILDTYPE) \ -workspace $(OSX_WORK_PATH) -scheme CI test | xcpretty diff --git a/bin/offline.sh b/bin/offline.sh index 7d8121fb98..f85cb1194b 100755 --- a/bin/offline.sh +++ b/bin/offline.sh @@ -3,7 +3,7 @@ set -e set -o pipefail -OFFLINE=./build/osx-x86_64/Release/mbgl-offline +OFFLINE=./build/osx/Release/mbgl-offline # Barcelona $OFFLINE --north 41.4664 --west 2.0407 --south 41.2724 --east 2.2680 --output barcelona.db diff --git a/platform/osx/osx.xcodeproj/project.pbxproj b/platform/osx/osx.xcodeproj/project.pbxproj index 9db664b25e..4854858df8 100644 --- a/platform/osx/osx.xcodeproj/project.pbxproj +++ b/platform/osx/osx.xcodeproj/project.pbxproj @@ -222,7 +222,7 @@ DAE6C3BC1CC31F2E00DB3429 /* mapbox.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = mapbox.pdf; path = src/resources/mapbox.pdf; sourceTree = SOURCE_ROOT; }; DAE6C3BD1CC31F2E00DB3429 /* MGLAnnotationCallout.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MGLAnnotationCallout.xib; path = src/resources/MGLAnnotationCallout.xib; sourceTree = SOURCE_ROOT; }; DAE6C3C11CC31F4500DB3429 /* Mapbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mapbox.h; sourceTree = ""; }; - DAE6C3C51CC31F9100DB3429 /* mbgl.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = "../../build/osx-x86_64/mbgl.xcconfig"; sourceTree = ""; }; + DAE6C3C51CC31F9100DB3429 /* mbgl.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = "../../build/osx/mbgl.xcconfig"; sourceTree = ""; }; DAE6C3C61CC3499100DB3429 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; DAE6C3C81CC34BD800DB3429 /* MGLGeometryTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MGLGeometryTests.mm; path = ../../darwin/test/MGLGeometryTests.mm; sourceTree = ""; }; DAE6C3C91CC34BD800DB3429 /* MGLOfflinePackTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLOfflinePackTests.m; path = ../../darwin/test/MGLOfflinePackTests.m; sourceTree = ""; }; diff --git a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme b/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme index c57f010f7b..2c9e4a3c74 100644 --- a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme +++ b/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/CI.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "4E8A9455A3A23B7FD2A8FC52" BuildableName = "All" BlueprintName = "All" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> + location = "group:../../build/osx/platform/osx/platform.xcodeproj"> diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme index 16a5edcd04..c88fefb747 100644 --- a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme +++ b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-offline.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2" BuildableName = "mbgl-offline" BlueprintName = "mbgl-offline" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> @@ -35,7 +35,7 @@ BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2" BuildableName = "mbgl-offline" BlueprintName = "mbgl-offline" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> @@ -59,7 +59,7 @@ BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2" BuildableName = "mbgl-offline" BlueprintName = "mbgl-offline" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> @@ -78,7 +78,7 @@ BlueprintIdentifier = "960D5BDFBD73C605ACCF58C2" BuildableName = "mbgl-offline" BlueprintName = "mbgl-offline" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme index 9760745772..522998bd3c 100644 --- a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme +++ b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/mbgl-render.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE" BuildableName = "mbgl-render" BlueprintName = "mbgl-render" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> @@ -35,7 +35,7 @@ BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE" BuildableName = "mbgl-render" BlueprintName = "mbgl-render" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> @@ -59,7 +59,7 @@ BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE" BuildableName = "mbgl-render" BlueprintName = "mbgl-render" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> @@ -78,7 +78,7 @@ BlueprintIdentifier = "D27AE71B9B193AD277AD4CFE" BuildableName = "mbgl-render" BlueprintName = "mbgl-render" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme index 678c195a28..f995e74964 100644 --- a/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme +++ b/platform/osx/osx.xcworkspace/xcshareddata/xcschemes/test.xcscheme @@ -17,7 +17,7 @@ BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8" BuildableName = "test" BlueprintName = "test" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> @@ -35,7 +35,7 @@ BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8" BuildableName = "test" BlueprintName = "test" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> @@ -59,7 +59,7 @@ BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8" BuildableName = "test" BlueprintName = "test" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> @@ -78,7 +78,7 @@ BlueprintIdentifier = "DC37A7F85AC5E5958672B4F8" BuildableName = "test" BlueprintName = "test" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> diff --git a/platform/osx/platform.gyp b/platform/osx/platform.gyp index 6279f8ca6a..cdea98982a 100644 --- a/platform/osx/platform.gyp +++ b/platform/osx/platform.gyp @@ -5,7 +5,7 @@ 'coverage': 0, }, 'includes': [ - '../../build/osx-x86_64/config.gypi', + '../../build/osx/config.gypi', '../../mbgl.gypi', '../../test/test.gypi', '../../bin/glfw.gypi', diff --git a/platform/osx/scripts/osxtest.xcscheme b/platform/osx/scripts/osxtest.xcscheme index dbc0577df8..5060703614 100644 --- a/platform/osx/scripts/osxtest.xcscheme +++ b/platform/osx/scripts/osxtest.xcscheme @@ -19,7 +19,7 @@ BlueprintIdentifier = "6EE19CDFBCE7BD04FE561812" BuildableName = "osxtest.xctest" BlueprintName = "osxtest" - ReferencedContainer = "container:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + ReferencedContainer = "container:../../build/osx/platform/osx/platform.xcodeproj"> -- cgit v1.2.1