From: Keith Packard <keithp@keithp.com>
Date: Wed, 11 Jul 2012 07:35:21 +0000 (-0700)
Subject: Get AltOS version numbers into Mac 'about' dialog
X-Git-Tag: 1.1~108
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=675ccd41e3b668cd4e1d2dd282dd317a00d00151;hp=46407f7f3e4d2b6e74b3a2e90b38736a792cfc54

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
index 60842804..00000000
--- 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
index 00000000..46dea171
--- /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 feda00c7..b22405aa 100644
--- 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 a3004811..e78f5873 100644
--- 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