[ios] Moved SDK from gyp into Xcode project

Added a new Cocoa Touch dynamic framework target and Cocoa Touch static library target to the main iOS Xcode project. The targets are based on the templates provided by Xcode. They contain headers and source files in the darwin/ and ios/ subdirectories. Headers are explicitly marked public or project-internal instead of implicitly by subdirectory.

The SDK targets have a few dependencies that are managed by mason. Transform the config.gypi generated by configure into an .xcconfig file that Xcode uses to fill in compiler and linker flags.

Removed the iossdk target from platform.gypi and pared down the platform-lib target. make iproj opens the overall Xcode workspace instead of just the core project.

Resolved some warnings that are only now appearing because we’re using the standard warning and error flags instead of the pedantic and somewhat inappropriate flags that were forced by the gyp configuration files. Removed a console message informing developers of a long-ago deleted delegate method; the message was triggering a “selector not found” warning. Conditionalized some deprecated symbol usage that’s still needed for the static framework but not the dynamic framework, due to differing minimum deployment targets.

Added a build phase to the static library target that copies headers for use with the static library itself. This would allow us to potentially include a header in the dynamic framework but not the static library and vice-versa.

Updated the changelog to note that unused SVG files have been removed from the distribution.

1 files changed, 10 insertions, 11 deletions

diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
index d3c1af9951..0da361a637 100755
--- a/platform/ios/scripts/package.sh
+++ b/platform/ios/scripts/package.sh
@@ -85,9 +85,9 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
             DEPLOYMENT_POSTPROCESSING=YES \
             CODE_SIGNING_REQUIRED=NO \
             CODE_SIGN_IDENTITY= \
-            -project ./build/ios-all/platform/ios/platform.xcodeproj \
+            -workspace ./platform/ios/ios.xcworkspace \
             -configuration ${BUILDTYPE} \
-            -target platform-lib \
+            -scheme static \
             -jobs ${JOBS} | xcpretty
     fi
 
@@ -102,9 +102,9 @@ if [[ "${BUILD_FOR_DEVICE}" == true ]]; then
             CURRENT_PROJECT_VERSION=${PROJ_VERSION} \
             CODE_SIGNING_REQUIRED=NO \
             CODE_SIGN_IDENTITY= \
-            -project ./build/ios-all/platform/ios/platform.xcodeproj \
+            -workspace ./platform/ios/ios.xcworkspace \
             -configuration ${BUILDTYPE} \
-            -target iossdk \
+            -scheme dynamic \
             -jobs ${JOBS} | xcpretty
     fi
 fi
@@ -115,9 +115,9 @@ if [[ ${BUILD_STATIC} == true ]]; then
         ARCHS="x86_64 i386" \
         ONLY_ACTIVE_ARCH=NO \
         GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \
-        -project ./build/ios-all/platform/ios/platform.xcodeproj \
+        -workspace ./platform/ios/ios.xcworkspace \
         -configuration ${BUILDTYPE} \
-        -target platform-lib \
+        -scheme static \
         -jobs ${JOBS} | xcpretty
 fi
 
@@ -129,9 +129,9 @@ if [[ ${BUILD_DYNAMIC} == true ]]; then
         GCC_GENERATE_DEBUGGING_SYMBOLS=${GCC_GENERATE_DEBUGGING_SYMBOLS} \
         ENABLE_BITCODE=${ENABLE_BITCODE} \
         CURRENT_PROJECT_VERSION=${PROJ_VERSION} \
-        -project ./build/ios-all/platform/ios/platform.xcodeproj \
+        -workspace ./platform/ios/ios.xcworkspace \
         -configuration ${BUILDTYPE} \
-        -target iossdk \
+        -scheme dynamic \
         -jobs ${JOBS} | xcpretty
 fi
 
@@ -202,10 +202,9 @@ fi
 
 if [[ ${BUILD_STATIC} == true ]]; then
     step "Copying static library headers…"
-    mkdir -p "${OUTPUT}/static/${NAME}.framework/Headers"
-    cp -pv platform/{darwin,ios}/include/*.h "${OUTPUT}/static/${NAME}.framework/Headers"
+    cp -rv "build/ios-all/${BUILDTYPE}-iphoneos/Headers" "${OUTPUT}/static/${NAME}.framework/Headers"
     cat platform/ios/framework/Mapbox-static.h > "${OUTPUT}/static/${NAME}.framework/Headers/Mapbox.h"
-    cat platform/ios/framework/Mapbox.h >> "${OUTPUT}/static/${NAME}.framework/Headers/Mapbox.h"
+    cat "build/ios-all/${BUILDTYPE}-iphoneos/Headers/Mapbox.h" >> "${OUTPUT}/static/${NAME}.framework/Headers/Mapbox.h"
 fi
 
 step "Copying library resources…"