From 675ccd41e3b668cd4e1d2dd282dd317a00d00151 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 11 Jul 2012 00:35:21 -0700 Subject: [PATCH] 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 --- .../{AltosUI.app/Contents/Info.plist => Info.plist.in} | 10 ++++++---- altosui/Makefile.am | 4 +++- configure.ac | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) rename altosui/{AltosUI.app/Contents/Info.plist => Info.plist.in} (84%) diff --git a/altosui/AltosUI.app/Contents/Info.plist b/altosui/Info.plist.in similarity index 84% rename from altosui/AltosUI.app/Contents/Info.plist rename to altosui/Info.plist.in index 60842804..46dea171 100644 --- a/altosui/AltosUI.app/Contents/Info.plist +++ b/altosui/Info.plist.in @@ -3,9 +3,9 @@ CFBundleName - altosui + AltosUI CFBundleVersion - 100.0 + @VERSION@ CFBundleAllowMixedLocalizations true CFBundleExecutable @@ -14,10 +14,12 @@ English CFBundlePackageType APPL + CFBundleIdentifier + org.altusmetrum.altosui CFBundleSignature - ???? + Altu CFBundleGetInfoString - AltOS UI version 0.7 + AltOS UI version @VERSION@ CFBundleInfoDictionaryVersion 6.0 CFBundleIconFile 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 -- 2.30.2