[ios, osx] Consolidate remaining files in platform/{ios,osx}

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/mapbox/mason.git
 
 [submodule "test/ios/KIF"]
-	path = test/ios/KIF
+	path = platform/ios/test/KIF
 	url = https://github.com/kif-framework/KIF.git
 
 [submodule "platform/ios/vendor/SMCalloutView"]

.jazzy.yaml

@@ -11,8 +11,8 @@ custom_head: |
 objc_mode: Yes
 skip_undocumented: Yes
 hide_documentation_coverage: Yes
-umbrella_header: include/mbgl/ios/Mapbox.h
-framework_root: include/mbgl/darwin
+umbrella_header: platform/ios/include/Mapbox.h
+framework_root: platform/darwin/include
 
 custom_categories:
   - name: Map

gyp/http-nsurl.gypi

@@ -7,7 +7,7 @@
       'hard_dependency': 1,
 
       'sources': [
-        '../platform/darwin/http_request_nsurl.mm',
+        '../platform/darwin/src/http_request_nsurl.mm',
       ],
 
       'include_dirs': [

gyp/ios.gyp

@@ -1,7 +1,7 @@
 {
   'includes': [
-    '../ios/app/mapboxgl-app.gypi',
-    '../ios/framework/framework-ios.gypi',
-    '../ios/benchmark/benchmark-ios.gypi',
+    '../platform/ios/app/mapboxgl-app.gypi',
+    '../platform/ios/framework/framework-ios.gypi',
+    '../platform/ios/benchmark/benchmark-ios.gypi',
   ],
 }

gyp/platform-ios.gypi

@@ -24,26 +24,26 @@
         '../platform/default/mbgl/storage/offline_download.cpp',
         '../platform/default/sqlite3.hpp',
         '../platform/default/sqlite3.cpp',
-        '../platform/darwin/log_nslog.mm',
-        '../platform/darwin/string_nsstring.mm',
-        '../platform/darwin/application_root.mm',
-        '../platform/darwin/image.mm',
-        '../platform/darwin/nsthread.mm',
-        '../platform/darwin/reachability.m',
-        '../platform/darwin/NSException+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.m',
-        '../platform/darwin/MGLTypes.m',
-        '../platform/darwin/MGLStyle.mm',
-        '../platform/darwin/MGLGeometry_Private.h',
-        '../platform/darwin/MGLGeometry.mm',
-        '../platform/darwin/MGLShape.m',
-        '../platform/darwin/MGLMultiPoint_Private.h',
-        '../platform/darwin/MGLMultiPoint.mm',
-        '../platform/darwin/MGLPointAnnotation.m',
-        '../platform/darwin/MGLPolyline.mm',
-        '../platform/darwin/MGLPolygon.mm',
-        '../platform/darwin/MGLMapCamera.mm',
+        '../platform/darwin/src/log_nslog.mm',
+        '../platform/darwin/src/string_nsstring.mm',
+        '../platform/darwin/src/application_root.mm',
+        '../platform/darwin/src/image.mm',
+        '../platform/darwin/src/nsthread.mm',
+        '../platform/darwin/src/reachability.m',
+        '../platform/darwin/src/NSException+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.m',
+        '../platform/darwin/src/MGLTypes.m',
+        '../platform/darwin/src/MGLStyle.mm',
+        '../platform/darwin/src/MGLGeometry_Private.h',
+        '../platform/darwin/src/MGLGeometry.mm',
+        '../platform/darwin/src/MGLShape.m',
+        '../platform/darwin/src/MGLMultiPoint_Private.h',
+        '../platform/darwin/src/MGLMultiPoint.mm',
+        '../platform/darwin/src/MGLPointAnnotation.m',
+        '../platform/darwin/src/MGLPolyline.mm',
+        '../platform/darwin/src/MGLPolygon.mm',
+        '../platform/darwin/src/MGLMapCamera.mm',
         '../platform/ios/src/MGLMapboxEvents.h',
         '../platform/ios/src/MGLMapboxEvents.m',
         '../platform/ios/src/MGLMapView.mm',
@@ -55,7 +55,7 @@
         '../platform/ios/src/MGLUserLocationAnnotationView.m',
         '../platform/ios/src/MGLAnnotationImage_Private.h',
         '../platform/ios/src/MGLAnnotationImage.m',
-        '../include/mbgl/ios/MGLCalloutView.h',
+        '../platform/ios/include/MGLCalloutView.h',
         '../platform/ios/src/MGLCompactCalloutView.h',
         '../platform/ios/src/MGLCompactCalloutView.m',
         '../platform/ios/src/NSBundle+MGLAdditions.h',
@@ -100,8 +100,8 @@
       },
 
       'include_dirs': [
-        '../include/mbgl/ios',
-        '../include/mbgl/darwin',
+        '../platform/ios/include',
+        '../platform/darwin/include',
         '../include',
         '../src',
         '../platform/default',
@@ -122,8 +122,8 @@
 
       'direct_dependent_settings': {
         'include_dirs': [
-          '../include/mbgl/ios',
-          '../include/mbgl/darwin',
+          '../platform/ios/include',
+          '../platform/darwin/include',
           '../include',
         ],
         'mac_bundle_resources': [

gyp/platform-osx.gypi

@@ -23,26 +23,26 @@
         '../platform/default/mbgl/storage/offline_download.cpp',
         '../platform/default/sqlite3.hpp',
         '../platform/default/sqlite3.cpp',
-        '../platform/darwin/log_nslog.mm',
-        '../platform/darwin/string_nsstring.mm',
-        '../platform/darwin/application_root.mm',
-        '../platform/darwin/image.mm',
-        '../platform/darwin/nsthread.mm',
-        '../platform/darwin/reachability.m',
-        '../platform/darwin/NSException+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.h',
-        '../platform/darwin/NSString+MGLAdditions.m',
-        '../platform/darwin/MGLTypes.m',
-        '../platform/darwin/MGLStyle.mm',
-        '../platform/darwin/MGLGeometry_Private.h',
-        '../platform/darwin/MGLGeometry.mm',
-        '../platform/darwin/MGLShape.m',
-        '../platform/darwin/MGLMultiPoint_Private.h',
-        '../platform/darwin/MGLMultiPoint.mm',
-        '../platform/darwin/MGLPointAnnotation.m',
-        '../platform/darwin/MGLPolyline.mm',
-        '../platform/darwin/MGLPolygon.mm',
-        '../platform/darwin/MGLMapCamera.mm',
+        '../platform/darwin/src/log_nslog.mm',
+        '../platform/darwin/src/string_nsstring.mm',
+        '../platform/darwin/src/application_root.mm',
+        '../platform/darwin/src/image.mm',
+        '../platform/darwin/src/nsthread.mm',
+        '../platform/darwin/src/reachability.m',
+        '../platform/darwin/src/NSException+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.h',
+        '../platform/darwin/src/NSString+MGLAdditions.m',
+        '../platform/darwin/src/MGLTypes.m',
+        '../platform/darwin/src/MGLStyle.mm',
+        '../platform/darwin/src/MGLGeometry_Private.h',
+        '../platform/darwin/src/MGLGeometry.mm',
+        '../platform/darwin/src/MGLShape.m',
+        '../platform/darwin/src/MGLMultiPoint_Private.h',
+        '../platform/darwin/src/MGLMultiPoint.mm',
+        '../platform/darwin/src/MGLPointAnnotation.m',
+        '../platform/darwin/src/MGLPolyline.mm',
+        '../platform/darwin/src/MGLPolygon.mm',
+        '../platform/darwin/src/MGLMapCamera.mm',
         '../platform/osx/src/MGLAccountManager_Private.h',
         '../platform/osx/src/MGLAccountManager.m',
         '../platform/osx/src/MGLMapView_Private.h',
@@ -85,8 +85,8 @@
       },
 
       'include_dirs': [
-        '../include/mbgl/osx',
-        '../include/mbgl/darwin',
+        '../platform/osx/include',
+        '../platform/darwin/include',
         '../include',
         '../src',
         '../platform/default',
@@ -107,8 +107,8 @@
 
       'direct_dependent_settings': {
         'include_dirs': [
-          '../include/mbgl/osx',
-          '../include/mbgl/darwin',
+          '../platform/osx/include',
+          '../platform/darwin/include',
           '../include',
         ],
         'mac_bundle_resources': [

ios/README.md

@@ -1 +0,0 @@
-The Mapbox iOS SDK is [located here](../platform/ios/).

platform/ios/DEVELOPING.md

@@ -48,7 +48,7 @@ Run
 
 To run the included integration tests on the command line.
 
-If you want to run the tests in Xcode instead, first `make ipackage` to create a local static library version, then open `test/ios/ios-tests.xcodeproj`, and lastly `Command + U` on the `Mapbox GL Tests` application target.
+If you want to run the tests in Xcode instead, first `make ipackage` to create a local static library version, then open `platform/ios/test/ios-tests.xcodeproj`, and lastly `Command + U` on the `Mapbox GL Tests` application target.
 
 ### Usage
 

platform/ios/app/MBXViewController.mm

@@ -2,7 +2,7 @@
 #import "MBXCustomCalloutView.h"
 
 #import <Mapbox/Mapbox.h>
-#import "../../include/mbgl/util/default_styles.hpp"
+#import "../../../include/mbgl/util/default_styles.hpp"
 
 #import <CoreLocation/CoreLocation.h>
 #import <OpenGLES/ES2/gl.h>

platform/ios/app/mapboxgl-app.gypi

@@ -1,6 +1,6 @@
 {
   'includes': [
-    '../../gyp/common.gypi',
+    '../../../gyp/common.gypi',
   ],
   'targets': [
     {
@@ -10,7 +10,7 @@
       'product_extension': 'app',
       'mac_bundle': 1,
       'mac_bundle_resources': [
-        '<!@(find ../ios/app/img -type f)',
+        '<!@(find ../platform/ios/app/img -type f)',
         './points.geojson',
         './polyline.geojson',
         './threestates.geojson',
@@ -36,7 +36,7 @@
         'SDKROOT': 'iphoneos',
         'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
         'IPHONEOS_DEPLOYMENT_TARGET': '8.0',
-        'INFOPLIST_FILE': '../ios/app/app-info.plist',
+        'INFOPLIST_FILE': '../platform/ios/app/app-info.plist',
         'TARGETED_DEVICE_FAMILY': '1,2',
         'COMBINE_HIDPI_IMAGES': 'NO', # disable combining @2x, @3x images into .tiff files
         'COPY_PHASE_STRIP': 'NO',