Skip to content

fixed the japanese issue #137

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 16 commits into from
May 18, 2015
Merged

fixed the japanese issue #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
12334f8
Merge pull request #2 from phonegap/master
senthilmanick Nov 17, 2014
3dcd64f
Merge with phonegap
Nov 17, 2014
6ac0848
updated the version to 1.3.3
Nov 17, 2014
99f4010
Using debug for -c as well
Dec 7, 2014
8577ef3
sometimes the model is null in get_device_hardware_name; updated to
Jan 17, 2015
96e91eb
merged with phonegap/ios-deploy
Jan 20, 2015
134a0a5
The return code must be < 128 otherwise treated as a signal
Jan 27, 2015
ba60ff6
updated to version 1.3.6
Jan 27, 2015
3e8a897
when just launch, if we get an empty packet, exit without an error
Jan 29, 2015
02c2379
merged with version 1.5.0
Apr 11, 2015
d90171d
updated to merge with phonegap
Apr 11, 2015
5690b10
merged with phonegap
Apr 30, 2015
b72d31b
Fixed a segv happening in non english locale
May 1, 2015
0940a4d
Fixed a segv happening in non english locale
May 1, 2015
a750efa
Merge pull request #1 from senthilmanick/master
May 1, 2015
609b635
Merge https://github.com/phonegap/ios-deploy
mw-senthil May 17, 2015
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Install and debug iOS apps without using Xcode. Designed to work on un-jailbroke
* Xcode 6 or greater should be installed

## Installation
=======

ios-deploy installation is made simple using the node.js package manager. If you use [Homebrew](http://brew.sh/), install [node.js](https://nodejs.org):

Expand Down
12 changes: 7 additions & 5 deletions ios-deploy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "MobileDevice.h"
#include "errors.h"

#define APP_VERSION "1.7.0"
#define APP_VERSION "1.7.1"
#define PREP_CMDS_PATH "/tmp/fruitstrap-lldb-prep-cmds-"
#define LLDB_SHELL "lldb -s " PREP_CMDS_PATH
/*
Expand Down Expand Up @@ -1002,11 +1002,11 @@ void setup_lldb(AMDeviceRef device, CFURLRef url) {

if(AMDeviceGetInterfaceType(device) == 2)
{
printf("Cannot debug %s over %s.\n", CFStringGetCStringPtr(device_full_name, CFStringGetSystemEncoding()), CFStringGetCStringPtr(device_interface_name, CFStringGetSystemEncoding()));
CFShow([NSString stringWithFormat:@"Cannot debug %@ over %@.\n", device_full_name, device_interface_name]);
exit(0);
}

printf("Starting debug of %s connected through %s...\n", CFStringGetCStringPtr(device_full_name, CFStringGetSystemEncoding()), CFStringGetCStringPtr(device_interface_name, CFStringGetSystemEncoding()));
CFShow([NSString stringWithFormat:@"Starting debug of %@ connected through %@...\n", device_full_name, device_interface_name]);

mount_developer_image(device); // put debugserver on the device
start_remote_debug_server(device); // start debugserver
Expand Down Expand Up @@ -1568,8 +1568,10 @@ void handle_device(AMDeviceRef device) {
return;
}
if (device_id != NULL) {
if(strcmp(device_id, CFStringGetCStringPtr(found_device_id, CFStringGetSystemEncoding())) == 0) {
CFStringRef deviceCFSTR = CFStringCreateWithCString(NULL, device_id, kCFStringEncodingASCII);
if (CFStringCompare(deviceCFSTR, found_device_id, kCFCompareCaseInsensitive) == kCFCompareEqualTo) {
found_device = true;
CFRelease(deviceCFSTR);
} else {
CFShow([NSString stringWithFormat:@"Skipping %@.\n", device_full_name]);
return;
Expand All @@ -1587,7 +1589,7 @@ void handle_device(AMDeviceRef device) {
} else if (strcmp("upload", command) == 0) {
upload_file(device);
} else if (strcmp("download", command) == 0) {
download_tree(device);
download_tree(device);
} else if (strcmp("mkdir", command) == 0) {
make_directory(device);
} else if (strcmp("rm", command) == 0) {
Expand Down