Get AltOS version numbers into Mac 'about' dialog

Generate Info.plist from Info.plist.in to correctly set the VERSION
information. This also changes some strings around to make them look better

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

diff --git a/altosui/AltosUI.app/Contents/Info.plist b/altosui/AltosUI.app/Contents/Info.plist
deleted file mode 100644 (file)
index 6084280..0000000
--- a/altosui/AltosUI.app/Contents/Info.plist
+++ /dev/null
@@ -1,44 +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>altosui</string>
-       <key>CFBundleVersion</key>
-       <string>100.0</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>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleGetInfoString</key>
-       <string>AltOS UI version 0.7</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundleIconFile</key>
-       <string>AltosUIIcon.icns</string>
-       <key>Java</key>
-       <dict>
-               <key>MainClass</key>
-               <string>altosui.AltosUI</string>
-               <key>JVMVersion</key>
-               <string>1.5+</string>
-               <key>ClassPath</key>
-               <array>
-                       <string>$JAVAROOT/altosui.jar</string>
-                       <string>$JAVAROOT/freetts.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/altosui/Info.plist.in b/altosui/Info.plist.in
new file mode 100644 (file)
index 0000000..46dea17
--- /dev/null
+++ b/altosui/Info.plist.in
@@ -0,0 +1,46 @@
+<?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>AltosUI</string>
+       <key>CFBundleVersion</key>
+       <string>@VERSION@</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>AltOS UI version @VERSION@</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleIconFile</key>
+       <string>AltosUIIcon.icns</string>
+       <key>Java</key>
+       <dict>
+               <key>MainClass</key>
+               <string>altosui.AltosUI</string>
+               <key>JVMVersion</key>
+               <string>1.5+</string>
+               <key>ClassPath</key>
+               <array>
+                       <string>$JAVAROOT/altosui.jar</string>
+                       <string>$JAVAROOT/freetts.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/altosui/Makefile.am b/altosui/Makefile.am
index feda00c711a95e640297174910aa86a147695784..b22405aab6f60f28b49ddaf5c5c3b402f289d69d 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -165,7 +165,8 @@ FAT_FILES=$(FATJAR) $(ALTOSLIB_CLASS) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCO
 LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE) $(DOC)
 LINUX_EXTRA=altosui-fat
 
-MACOSX_FILES=$(FAT_FILES) libaltos.dylib
+MACOSX_INFO_PLIST=Info.plist
+MACOSX_FILES=$(FAT_FILES) libaltos.dylib $(MACOSX_INFO_PLIST)
 MACOSX_EXTRA=$(FIRMWARE)
 
 WINDOWS_FILES=$(FAT_FILES) altos.dll altos64.dll $(top_srcdir)/telemetrum.inf $(WINDOWS_ICON)
@@ -311,6 +312,7 @@ $(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
        -rm -rf macosx
        mkdir macosx
        cp -a AltosUI.app macosx/
+       cp -p Info.plist macosx/AltosUI.app/Contents
        mkdir -p macosx/AltOS macosx/AltosUI.app/Contents/Resources/Java
        cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
        cp -p libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java

diff --git a/configure.ac b/configure.ac
index a3004811d738df6806c46b7d520caa612392f90b..e78f587310392fde5fab42606ee3032196a3335b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -141,6 +141,7 @@ Makefile
 altoslib/Makefile
 altosui/Makefile
 altosui/AltosVersion.java
+altosui/Info.plist
 altosui/libaltos/Makefile
 altosdroid/Makefile
 altosdroid/local.properties