Various updates for debugging, device support, makefile, etc.

Makefile

@@ -1,24 +1,36 @@
-IOS_CC = /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc
+IOS_CC = xcrun -sdk iphoneos clang
+IOS_MIN_OS = 5.1
+IOS_SDK = 6.0
+OSX_MIN = 10.7
+
+CERT="iPhone Developer"
 
 all: demo.app fruitstrap
 
 demo.app: demo Info.plist
 	mkdir -p demo.app
 	cp demo demo.app/
 	cp Info.plist ResourceRules.plist demo.app/
-	codesign -f -s "iPhone Developer" --entitlements Entitlements.plist demo.app
+	codesign -f -s $(CERT) --entitlements Entitlements.plist demo.app
 
 demo: demo.c
-	$(IOS_CC) -arch armv7 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -framework CoreFoundation -o demo demo.c
+	$(IOS_CC) -isysroot `xcode-select -print-path`/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(IOS_SDK).sdk -mios-version-min=$(IOS_MIN_OS) -arch armv7 -framework CoreFoundation -o demo demo.c
 
 fruitstrap: fruitstrap.c
-	gcc -o fruitstrap -framework CoreFoundation -framework MobileDevice -F/System/Library/PrivateFrameworks fruitstrap.c
+	clang -o fruitstrap -mmacosx-version-min=$(OSX_MIN) -framework CoreFoundation -framework MobileDevice -F/System/Library/PrivateFrameworks fruitstrap.c
+
+listdevices: listdevices.c
+	gcc -g -o listdevices -framework CoreFoundation -framework MobileDevice -F/System/Library/PrivateFrameworks listdevices.c
 
 install: all
-	./fruitstrap demo.app
+	./fruitstrap -b demo.app
+
+install_os: fruitstrap
+	sudo mkdir -p /usr/local/bin
+	sudo cp fruitstrap /usr/local/bin/fruitstrap
 
 debug: all
-	./fruitstrap -d demo.app
+	./fruitstrap -d -b demo.app
 
 clean:
-	rm -rf *.app demo fruitstrap
+	rm -rf *.app demo fruitstrap

MobileDevice.h

@@ -448,6 +448,11 @@ void AMDAddLogFileDescriptor(int fd);
 //kern_return_t AMDeviceSendMessage(service_conn_t socket, void *unused, CFPropertyListRef plist);
 //kern_return_t AMDeviceReceiveMessage(service_conn_t socket, CFDictionaryRef options, CFPropertyListRef * result);
 
+typedef int (*am_device_install_application_callback)(CFDictionaryRef, int);
+
+mach_error_t AMDeviceInstallApplication(service_conn_t socket, CFStringRef path, CFDictionaryRef options, am_device_install_application_callback callback, void *user);
+mach_error_t AMDeviceTransferApplication(service_conn_t socket, CFStringRef path, CFDictionaryRef options, am_device_install_application_callback callbackj, void *user);
+
 /* ----------------------------------------------------------------------------
  *   Semi-private routines
  * ------------------------------------------------------------------------- */
@@ -486,4 +491,4 @@ typedef unsigned int (*t_performOperation)(struct am_restore_device *rdev,
 }
 #endif
 
-#endif
+#endif

README.md

@@ -1,21 +1,25 @@
-## This project is no longer maintained.
-
 fruitstrap
 ==========
 Install and debug iPhone apps without using Xcode. Designed to work on unjailbroken devices.
 
 ## Requirements
 
-* Mac OS X. Tested on Snow Leopard only.
-* You need to have a valid iPhone development certificate installed.
+* Mac OS X. Tested on Lion/Mountain Lion.
+* You need to have a valid iPhone development certificate installed (or at least a correctly signed iOS app).
 * Xcode must be installed, along with the SDK for your iOS version.
 
+## Install
+
+* `make install_os` will compile and install fruitstrap to /usr/local/bin
+
 ## Usage
 
-* `fruitstrap [-d] -b <app> [device_id]`
+* `fruitstrap [-d/--debug] [-i/--id device_id] -b/--bundle <app> [-a/--args arguments] [-t/--timeout timeout(seconds)] [-u/--unbuffered] [-g/--gdbargs gdb_arguments]`
 * Optional `-d` flag launches a remote GDB session after the app has been installed.
 * `<app>` must be an iPhone application bundle, *not* an IPA.
-* Optional `device_id`; useful when you have more than one iPhone/iPad connected.
+* Optional device id, useful when you have more than one iPhone/iPad connected to your computer
+* `<arguments>` are passed as argv to the running app.
+* `<gdb_arguments>` are passed to gdb.
 
 ## Demo