Changeset 127 for trunk/launch/launch/main.c

Timestamp:

03/17/03 09:56:42 (21 years ago)

Author:

Nicholas Riley

Message:

svn:ignore: added .DS_Store, not used for command-line apps.

README: Fixed install instructions, updated for 1.0b2.

VERSION: Updated for 1.0b2.

main.c: Updated copyright statement. Updated for 1.0b2. Provided
better explanation of error 1001. Added version information to -l,
partially descended from ICeCoffEE 1.3.

Location:

trunk/launch

Files:

• . (modified) (1 prop)
• launch/main.c (modified) (5 diffs)

trunk/launch

@@ -3 +3 @@
 openUp 
 launch-*
+.DS_Store

@@ -3 +3 @@
 openUp 
 launch-*
+.DS_Store

trunk/launch/launch/main.c

@@ -3 +3 @@
  Nicholas Riley <launchsw@sabi.net>
 
- Copyright (c) 2002, Nicholas Riley
+ Copyright (c) 2001-03, Nicholas Riley
  All rights reserved.
 
@@ -56 +56 @@
 const char *APP_NAME;
 
-#define VERSION "1.0b1"
+#define VERSION "1.0b2"
 
 #define STRBUF_LEN 1024
@@ -101 +101 @@
     // Misc. errors
     { procNotFound, "unable to connect to system service.\nAre you logged in?" },
-    { 1001, "SystemConfiguration nonspecific failure.\nAre you logged in?" },
+    { kCGErrorIllegalArgument, "window server error.\nAre you logged in?" },
     { fnfErr, "file not found" },
     { 0, NULL }
@@ -131 +131 @@
         "'document' may be a file, folder, or disk - whatever the application can open.\n"
         "'item' may be a file, folder, disk, or URL.\n\n");
-    fprintf(stderr, "launch "VERSION" (c) 2001-02 Nicholas Riley <http://web.sabi.net/nriley/software/>.\n"
+    fprintf(stderr, "launch "VERSION" (c) 2001-03 Nicholas Riley <http://web.sabi.net/nriley/software/>.\n"
                     "Please send bugs, suggestions, etc. to <launchsw@sabi.net>.\n");
 
@@ -678 +678 @@
                     printf("\tbundle ID: %s\n", tmpBuffer);
                 }
+                // prefer a short version string, e.g. "1.0 Beta" instead of "51" for Safari
+                CFStringRef appVersion = CFBundleGetValueForInfoDictionaryKey(bundle, CFSTR("CFBundleShortVersionString"));
+                if (appVersion == NULL)
+                    appVersion = CFBundleGetValueForInfoDictionaryKey(bundle, kCFBundleVersionKey);
+                if (appVersion != NULL) {
+                    UInt32 intVersion = CFBundleGetVersionNumber(bundle);
+                    CFStringGetCString(appVersion, tmpBuffer, STRBUF_LEN, CFStringGetSystemEncoding());
+                    printf("\tversion: %s", tmpBuffer);
+                    if (intVersion != 0) printf(" [0x%lx = %lu]", intVersion, intVersion);
+                    putchar('\n');
+                }
                 CFRelease(bundle);
             }

@@ -3 +3 @@
 openUp 
 launch-*
+.DS_Store