From a7e4e6bb1c738f20f8585249fe3ab61cbbf85f71 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 16 Dec 2015 16:49:29 -0800 Subject: [PATCH] [ios] Move source to src folder, matching osx --- gyp/platform-ios.gypi | 34 +++++++++---------- platform/ios/{ => src}/MGLAccountManager.m | 0 .../ios/{ => src}/MGLAccountManager_Private.h | 0 platform/ios/{ => src}/MGLAnnotationImage.m | 0 .../{ => src}/MGLAnnotationImage_Private.h | 0 platform/ios/{ => src}/MGLCategoryLoader.h | 0 platform/ios/{ => src}/MGLCategoryLoader.m | 0 platform/ios/{ => src}/MGLMapView.mm | 4 +-- platform/ios/{ => src}/MGLMapboxEvents.h | 0 platform/ios/{ => src}/MGLMapboxEvents.m | 0 platform/ios/{ => src}/MGLUserLocation.m | 0 .../{ => src}/MGLUserLocationAnnotationView.h | 0 .../{ => src}/MGLUserLocationAnnotationView.m | 0 .../ios/{ => src}/MGLUserLocation_Private.h | 0 .../ios/{ => src}/NSBundle+MGLAdditions.h | 0 .../ios/{ => src}/NSBundle+MGLAdditions.m | 0 .../{ => src}/NSProcessInfo+MGLAdditions.h | 0 .../{ => src}/NSProcessInfo+MGLAdditions.m | 0 18 files changed, 19 insertions(+), 19 deletions(-) rename platform/ios/{ => src}/MGLAccountManager.m (100%) rename platform/ios/{ => src}/MGLAccountManager_Private.h (100%) rename platform/ios/{ => src}/MGLAnnotationImage.m (100%) rename platform/ios/{ => src}/MGLAnnotationImage_Private.h (100%) rename platform/ios/{ => src}/MGLCategoryLoader.h (100%) rename platform/ios/{ => src}/MGLCategoryLoader.m (100%) rename platform/ios/{ => src}/MGLMapView.mm (99%) rename platform/ios/{ => src}/MGLMapboxEvents.h (100%) rename platform/ios/{ => src}/MGLMapboxEvents.m (100%) rename platform/ios/{ => src}/MGLUserLocation.m (100%) rename platform/ios/{ => src}/MGLUserLocationAnnotationView.h (100%) rename platform/ios/{ => src}/MGLUserLocationAnnotationView.m (100%) rename platform/ios/{ => src}/MGLUserLocation_Private.h (100%) rename platform/ios/{ => src}/NSBundle+MGLAdditions.h (100%) rename platform/ios/{ => src}/NSBundle+MGLAdditions.m (100%) rename platform/ios/{ => src}/NSProcessInfo+MGLAdditions.h (100%) rename platform/ios/{ => src}/NSProcessInfo+MGLAdditions.m (100%) diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi index 22a44dd31..8707a4272 100644 --- a/gyp/platform-ios.gypi +++ b/gyp/platform-ios.gypi @@ -46,29 +46,29 @@ '../include/mbgl/darwin/MGLMapCamera.h', '../platform/darwin/MGLMapCamera.mm', '../include/mbgl/ios/Mapbox.h', - '../platform/ios/MGLMapboxEvents.h', - '../platform/ios/MGLMapboxEvents.m', + '../platform/ios/src/MGLMapboxEvents.h', + '../platform/ios/src/MGLMapboxEvents.m', '../include/mbgl/ios/MGLMapView.h', '../include/mbgl/ios/MGLMapView+IBAdditions.h', '../include/mbgl/ios/MGLMapView+MGLCustomStyleLayerAdditions.h', - '../platform/ios/MGLMapView.mm', + '../platform/ios/src/MGLMapView.mm', '../include/mbgl/ios/MGLAccountManager.h', - '../platform/ios/MGLAccountManager_Private.h', - '../platform/ios/MGLAccountManager.m', + '../platform/ios/src/MGLAccountManager_Private.h', + '../platform/ios/src/MGLAccountManager.m', '../include/mbgl/ios/MGLUserLocation.h', - '../platform/ios/MGLUserLocation_Private.h', - '../platform/ios/MGLUserLocation.m', - '../platform/ios/MGLUserLocationAnnotationView.h', - '../platform/ios/MGLUserLocationAnnotationView.m', + '../platform/ios/src/MGLUserLocation_Private.h', + '../platform/ios/src/MGLUserLocation.m', + '../platform/ios/src/MGLUserLocationAnnotationView.h', + '../platform/ios/src/MGLUserLocationAnnotationView.m', '../include/mbgl/ios/MGLAnnotationImage.h', - '../platform/ios/MGLAnnotationImage_Private.h', - '../platform/ios/MGLAnnotationImage.m', - '../platform/ios/MGLCategoryLoader.h', - '../platform/ios/MGLCategoryLoader.m', - '../platform/ios/NSBundle+MGLAdditions.h', - '../platform/ios/NSBundle+MGLAdditions.m', - '../platform/ios/NSProcessInfo+MGLAdditions.h', - '../platform/ios/NSProcessInfo+MGLAdditions.m', + '../platform/ios/src/MGLAnnotationImage_Private.h', + '../platform/ios/src/MGLAnnotationImage.m', + '../platform/ios/src/MGLCategoryLoader.h', + '../platform/ios/src/MGLCategoryLoader.m', + '../platform/ios/src/NSBundle+MGLAdditions.h', + '../platform/ios/src/NSBundle+MGLAdditions.m', + '../platform/ios/src/NSProcessInfo+MGLAdditions.h', + '../platform/ios/src/NSProcessInfo+MGLAdditions.m', '../platform/ios/vendor/SMCalloutView/SMCalloutView.h', '../platform/ios/vendor/SMCalloutView/SMCalloutView.m', '../platform/ios/vendor/Fabric/FABAttributes.h', diff --git a/platform/ios/MGLAccountManager.m b/platform/ios/src/MGLAccountManager.m similarity index 100% rename from platform/ios/MGLAccountManager.m rename to platform/ios/src/MGLAccountManager.m diff --git a/platform/ios/MGLAccountManager_Private.h b/platform/ios/src/MGLAccountManager_Private.h similarity index 100% rename from platform/ios/MGLAccountManager_Private.h rename to platform/ios/src/MGLAccountManager_Private.h diff --git a/platform/ios/MGLAnnotationImage.m b/platform/ios/src/MGLAnnotationImage.m similarity index 100% rename from platform/ios/MGLAnnotationImage.m rename to platform/ios/src/MGLAnnotationImage.m diff --git a/platform/ios/MGLAnnotationImage_Private.h b/platform/ios/src/MGLAnnotationImage_Private.h similarity index 100% rename from platform/ios/MGLAnnotationImage_Private.h rename to platform/ios/src/MGLAnnotationImage_Private.h diff --git a/platform/ios/MGLCategoryLoader.h b/platform/ios/src/MGLCategoryLoader.h similarity index 100% rename from platform/ios/MGLCategoryLoader.h rename to platform/ios/src/MGLCategoryLoader.h diff --git a/platform/ios/MGLCategoryLoader.m b/platform/ios/src/MGLCategoryLoader.m similarity index 100% rename from platform/ios/MGLCategoryLoader.m rename to platform/ios/src/MGLCategoryLoader.m diff --git a/platform/ios/MGLMapView.mm b/platform/ios/src/MGLMapView.mm similarity index 99% rename from platform/ios/MGLMapView.mm rename to platform/ios/src/MGLMapView.mm index 63bd41e7d..e506ce16f 100644 --- a/platform/ios/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -27,8 +27,8 @@ #include #import "Mapbox.h" -#import "../darwin/MGLGeometry_Private.h" -#import "../darwin/MGLMultiPoint_Private.h" +#import "../../darwin/MGLGeometry_Private.h" +#import "../../darwin/MGLMultiPoint_Private.h" #import "NSBundle+MGLAdditions.h" #import "NSString+MGLAdditions.h" diff --git a/platform/ios/MGLMapboxEvents.h b/platform/ios/src/MGLMapboxEvents.h similarity index 100% rename from platform/ios/MGLMapboxEvents.h rename to platform/ios/src/MGLMapboxEvents.h diff --git a/platform/ios/MGLMapboxEvents.m b/platform/ios/src/MGLMapboxEvents.m similarity index 100% rename from platform/ios/MGLMapboxEvents.m rename to platform/ios/src/MGLMapboxEvents.m diff --git a/platform/ios/MGLUserLocation.m b/platform/ios/src/MGLUserLocation.m similarity index 100% rename from platform/ios/MGLUserLocation.m rename to platform/ios/src/MGLUserLocation.m diff --git a/platform/ios/MGLUserLocationAnnotationView.h b/platform/ios/src/MGLUserLocationAnnotationView.h similarity index 100% rename from platform/ios/MGLUserLocationAnnotationView.h rename to platform/ios/src/MGLUserLocationAnnotationView.h diff --git a/platform/ios/MGLUserLocationAnnotationView.m b/platform/ios/src/MGLUserLocationAnnotationView.m similarity index 100% rename from platform/ios/MGLUserLocationAnnotationView.m rename to platform/ios/src/MGLUserLocationAnnotationView.m diff --git a/platform/ios/MGLUserLocation_Private.h b/platform/ios/src/MGLUserLocation_Private.h similarity index 100% rename from platform/ios/MGLUserLocation_Private.h rename to platform/ios/src/MGLUserLocation_Private.h diff --git a/platform/ios/NSBundle+MGLAdditions.h b/platform/ios/src/NSBundle+MGLAdditions.h similarity index 100% rename from platform/ios/NSBundle+MGLAdditions.h rename to platform/ios/src/NSBundle+MGLAdditions.h diff --git a/platform/ios/NSBundle+MGLAdditions.m b/platform/ios/src/NSBundle+MGLAdditions.m similarity index 100% rename from platform/ios/NSBundle+MGLAdditions.m rename to platform/ios/src/NSBundle+MGLAdditions.m diff --git a/platform/ios/NSProcessInfo+MGLAdditions.h b/platform/ios/src/NSProcessInfo+MGLAdditions.h similarity index 100% rename from platform/ios/NSProcessInfo+MGLAdditions.h rename to platform/ios/src/NSProcessInfo+MGLAdditions.h diff --git a/platform/ios/NSProcessInfo+MGLAdditions.m b/platform/ios/src/NSProcessInfo+MGLAdditions.m similarity index 100% rename from platform/ios/NSProcessInfo+MGLAdditions.m rename to platform/ios/src/NSProcessInfo+MGLAdditions.m