Skip to content

Merge from official repo master #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 21, 2021
Merged

Merge from official repo master #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4d56c4
Incremented version to 1.11.3
ivanhernandez13 Oct 23, 2020
18d7597
Typo in description (#489)
Nov 18, 2020
9233ad0
Always emit "Symbol Path: ", even when running `--nolldb` (#488)
dwarfland Nov 19, 2020
944329c
Show connection type in "Disconnected" messages (#490)
dwarfland Nov 20, 2020
00a39c8
Show iOS version and build version in "Device found" message (#491)
dwarfland Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ brew install ios-deploy
Run:

```
python -m py_compile src/scripts/*.py && xcodebuild -target ios-deploy-lib && xcodebuild test -scheme ios-deploy-tests
python -m py_compile src/scripts/*.py && xcodebuild -target ios-deploy && xcodebuild test -scheme ios-deploy-tests
```

## Usage
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ios-deploy",
"version": "1.11.2",
"version": "1.11.3",
"os": [
"darwin"
],
Expand Down
20 changes: 16 additions & 4 deletions src/ios-deploy/ios-deploy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,13 @@ CFStringRef get_device_full_name(const AMDeviceRef device) {
NSLogVerbose(@"Architecture Name: %@", arch_name);
NSLogVerbose(@"Product Version: %@", product_version);
NSLogVerbose(@"Build Version: %@", build_version);
if (build_version == 0)
build_version = CFStringCreateWithCString(NULL, "", kCFStringEncodingUTF8);

if (device_name != NULL) {
full_name = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@ (%@, %@, %@, %@) a.k.a. '%@'"), device_udid, model, model_name, sdk_name, arch_name, device_name);
full_name = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@ (%@, %@, %@, %@, %@, %@) a.k.a. '%@'"), device_udid, model, model_name, sdk_name, arch_name, product_version, build_version, device_name);
} else {
full_name = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@ (%@, %@, %@, %@)"), device_udid, model, model_name, sdk_name, arch_name);
full_name = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@ (%@, %@, %@, %@, %@, %@)"), device_udid, model, model_name, sdk_name, arch_name, product_version, build_version);
}

AMDeviceDisconnect(device);
Expand Down Expand Up @@ -658,7 +660,16 @@ void mount_developer_image(AMDeviceRef device) {

on_error(@"Unable to mount developer disk image. (%x)", result);
}


CFStringRef symbols_path = copy_device_support_path(device, CFSTR("Symbols"));
if (symbols_path != NULL)
{
NSLogOut(@"Symbol Path: %@", symbols_path);
NSLogJSON(@{@"Event": @"MountDeveloperImage",
@"SymbolsPath": (__bridge NSString *)symbols_path
}); CFRelease(symbols_path);
}

CFRelease(image_path);
CFRelease(options);
}
Expand Down Expand Up @@ -2182,8 +2193,9 @@ void device_callback(struct am_device_notification_callback_info *info, void *ar
break;
case ADNCI_MSG_DISCONNECTED:
{
CFStringRef device_interface_name = get_device_interface_name(info->dev);
CFStringRef device_uuid = AMDeviceCopyDeviceIdentifier(info->dev);
NSLogOut(@"[....] Disconnected %@", device_uuid);
NSLogOut(@"[....] Disconnected %@ from %@.", device_uuid, device_interface_name);
CFRelease(device_uuid);
break;
}
Expand Down
2 changes: 1 addition & 1 deletion src/ios-deploy/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"1.11.2"
"1.11.3"