From ad2d687d4d473678ba7fac6c354c7b2cacad87cc Mon Sep 17 00:00:00 2001 From: "matthias.ringwald" Date: Mon, 28 Sep 2009 20:53:02 +0000 Subject: [PATCH] ldid can be used (--enable-ldid) to sign binaries ; use Makefile.in instead of Makefile.am in example --- Makefile.am | 4 +--- TODO.txt | 7 +------ configure.in | 22 ++++++++++++++++------ example/Makefile.am | 10 ---------- 4 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 example/Makefile.am diff --git a/Makefile.am b/Makefile.am index 26bee13d6..eb130bd59 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,5 @@ SUBDIRS = src example $(springboardaccess) iphone_ip=@IPHONE_IP@ install-iphone: src/BTdaemon - cp $< $<-signed - export CODESIGN_ALLOCATE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate ; ldid -S $<-signed - scp $<-signed root@$(iphone_ip):/usr/local/bin/BTdaemon + scp $< root@$(iphone_ip):/usr/local/bin/BTdaemon scp resources/ch.ringwald.BTstack.plist root@$(iphone_ip):/Library/LaunchDaemons/ diff --git a/TODO.txt b/TODO.txt index 3089d37c4..97ba2a29b 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,18 +1,13 @@ /* new todo file for BTstack */ -Last milestone reached: BTdaemon uses SpringBoardAccess to show status bar icons +Last milestone reached: ldid can be used (--enable-ldid) to sign binaries NEXT: -- replace Makefile.am in example and . by Makefile.in and drop automake -- sign iPhone binaries - - add option to use ldid on the linked binaries - - decide on error reporting from BTdaemon - command_status_event with custom errors - hci open failed - btstack error - - organize headers: e.g. use instead of "btstack.h" - add SVN revision to package.sh tool for SpringBoardAccess - create script to build APT package for BTdeamon, Resources, and BTstack client library diff --git a/configure.in b/configure.in index c2401cee4..f4ed0d3ac 100644 --- a/configure.in +++ b/configure.in @@ -15,6 +15,7 @@ AC_ARG_ENABLE(launchd, [AS_HELP_STRING([--enable-launchd],[Compiles BTdaemon for AC_ARG_WITH(iphone-ip, [AS_HELP_STRING([--with-iphone-ip=192.168.1.5], [Specify IP address used by iPhone for installation (not supported yet)])], IPHONE_IP=$withval, IPHONE_IP="") AC_ARG_WITH(vendor-id, [AS_HELP_STRING([--with-vendor-id=vendorID], [Specify USB BT Dongle vendorID])], USB_VENDOR_ID=$withval, USB_VENDOR_ID="") AC_ARG_WITH(product-id, [AS_HELP_STRING([--with-product-id=productID], [Specify USB BT Dongle productID])], USB_PRODUCT_ID=$withval, USB_PRODUCT_ID="") +AC_ARG_ENABLE(ldid, [AS_HELP_STRING([--enable-ldid], [Code sign binaries with ldid])], USE_LDID=$enableval, USE_LDID_ID="NO") # BUILD/HOST/TARGET @@ -102,6 +103,14 @@ if test "x$target" = xiphone; then fi echo "USE_LAUNCHD: $USE_LAUNCHD" + if test "x$USE_LDID" = xyes ; then + USE_LDID="" + echo "USE_LDID: yes" + else + USE_LDID="#" + echo "USE_LDID: no" + fi + else if test "x$UART_DEVICE" = xDEFAULT ; then UART_DEVICE=/dev/ttyS0 @@ -111,13 +120,13 @@ AM_CONDITIONAL(USE_SPRINGBOARD, [test "x$USE_SPRINGBOARD" == "xyes"]) # summary if test "x$HCI_TRANSPORT" = xUSB; then - echo "USB_PRODUCT_ID: $USB_PRODUCT_ID" - echo "USB_VENDOR_ID: $USB_VENDOR_ID" - echo "LIBUSB_CFLAGS: $LIBUSB_CFLAGS" - echo "LIBUSB_LIBS: $LIBUSB_LIBS" + echo "USB_PRODUCT_ID: $USB_PRODUCT_ID" + echo "USB_VENDOR_ID: $USB_VENDOR_ID" + echo "LIBUSB_CFLAGS: $LIBUSB_CFLAGS" + echo "LIBUSB_LIBS: $LIBUSB_LIBS" else - echo "UART_DEVICE=$UART_DEVICE" - echo "UART_SPEED=$UART_SPEED" + echo "UART_DEVICE: $UART_DEVICE" + echo "UART_SPEED: $UART_SPEED" fi echo @@ -144,5 +153,6 @@ fi AC_SUBST(IPHONE_IP) AC_SUBST(HAVE_LIBUSB) +AC_SUBST(USE_LDID) AC_SUBST(SPRINGBOARD_ACCESS_SOURCES) AC_OUTPUT(Makefile src/Makefile example/Makefile SpringBoardAccess/Makefile) diff --git a/example/Makefile.am b/example/Makefile.am deleted file mode 100644 index 580d5f82e..000000000 --- a/example/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -bin_PROGRAMS = test mitm rfcomm - -test_SOURCES = test.c -test_LDADD = -lBTstack -L../src - -mitm_SOURCES = mitm.c -mitm_LDADD = -lBTstack -L../src - -rfcomm_SOURCES = rfcomm.c -rfcomm_LDADD = -lBTstack -L../src