Changeset 1247

Timestamp:

02/17/10 22:00:05 (2 years ago)

Author:

jdunn

Message:

Mostly patches for osx, but also a couple minor rephrasings.

Location:

trunk/software/usb_ir

Files:

• Make.settings.in (modified) (1 diff)
• Makefile.in (modified) (5 diffs)
• compat.h (modified) (1 diff)
• daemon.c (modified) (1 diff)
• drivers/Makefile.in (modified) (1 diff)
• drivers/libusbpre1.c (modified) (1 diff)
• osx (added)
• osx/README-OSX.txt (added)
• osx/com.iguana.igdaemon.plist (added)
• osx/daemonosx.c (moved) (moved from trunk/software/usb_ir/daemonosx.c)
• reflasher/iguanaIR-reflasher (modified) (1 diff)
• win32/service.c (modified) (1 diff)

trunk/software/usb_ir/Make.settings.in

@@ -40 +40 @@
     LIBNAME=libiguanaIR.dylib
     SHAREARG = -dynamiclib
-    OSSUPPORT = daemonosx.o
+    OSSUPPORT = osx/daemonosx.o
   endif
 endif

trunk/software/usb_ir/Makefile.in

@@ -2 +2 @@
 
 CFLAGS += -I. -fvisibility=hidden -DIGUANAIR_EXPORTS
-LINKARGS = -Wl,-soname=$(LIBNAME),--version-script=$(srcdir)/ig.ver
-ifeq ($(shell uname -s),Darwin)
-  LINKARGS = -Wl,-dylib_current_version,1.0.0,-dylib_compatibility_version,1.0.0
+
+ifdef DARWIN
+  LINKARGS   = -Wl,-dylib_current_version,1.0.0,-dylib_compatibility_version,1.0.0 -install_name $(prefix)/$(LIBDIR)/$(LIBNAME)
+  EXPORTARGS =
+else
+  LINKARGS   = -Wl,-soname=$(LIBNAME),--version-script=$(srcdir)/ig.ver
+  EXPORTARGS = -Wl,-export-dynamic
 endif
 
@@ -21 +25 @@
           list.o protocol-versions.o pipes.o dataPackets.o compat-unix.o \
           support.c $(OSSUPPORT)
-        $(CC) -Wl,-export-dynamic $(CPPFLAGS) $(CFLAGS) -DSUPPORT_EXPORTS \
+        $(CC) $(EXPORTARGS) $(CPPFLAGS) $(CFLAGS) -DSUPPORT_EXPORTS \
               $(LDFLAGS) $^ -lpopt -lusb -lpthread -ldl $(LIBNAME) -o $@
 
@@ -108 +112 @@
         install -d $(DESTDIR)$(prefix)/include
         install $(srcdir)/iguanaIR.h $(DESTDIR)$(prefix)/include/iguanaIR.h
-ifeq ($(DARWIN),)
+ifdef DARWIN
+        install -D --mode 644 osx/com.iguana.igdaemon.plist \
+                              /Library/LaunchDaemons/com.iguana.igdaemon.plist
+        launchctl load -w /Library/LaunchDaemons/com.iguana.igdaemon.plist
+else
         install -D $(srcdir)/iguanaIR.init $(DESTDIR)/etc/init.d/iguanaIR
         install -D --mode 644 $(srcdir)/iguanaIR.options $(DESTDIR)/etc/default/iguanaIR
@@ -119 +127 @@
 .PHONY: uninstall
 uninstall:
-ifeq ($(DARWIN),)
+ifdef DARWIN
+        launchctl unload -w /Library/LaunchDaemons/com.iguana.igdaemon.plist || true
+        rm -f /Library/LaunchDaemons/com.iguana.igdaemon.plist
+else
         /etc/init.d/iguanaIR stop || true
+        rm -f $(DESTDIR)/etc/init.d/iguanaIR
+        rm -f $(DESTDIR)/etc/default/iguanaIR
+        rm -f $(DESTDIR)/etc/udev/rules.d/iguanaIR.rules
+        rmdir $(DESTDIR)/lib/udev/devices/iguanaIR 2>/dev/null || true
+        rmdir $(DESTDIR)/dev/iguanaIR 2>/dev/null || true
 endif
         rm -f $(DESTDIR)$(prefix)/bin/igclient
