tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ios] Build output goes to build/ios

Browse Source
This commit is contained in:
John Firebaugh
2016-04-18 18:08:54 -07:00
parent a883ac9253
commit 4bc4d35c60
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@@ -55,10 +55,9 @@ test-osx: osx node_modules/express
#### iOS targets ##############################################################
IOS_OUTPUT_PATH = build/ios-all
IOS_OUTPUT_PATH = build/ios
IOS_PROJ_PATH = $(IOS_OUTPUT_PATH)/platform/ios/platform.xcodeproj
IOS_WORK_PATH = platform/ios/ios.xcworkspace
IOS_DERIVED_DATA_PATH = build/DerivedData/ios
$(IOS_OUTPUT_PATH)/config.gypi: platform/ios/scripts/configure.sh .mason configure
MASON_PLATFORM=ios ./configure $< $@
@@ -72,7 +71,7 @@ $(IOS_PROJ_PATH): platform/ios/platform.gyp $(IOS_OUTPUT_PATH)/config.gypi $(IOS
ios: $(IOS_PROJ_PATH)
set -o pipefail && xcodebuild \
ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES \
-derivedDataPath $(IOS_DERIVED_DATA_PATH) \
-derivedDataPath $(IOS_OUTPUT_PATH) \
-configuration $(BUILDTYPE) -sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \
-workspace $(IOS_WORK_PATH) -scheme CI build | xcpretty
@@ -82,10 +81,10 @@ iproj: $(IOS_PROJ_PATH)
test-ios: ios
ios-sim start --devicetypeid 'com.apple.CoreSimulator.SimDeviceType.iPhone-6,9.3'
ios-sim launch $(IOS_DERIVED_DATA_PATH)/Build/Products/$(BUILDTYPE)-iphonesimulator/ios-test.app --verbose --devicetypeid 'com.apple.CoreSimulator.SimDeviceType.iPhone-6,9.3'
ios-sim launch $(IOS_OUTPUT_PATH)/Build/Products/$(BUILDTYPE)-iphonesimulator/ios-test.app --verbose --devicetypeid 'com.apple.CoreSimulator.SimDeviceType.iPhone-6,9.3'
set -o pipefail && xcodebuild \
ARCHS=x86_64 ONLY_ACTIVE_ARCH=YES \
-derivedDataPath $(IOS_DERIVED_DATA_PATH) \
-derivedDataPath $(IOS_OUTPUT_PATH) \
-configuration $(BUILDTYPE) -sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 6,OS=latest' \
-workspace $(IOS_WORK_PATH) -scheme CI test | xcpretty

6
platform/ios/ios.xcodeproj/project.pbxproj
View File

@@ -377,7 +377,7 @@
DABCABBB1CB80692000A7C39 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
DABCABBF1CB80717000A7C39 /* locations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locations.cpp; sourceTree = "<group>"; };
DABCABC01CB80717000A7C39 /* locations.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = locations.hpp; sourceTree = "<group>"; };
DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = "../../build/ios-all/mbgl.xcconfig"; sourceTree = "<group>"; };
DAC07C961CBB2CD6000CB309 /* mbgl.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = mbgl.xcconfig; path = "../../build/ios/mbgl.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -1188,7 +1188,7 @@
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SYMROOT = "../../build/ios-all";
SYMROOT = "../../build/ios";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
@@ -1227,7 +1227,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SYMROOT = "../../build/ios-all";
SYMROOT = "../../build/ios";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};

2
platform/ios/ios.xcodeproj/xcshareddata/xcschemes/CI.xcscheme
View File

@@ -17,7 +17,7 @@
BlueprintIdentifier = "4E8A9455A3A23B7FD2A8FC52"
BuildableName = "All"
BlueprintName = "All"
ReferencedContainer = "container:../../build/ios-all/platform/ios/platform.xcodeproj">
ReferencedContainer = "container:../../build/ios/platform/ios/platform.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry

2
platform/ios/ios.xcworkspace/contents.xcworkspacedata generated
View File

@@ -11,6 +11,6 @@
location = "group:uitest/KIF/KIF.xcodeproj">
</FileRef>
<FileRef
location = "group:../../build/ios-all/platform/ios/platform.xcodeproj">
location = "group:../../build/ios/platform/ios/platform.xcodeproj">
</FileRef>
</Workspace>

2
platform/ios/platform.gyp
View File

@@ -5,7 +5,7 @@
'coverage': 0,
},
'includes': [
'../../build/ios-all/config.gypi',
'../../build/ios/config.gypi',
'../../mbgl.gypi',
'../../test/test.gypi',
],

2
platform/ios/scripts/package.sh
View File

@@ -6,7 +6,7 @@ set -u
NAME=Mapbox
OUTPUT=build/ios/pkg
DERIVED_DATA=build/DerivedData/ios
DERIVED_DATA=build/ios
PRODUCTS=${DERIVED_DATA}/Build/Products
BUILDTYPE=${BUILDTYPE:-Release}

4
platform/ios/uitest/ios-tests.xcodeproj/project.pbxproj
View File

@@ -400,7 +400,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SYMROOT = "../../../build/ios-all";
SYMROOT = "../../../build/ios";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
@@ -434,7 +434,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
SDKROOT = iphoneos;
SYMROOT = "../../../build/ios-all";
SYMROOT = "../../../build/ios";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
};