From 62c6f09544f58f3109df3bb25834fc23a2e31191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 4 Jul 2017 22:51:19 +0300 Subject: [PATCH] Look for the developer disk image using more patterns as well Xcode 8.3.3 contains the following directories in Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/DeviceSupport: 10.0 8.1 9.1 10.1 8.2 9.2 10.2 8.3 9.3 10.3.1 (14E8301) 8.4 8.0 9.0 Despite this, this version of Xcode can run code on iOS devices running iOS 10.3.2 as well. Therefore try with a pattern of ".*", which for 10.3.2 matches when the last version component has been stripped, into 10.3. This fixes the latest occurrances of github issue #171. --- src/ios-deploy/ios-deploy.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ios-deploy/ios-deploy.m b/src/ios-deploy/ios-deploy.m index c890eea6..87dcba3d 100644 --- a/src/ios-deploy/ios-deploy.m +++ b/src/ios-deploy/ios-deploy.m @@ -430,6 +430,10 @@ CFStringRef copy_device_support_path(AMDeviceRef device, CFStringRef suffix) { if (path == NULL) { path = copy_xcode_path_for(deviceClassPath[i], CFStringCreateWithFormat(NULL, NULL, CFSTR("%@/%@"), version, suffix)); } + + if (path == NULL) { + path = copy_xcode_path_for(deviceClassPath[i], CFStringCreateWithFormat(NULL, NULL, CFSTR("%@.*/%@"), version, suffix)); + } } CFRelease(version);