puae 2.3.1

configure.in

@@ -6,7 +6,7 @@ dnl Updated and generally mauled             2008-2011 Mustafa Tufan
 dnl
 
 AC_PREREQ(2.55)
-AC_INIT(PUAE, 2.3.1, 'mustafa.tufan@gmail.com', puae)
+AC_INIT(PUAE, 2.3.1, mustafa.tufan@gmail.com, puae)
 AC_CONFIG_SRCDIR([bootstrap.sh])
 AM_CONFIG_HEADER([src/sysconfig.h])
 AC_CANONICAL_TARGET
@@ -63,6 +63,7 @@ if test -z "$commit"; then
 commit="not git"
 fi
 AC_DEFINE_UNQUOTED(PACKAGE_COMMIT, "$commit", [cloned git commit version])
+AC_SUBST(PACKAGE_COMMIT, $commit)
 
 dnl
 dnl Prefer Gtk2.x over Gtk1.x if both are available

src/Makefile.am

@@ -83,7 +83,7 @@ if BUILD_MACOSX_BUNDLE
 		mkdir -p $(bundle_contents)/Resources
 		$(INSTALL_DATA) od-macosx/Info.plist $(bundle_contents)
 		$(INSTALL_PROGRAM) uae$(EXEEXT) $(bundle_contents)/MacOS/
-		$(INSTALL_DATA) $(srcdir)/od-macosx/euae.icns $(bundle_contents)/Resources/
+		$(INSTALL_DATA) $(srcdir)/od-macosx/puae.icns $(bundle_contents)/Resources/
 endif
 
 noinst_LIBRARIES = \

src/gfx-cocoa/cocoa_gfx.m

@@ -169,7 +169,7 @@ void toggle_mousegrab (void)
 
 int graphics_init (void)
 {
-    int success = 0;
+	int success = 0;
 	return success;
 }
 

src/od-macosx/Info.plist

@@ -27,8 +27,8 @@
 	<string>????</string>
 	<key>CFBundleName</key>
 	<string>PUAE</string>
-	<key>CFBundleGetInfoString</key>
-	<string>@PACKAGE_COMMIT@</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.3.1.397698e373c41c61eaab29f18e10f870c8c39819</string>
 	<key>CFBundleVersion</key>
 	<string>2.3.1</string>
 </dict>

src/od-macosx/Info.plist.in

@@ -27,8 +27,8 @@
 	<string>????</string>
 	<key>CFBundleName</key>
 	<string>@PACKAGE_NAME@</string>
-	<key>CFBundleGetInfoString</key>
-	<string>@PACKAGE_COMMIT@</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@VERSION@-@PACKAGE_COMMIT@</string>
 	<key>CFBundleVersion</key>
 	<string>@VERSION@</string>
 </dict>

src/od-macosx/Makefile.am

@@ -7,6 +7,6 @@ noinst_LIBRARIES = libosdep.a
 libosdep_a_SOURCES = main.m memory.c parser.c
 
 noinst_HEADERS = main.h memory.h hrtimer.h
-noinst_DATA = Info.plist.in euae.icns
+noinst_DATA = Info.plist.in puae.icns
 
-EXTRA_DIST = euae.icns
+EXTRA_DIST = puae.icns

src/od-macosx/main.h

@@ -33,5 +33,5 @@ typedef unsigned int   NSUInteger;
 
 #import <Cocoa/Cocoa.h>
 
-@interface EUAE_Main : NSObject
+@interface PUAE_Main : NSObject
 @end

src/od-macosx/main.m

