diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-08-03 10:47:05 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 94ceeb739dcd71c826a18d53a739da326a81756a (patch) | |
| tree | d058f05efc6a9d6be73bf6ea98672e1a497f2c02 | |
| parent | 87c1174c06250674699dda7c74a0807bd8b01b72 (diff) | |
| download | qtlocation-mapboxgl-94ceeb739dcd71c826a18d53a739da326a81756a.tar.gz | |
[build] fix iOS packaging
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | platform/ios/ios.xcodeproj/project.pbxproj | 2 | ||||
| -rwxr-xr-x | platform/ios/scripts/package.sh | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 626ee2a3a1..16fd245107 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,3 @@ xcuserdata /platform/ios/benchmark/assets/tiles/mapbox.mapbox-terrain-v2,mapbox.mapbox-streets-v6 **/token /platform/macos/macos.xcworkspace/xcshareddata/macos.xcscmblueprint -/platform/ios/pkg diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 8fe54e7712..d6a741f33e 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -14,7 +14,6 @@ 353D23961D0B0DFE002BE09D /* MGLAnnotationViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 353D23951D0B0DFE002BE09D /* MGLAnnotationViewTests.m */; }; 35E208A71D24210F00EC9A46 /* MGLNSDataAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 35E208A61D24210F00EC9A46 /* MGLNSDataAdditionsTests.m */; }; 36F1153D1D46080700878E1A /* libmbgl-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 36F1153B1D46080700878E1A /* libmbgl-core.a */; }; - 36F1153E1D46080700878E1A /* libmbgl-platform-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 36F1153C1D46080700878E1A /* libmbgl-platform-ios.a */; }; 4018B1C71CDC287F00F666AF /* MGLAnnotationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4018B1C41CDC277F00F666AF /* MGLAnnotationView.mm */; }; 4018B1C81CDC287F00F666AF /* MGLAnnotationView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4018B1C41CDC277F00F666AF /* MGLAnnotationView.mm */; }; 4018B1C91CDC288A00F666AF /* MGLAnnotationView_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 4018B1C31CDC277F00F666AF /* MGLAnnotationView_Private.h */; }; @@ -549,7 +548,6 @@ buildActionMask = 2147483647; files = ( 36F1153D1D46080700878E1A /* libmbgl-core.a in Frameworks */, - 36F1153E1D46080700878E1A /* libmbgl-platform-ios.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh index b431bd689d..270647f857 100755 --- a/platform/ios/scripts/package.sh +++ b/platform/ios/scripts/package.sh @@ -5,7 +5,7 @@ set -o pipefail set -u NAME=Mapbox -OUTPUT=platform/ios/pkg +OUTPUT=build/ios/pkg DERIVED_DATA=build/ios PRODUCTS=${DERIVED_DATA} |