atria-soft/ios-deploy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'phonegap/master'

Browse Source
This commit is contained in:
Incont 2015-05-16 20:55:55 +03:00
commit 5377d9bec7
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ios-deploy.c
View File

@ -18,7 +18,7 @@
#include "MobileDevice.h"
#include "errors.h"
#define APP_VERSION "1.6.1"
#define APP_VERSION "1.6.3"
#define PREP_CMDS_PATH "/tmp/fruitstrap-lldb-prep-cmds-"
#define LLDB_SHELL "lldb -s " PREP_CMDS_PATH
/*
@ -446,16 +446,11 @@ CFStringRef get_device_full_name(const AMDeviceRef device) {
if (verbose)
{
char *devName = MYCFStringCopyUTF8String(device_name);
printf("Device Name:[%s]\n",devName);
CFShow(device_name);
printf("\n");
CFShow([NSString stringWithFormat:@"Device Name: %s\n", devName]);
free(devName);
char *mdlName = MYCFStringCopyUTF8String(model_name);
printf("Model Name:[%s]\n",mdlName);
printf("MM: [%s]\n",CFStringGetCStringPtr(model_name, kCFStringEncodingUTF8));
CFShow(model_name);
printf("\n");
CFShow([NSString stringWithFormat:@"Model Name: %s\n", mdlName]);
free(mdlName);
}
@ -1566,9 +1561,9 @@ void handle_device(AMDeviceRef device) {
CFStringRef found_device_id = AMDeviceCopyDeviceIdentifier(device),
device_full_name = get_device_full_name(device),
device_interface_name = get_device_interface_name(device);
if (detect_only) {
printf("[....] Found %s connected through %s.\n", CFStringGetCStringPtr(device_full_name, CFStringGetSystemEncoding()), CFStringGetCStringPtr(device_interface_name, CFStringGetSystemEncoding()));
CFShow([NSString stringWithFormat:@"[....] Found %@ connected through %@.\n", device_full_name, device_interface_name]);
found_device = true;
return;
}
@ -1576,7 +1571,7 @@ void handle_device(AMDeviceRef device) {
if(strcmp(device_id, CFStringGetCStringPtr(found_device_id, CFStringGetSystemEncoding())) == 0) {
found_device = true;
} else {
printf("Skipping %s.\n", CFStringGetCStringPtr(device_full_name, CFStringGetSystemEncoding()));
CFShow([NSString stringWithFormat:@"Skipping %@.\n", device_full_name]);
return;
}
} else {
@ -1584,7 +1579,7 @@ void handle_device(AMDeviceRef device) {
found_device = true;
}
printf("[....] Using %s (%s).\n", CFStringGetCStringPtr(device_full_name, CFStringGetSystemEncoding()), CFStringGetCStringPtr(found_device_id, CFStringGetSystemEncoding()));
CFShow([NSString stringWithFormat:@"[....] Using %@ (%@).\n", device_full_name, found_device_id]);
if (command_only) {
if (strcmp("list", command) == 0) {
@ -1649,7 +1644,7 @@ void handle_device(AMDeviceRef device) {
if(install) {
printf("------ Install phase ------\n");
printf("[ 0%%] Found %s connected through %s, beginning install\n", CFStringGetCStringPtr(device_full_name, CFStringGetSystemEncoding()), CFStringGetCStringPtr(device_interface_name, CFStringGetSystemEncoding()));
CFShow([NSString stringWithFormat:@"[ 0%%] Found %@ connected through %@, beginning install\n", device_full_name, device_interface_name]);
AMDeviceConnect(device);
assert(AMDeviceIsPaired(device));

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ios-deploy",
"version": "1.6.1",
"version": "1.6.2",
"os" : [ "darwin" ],
"description": "launch iOS apps iOS devices from the command line (Xcode 6)",
"main": "ios-deploy",