micropeak: Create Mac OS X package

Includes the FTDI driver and the MicroPeak app

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/libaltos/Makefile-standalone b/libaltos/Makefile-standalone
index 4e438050435da162cd5f0764cf2c09b2030fefed..a1f9f5bc27d5568f76bc9aff7079ca52b15e10d0 100644 (file)
--- a/libaltos/Makefile-standalone
+++ b/libaltos/Makefile-standalone
@@ -22,9 +22,20 @@ endif
 #
 ifeq ($(OS),Darwin)
 
+#OS_LIB_CFLAGS=\
+#      -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \
+#      --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \
+#      -iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \
+#      -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \
+#      -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers
+
+XCODE=/Applications/Xcode.app
+SDK=$(XCODE)/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
+MINVERSION=10.5
+
 OS_LIB_CFLAGS=\
-       -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 \
-       --sysroot=/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 \
+       -DDARWIN -DPOSIX_TTY -arch i386 -arch x86_64 -isysroot $(SDK) \
+       -mmacosx-version-min=10.5 \
        -iwithsysroot /System/Library/Frameworks/JavaVM.framework/Headers \
        -iwithsysroot /System/Library/Frameworks/IOKit.framework/Headers \
        -iwithsysroot /System/Library/Frameworks/CoreFoundation.framework/Headers

diff --git a/libaltos/libaltos.dylib b/libaltos/libaltos.dylib
index 1038817d185a07630d1cd83ec16a00bc2b9f3766..cfbd3f54cee22e98f28638a3d515ff22e344cab9 100755 (executable)
Binary files a/libaltos/libaltos.dylib and b/libaltos/libaltos.dylib differ

diff --git a/micropeak/FTDI.tar.gz b/micropeak/FTDI.tar.gz
new file mode 100644 (file)
index 0000000..cd08ecf
Binary files /dev/null and b/micropeak/FTDI.tar.gz differ

diff --git a/micropeak/Info.plist b/micropeak/Info.plist
deleted file mode 100644 (file)
index 5705cc1..0000000
--- a/micropeak/Info.plist
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-       <key>CFBundleName</key>
-       <string>MicroPeak</string>
-       <key>CFBundleVersion</key>
-       <string>1.1.9.2</string>
-       <key>CFBundleAllowMixedLocalizations</key>
-       <string>true</string>
-       <key>CFBundleExecutable</key>
-       <string>JavaApplicationStub</string>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundlePackageType</key>
-       <string>APPL</string>
-       <key>CFBundleIdentifier</key>
-       <string>org.altusmetrum.altosui</string>
-       <key>CFBundleSignature</key>
-       <string>Altu</string>
-       <key>CFBundleGetInfoString</key>
-       <string>MicroPeak UI version 1.1.9.2</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleIconFile</key>
-       <string>MicroPeak.icns</string>
-       <key>Java</key>
-       <dict>
-               <key>MainClass</key>
-               <string>org.altusmetrum.micropeak.MicroPeak</string>
-               <key>JVMVersion</key>
-               <string>1.5+</string>
-               <key>ClassPath</key>
-               <array>
-                       <string>$JAVAROOT/micropeak.jar</string>
-               </array>
-               <key>VMOptions</key>
-               <array>
-                 <string>-Xms512M</string>
-                 <string>-Xmx512M</string>
-                 <string>-Dosgi.clean=true</string>
-               </array>
-       </dict>
-</dict>
-</plist>

diff --git a/micropeak/Info.plist.in b/micropeak/Info.plist.in
index d3c17a49938a9597350394a9930b058bdf6d46a6..40984c5aa7b887d2aa17c1eee695d719a644a37e 100644 (file)
--- a/micropeak/Info.plist.in
+++ b/micropeak/Info.plist.in
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleIdentifier</key>
-       <string>org.altusmetrum.altosui</string>
+       <string>org.altusmetrum.micropeak</string>
        <key>CFBundleSignature</key>
        <string>Altu</string>
        <key>CFBundleGetInfoString</key>
@@ -34,6 +34,11 @@
                <array>
                        <string>$JAVAROOT/micropeak.jar</string>
                </array>
+               <key>Properties</key>
+               <dict>
+                 <key>apple.laf.useScreenMenuBar</key>
+                 <string>true</string>
+               </dict>
                <key>VMOptions</key>
                <array>
                  <string>-Xms512M</string>

diff --git a/micropeak/Makefile.am b/micropeak/Makefile.am
index 19b23a0f88cf5ba6f5854df5d17505744583649a..38945e823302e1f0a3ef58331d95daac58d6733b 100644 (file)
--- a/micropeak/Makefile.am
+++ b/micropeak/Makefile.am
@@ -88,7 +88,8 @@ LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=micropeak-fat
 
 MACOSX_INFO_PLIST=Info.plist
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
+MACOSX_DRIVER=FTDI.tar.gz
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST) $(MACOSX_DRIVER)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
 
@@ -212,6 +213,7 @@ $(MACOSX_DIST): $(MACOSX_FILES)
        mkdir macosx
        cp -a MicroPeak.app macosx/
        cp -p Info.plist macosx/MicroPeak.app/Contents
+       tar xzf $(MACOSX_DRIVER) -C macosx
        mkdir -p macosx/MicroPeak.app/Contents/Resources/Java
        cp -p $(FATJAR) macosx/MicroPeak.app/Contents/Resources/Java/micropeak.jar
        cp -p libaltos.dylib macosx/MicroPeak.app/Contents/Resources/Java

diff --git a/micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns b/micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns
deleted file mode 100644 (file)
index fe49f36..0000000
Binary files a/micropeak/MicroPeak.app/Contents/Resources/AltosUIIcon.icns and /dev/null differ

diff --git a/micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns b/micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns
new file mode 100644 (file)
index 0000000..9ba83bf
Binary files /dev/null and b/micropeak/MicroPeak.app/Contents/Resources/MicroPeak.icns differ