@@ -54,44 +54,31 @@ BOOL           gFinishedLaunching = NO;
 
 NSString *getApplicationName ()
 {
-    NSDictionary *dict;
-    NSString *appName = 0;
+	NSDictionary *dict;
+	NSString *appName = 0;
 
-    /* Determine the application name */
-    dict = (NSDictionary *) CFBundleGetInfoDictionary (CFBundleGetMainBundle ());
+	/* Determine the application name */
+	dict = (NSDictionary *) CFBundleGetInfoDictionary (CFBundleGetMainBundle ());
 	if (dict)
 		appName = [dict objectForKey: @"CFBundleName"];
 
-    if (![appName length])
-	appName = [[NSProcessInfo processInfo] processName];
+	if (![appName length])
+		appName = [[NSProcessInfo processInfo] processName];
 
 	return appName;
 }
 
-NSString *getApplicationVersion ()
-{
-    NSDictionary *dict;
-    NSString *appVersion = 0;
-
-    /* Determine the application name */
-    dict = (NSDictionary *) CFBundleGetInfoDictionary (CFBundleGetMainBundle ());
-	if (dict)
-		appVersion = [dict objectForKey: @"CFBundleVersion"];
-
-	return appVersion;
-}
-
 /* Fix warnings generated when using the setAppleMenu method and compiling
 in Tiger or later */
-@interface NSApplication (EUAE)
+@interface NSApplication (PUAE)
 - (void)setAppleMenu:(NSMenu *)menu;
 @end
 
 
-@interface EUAE_Application : NSApplication
+@interface PUAE_Application : NSApplication
 @end
 
-@implementation EUAE_Application
+@implementation PUAE_Application
 
 /* Invoked from the Quit menu item */
 - (void)terminate:(id)sender
@@ -119,7 +106,7 @@ in Tiger or later */
 
 
 /* The main class of the application, the application's delegate */
-@implementation EUAE_Main
+@implementation PUAE_Main
 
 /* Set the working directory to the .app's parent directory */
 - (void) setupWorkingDirectory:(BOOL)shouldChdir
@@ -139,12 +126,8 @@ in Tiger or later */
 
 -(void)performAbout:(id)sender
 {
-	const NSDictionary *nfo;
-	NSString *aName, *aVer;
-	aName = getApplicationName ();
-	aVer = getApplicationVersion ();
-
-	nfo = [NSDictionary dictionaryWithObjectsAndKeys: aName, @"ApplicationName", aVer, @"Version", nil];
+	NSDictionary *nfo;
+	nfo = (NSDictionary *) CFBundleGetInfoDictionary (CFBundleGetMainBundle ());
 	[NSApp orderFrontStandardAboutPanelWithOptions: nfo];
 }
 
@@ -227,10 +210,10 @@ static void setupWindowMenu (void)
 static void CustomApplicationMain (int argc, char **argv)
 {
     NSAutoreleasePool	*pool = [[NSAutoreleasePool alloc] init];
-    EUAE_Main		*euae_main;
+    PUAE_Main		*puae_main;
 
     /* Ensure the application object is initialised */
-    [EUAE_Application sharedApplication];
+    [PUAE_Application sharedApplication];
 
 #ifdef SDL_USE_CPS
     {
@@ -239,7 +222,7 @@ static void CustomApplicationMain (int argc, char **argv)
 	if (!CPSGetCurrentProcess(&PSN))
 	    if (!CPSEnableForegroundOperation(&PSN,0x03,0x3C,0x2C,0x1103))
 		if (!CPSSetFrontProcess(&PSN))
-		    [EUAE_Application sharedApplication];
+		    [PUAE_Application sharedApplication];
     }
 #endif /* SDL_USE_CPS */
 
@@ -252,13 +235,13 @@ static void CustomApplicationMain (int argc, char **argv)
 	cocoa_gui_early_setup();
 
     /* Create SDLMain and make it the app delegate */
-    euae_main = [[EUAE_Main alloc] init];
-    [NSApp setDelegate:euae_main];
+    puae_main = [[PUAE_Main alloc] init];
+    [NSApp setDelegate:puae_main];
 
     /* Start the main event loop */
     [NSApp run];
 
-    [euae_main release];
+    [puae_main release];
     [pool release];
 }