@@ -127 +143 @@
         rm -f $(DESTDIR)$(prefix)/$(LIBDIR)/libiguanaIR.$(SHAREEXT)
         rm -f $(DESTDIR)$(prefix)/include/iguanaIR.h
-ifeq ($(DARWIN),)
-        rm -f $(DESTDIR)/etc/init.d/iguanaIR
-        rm -f $(DESTDIR)/etc/default/iguanaIR
-        rm -f $(DESTDIR)/etc/udev/rules.d/iguanaIR.rules
-        rmdir $(DESTDIR)/lib/udev/devices/iguanaIR 2>/dev/null || true
-        rmdir $(DESTDIR)/dev/iguanaIR 2>/dev/null || true
-endif
+        rm -fr $(DESTDIR)$(prefix)/$(LIBDIR)/iguanaIR
+        rm -fr $(DESTDIR)$(prefix)/$(LIBDIR)/iguanaIR-reflasher
 
 .PHONY: clean drivers-clean

trunk/software/usb_ir/compat.h

@@ -103 +103 @@
     #if __APPLE__
         #define SwitchToThread() pthread_yield_np()
-        #define DYNLIB_EXT ".dynlib"
+        #define DYNLIB_EXT ".dylib"
     #else
         #define SwitchToThread() pthread_yield()

trunk/software/usb_ir/daemon.c

@@ -130 +130 @@
 {
     /* generic actions */
-    ARG_LOG_FILE,
+    ARG_LOG_FILE = 1, /* popt in MacPorts does not like starting w 0 */
     ARG_QUIETER,
     ARG_LOUDER,

trunk/software/usb_ir/drivers/Makefile.in

@@ -4 +4 @@
 LISTS=../list.o
 
+ifdef DARWIN
+  LDFLAGS += -undefined dynamic_lookup
+endif
+
 all: $(DRIVERS)
 
 libusb.so: libusb.c $(LISTS) Makefile
-#       $(CC) $(CPPFLAGS) $(CFLAGS) $(SHAREARG) $(LDFLAGS) -lusb-1.0 $< $(LISTS) -o $@
-        $(CC) $(CPPFLAGS) $(CFLAGS) $(SHAREARG) -lusb-1.0 $< $(LISTS) -o $@
+        $(CC) $(CPPFLAGS) $(CFLAGS) $(SHAREARG) $(LDFLAGS) -lusb-1.0 $< \
+                $(LISTS) -o $@
 
 libusbpre1.so: libusbpre1.c $(LISTS) Makefile
-        $(CC) $(CPPFLAGS) $(CFLAGS) $(SHAREARG) -lusb $< $(LISTS) -o $@
+        $(CC) $(CPPFLAGS) $(CFLAGS) $(SHAREARG) $(LDFLAGS) -lusb $< \
+                $(LISTS) -o $@
 
 .PHONY: clean

trunk/software/usb_ir/drivers/libusbpre1.c

@@ -192 +192 @@
 }
 
+/* the list must be allocated here where the struct is defined */
 static deviceList* prepareDeviceList(usbId *ids, deviceFunc ndf)
 {

trunk/software/usb_ir/reflasher/iguanaIR-reflasher

@@ -1063 +1063 @@
            version != 3 and \
            version != 4:
-            message(LOG_ERROR,
-                    "This script cannot test a version %s device.\n" % version)
+            message(LOG_ERROR, "This script cannot test a version 0x%x device.\n" % version)
             continue
 

trunk/software/usb_ir/win32/service.c

@@ -194 +194 @@
     { "startsvc", 0, POPT_ARG_NONE, NULL, 's', "Start the system igdaemon service.", NULL },
     { "stopsvc", 0, POPT_ARG_NONE, NULL, 't', "Stop the system igdaemon service.", NULL },
-    { "installinf", 0, POPT_ARG_NONE, NULL, 'i', "Stop the system igdaemon service.", NULL },
+    { "installinf", 0, POPT_ARG_NONE, NULL, 'i', "Manually install the INF for the device.", NULL },
 
     /* options specific to the drivers */