From 53bccd4f1912c894cdff2b3515755628d355f4a6 Mon Sep 17 00:00:00 2001 From: "matthias.ringwald" Date: Mon, 28 Sep 2009 18:18:03 +0000 Subject: [PATCH] set install_name for library, don't build Framework --- SpringBoardAccess/Makefile.in | 4 ++++ TODO.txt | 14 +++++++++----- configure.in | 1 + example/Makefile.am | 6 +++--- project.xcodeproj/project.pbxproj | 4 ++++ 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/SpringBoardAccess/Makefile.in b/SpringBoardAccess/Makefile.in index b284b82b9..8e6f364d6 100644 --- a/SpringBoardAccess/Makefile.in +++ b/SpringBoardAccess/Makefile.in @@ -4,6 +4,7 @@ CC = @CC@ OBJC = @OBJC@ LDFLAGS = @LDFLAGS@ CPPFLAGS = @CPPFLAGS@ +prefix = @prefix@ LIB_LDFLAGS = -lobjc \ -multiply_defined suppress \ @@ -24,3 +25,6 @@ $(NAME).dylib: $(NAME)Extension.mm $(NAME)-test: $(NAME)-test.c $(NAME).c $(OBJC) $(CPPFLAGS) -o $@ $(NAME).c $(NAME)-test.c $(LDFLAGS) $(APP_LDFLAGS) + +install: + echo "SpringBoardAccess is not installed. Use .deb package" diff --git a/TODO.txt b/TODO.txt index a6ff90bb6..3089d37c4 100644 --- a/TODO.txt +++ b/TODO.txt @@ -5,22 +5,24 @@ Last milestone reached: BTdaemon uses SpringBoardAccess to show status bar icons 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 - - autodetect ldid on host - decide on error reporting from BTdaemon - command_status_event with custom errors - hci open failed - btstack error - -- add svn revision to package.sh tool for SpringBoardAccess + +- 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 -- create new pgp key for gmail account and sign APT package +- create new GPG key for gmail account and sign APT package - provide test version by setting up APT repository within BTstack SVN - instructions: http://www.saurik.com/id/7 +- bug: Status bar icon in wrong state (on instead of connected) with WiiMoteDemo + == Release Version 0.1 + - implement rest of L2CAP state machine - incoming connections - list of supported PSM @@ -32,7 +34,9 @@ NEXT: - CocoaTouch User Interface Components - Inquiry - Alerts and shutdown of Apple's stack + == Release 0.2 - Incoming L2CAP supported + UI Support + - better deal with Apple stack - figure out how to shut it down - user interface diff --git a/configure.in b/configure.in index 1bf499ea9..c2401cee4 100644 --- a/configure.in +++ b/configure.in @@ -70,6 +70,7 @@ if test "x$target" = xiphone; then case "$host_os" in darwin*) echo "Cross-compiling for iPhone/iPod touch using Apple's iPhone SDK" + # echo "iPhone staging dir: $prefix" echo "iPhone IP for install-iphone target: $IPHONE_IP" CC="$DEVELOPER_PATH/usr/bin/arm-apple-darwin9-gcc-$GCC_VERSION" OBJC="$DEVELOPER_PATH/usr/bin/arm-apple-darwin9-g++-$GCC_VERSION" diff --git a/example/Makefile.am b/example/Makefile.am index d97b0597a..580d5f82e 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,10 +1,10 @@ bin_PROGRAMS = test mitm rfcomm test_SOURCES = test.c -test_LDADD = -lBTstack -L../BTstack.Framework +test_LDADD = -lBTstack -L../src mitm_SOURCES = mitm.c -mitm_LDADD = -lBTstack -L../BTstack.Framework +mitm_LDADD = -lBTstack -L../src rfcomm_SOURCES = rfcomm.c -rfcomm_LDADD = -lBTstack -L../BTstack.Framework +rfcomm_LDADD = -lBTstack -L../src diff --git a/project.xcodeproj/project.pbxproj b/project.xcodeproj/project.pbxproj index 68d8860f4..2ea2c25ff 100644 --- a/project.xcodeproj/project.pbxproj +++ b/project.xcodeproj/project.pbxproj @@ -90,12 +90,14 @@ 9C7ECBB40FCC95DD0085DAC5 /* hci_dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = hci_dump.c; path = src/hci_dump.c; sourceTree = ""; }; 9C88500C0FBF6702004980E4 /* l2cap.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = l2cap.c; path = src/l2cap.c; sourceTree = ""; }; 9C88500D0FBF6702004980E4 /* l2cap.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = l2cap.h; path = src/l2cap.h; sourceTree = ""; }; + 9C994B8E106BEEB700C70311 /* rfcomm.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = rfcomm.c; path = example/rfcomm.c; sourceTree = ""; }; 9CA3C0900FB8B3C4005F48DE /* TODO.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = TODO.txt; sourceTree = ""; }; 9CC152C61009052100223347 /* config.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = ""; }; 9CC813A00FFC0774002816F9 /* btstack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = btstack.h; path = src/btstack.h; sourceTree = ""; }; 9CC813A10FFC0774002816F9 /* btstack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = btstack.c; path = src/btstack.c; sourceTree = ""; }; 9CC813A40FFC0A51002816F9 /* daemon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = daemon.c; path = src/daemon.c; sourceTree = ""; }; 9CEB22DC1005345400FA2B98 /* hci_transport_usb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = hci_transport_usb.h; path = src/hci_transport_usb.h; sourceTree = ""; }; + 9CEB4B62107118E800DD5720 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; name = Makefile.in; path = src/Makefile.in; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -135,6 +137,7 @@ 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( + 9CEB4B62107118E800DD5720 /* Makefile.in */, 9C7ECB810FCC85650085DAC5 /* bt_control.h */, 9C7ECB820FCC85650085DAC5 /* bt_control_iphone.c */, 9C7ECB830FCC85650085DAC5 /* bt_control_iphone.h */, @@ -219,6 +222,7 @@ 9C7B5B81100D04520065D87E /* Example */ = { isa = PBXGroup; children = ( + 9C994B8E106BEEB700C70311 /* rfcomm.c */, 9C1813F71042FCCA00C68F09 /* mitm.c */, 9C7B5B7E100D04450065D87E /* test.c */, );