Permalink
Browse files

Added a framework for putting things other than the binary into a

Mac OS X application bundle, and provided an icon for Puzzles.

Also renamed the OS X source file from macosx.m to osx.m, so that it
can sit beside other things such as osx-info.plist and not cause
enormously long filenames.


git-svn-id: svn://svn.tartarus.org/sgt/puzzles@5179 cda61777-01e9-0310-a592-d414129be87e
  • Loading branch information...
1 parent f1b7624 commit f562bcd1f3ae064df641de26ae1d7ad7475e844f @sgtatham sgtatham committed Jan 23, 2005
Showing with 44 additions and 11 deletions.
  1. +1 −1 Recipe
  2. +31 −8 mkfiles.pl
  3. +8 −0 osx-info.plist
  4. BIN osx.icns
  5. +4 −2 macosx.m → osx.m
View
@@ -39,7 +39,7 @@ rect : [G] WINDOWS COMMON rect
pattern : [G] WINDOWS COMMON pattern
# Mac OS X unified application containing all the puzzles.
-Puzzles : [MX] macosx COMMON ALL
+Puzzles : [MX] osx osx.icns osx-info.plist COMMON ALL
# The `nullgame' source file is a largely blank one, which contains
# all the correct function definitions to compile and link, but
View
@@ -135,9 +135,7 @@
$file = "$1.r";
$depends{$j} = [$file];
push @scanlist, $file;
- } elsif ($j =~ /\.lib$/) {
- # libraries don't have dependencies
- } else {
+ } elsif ($j !~ /\./) {
$file = "$j.c";
$file = "$j.m" unless &findfile($file);
$depends{$j} = [$file];
@@ -259,14 +257,27 @@ sub objects {
} elsif ($i =~ /^(.*)\.lib/) {
$y = $1;
($x = $ltmpl) =~ s/X/$y/;
- } else {
+ } elsif ($i !~ /\./) {
($x = $otmpl) =~ s/X/$i/;
}
push @ret, $x if $x ne "";
}
return join " ", @ret;
}
+sub special {
+ my ($prog, $suffix) = @_;
+ my @ret;
+ my ($i, $x, $y);
+ @ret = ();
+ foreach $i (@{$programs{$prog}}) {
+ if (substr($i, (length $i) - (length $suffix)) eq $suffix) {
+ push @ret, $i;
+ }
+ }
+ return join " ", @ret;
+}
+
sub splitline {
my ($line, $width, $splitchar) = @_;
my ($result, $len);
@@ -1133,10 +1144,22 @@ sub manpages {
foreach $p (&prognames("MX")) {
($prog, $type) = split ",", $p;
$objstr = &objects($p, "X.o", undef, undef);
- print "${prog}: ${prog}.app/Contents/MacOS/$prog\n\n";
- print "${prog}.app:\n\tmkdir \$\@\n";
- print "${prog}.app/Contents: ${prog}.app\n\tmkdir \$\@\n";
- print "${prog}.app/Contents/MacOS: ${prog}.app/Contents\n\tmkdir \$\@\n";
+ $icon = &special($p, ".icns");
+ $infoplist = &special($p, "info.plist");
+ print "${prog}.app:\n\tmkdir -p \$\@\n";
+ print "${prog}.app/Contents: ${prog}.app\n\tmkdir -p \$\@\n";
+ print "${prog}.app/Contents/MacOS: ${prog}.app/Contents\n\tmkdir -p \$\@\n";
+ $targets = "${prog}.app/Contents/MacOS/$prog";
+ if (defined $icon) {
+ print "${prog}.app/Contents/Resources: ${prog}.app/Contents\n\tmkdir -p \$\@\n";
+ print "${prog}.app/Contents/Resources/${prog}.icns: ${prog}.app/Contents/Resources $icon\n\tcp $icon \$\@\n";
+ $targets .= " ${prog}.app/Contents/Resources/${prog}.icns";
+ }
+ if (defined $infoplist) {
+ print "${prog}.app/Contents/Info.plist: ${prog}.app/Contents/Resources $infoplist\n\tcp $infoplist \$\@\n";
+ $targets .= " ${prog}.app/Contents/Info.plist";
+ }
+ print &splitline("${prog}: $targets", 69) . "\n\n";
print &splitline("${prog}.app/Contents/MacOS/$prog: ".
"${prog}.app/Contents/MacOS " . $objstr), "\n";
$libstr = &objects($p, undef, undef, "-lX");
View
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleIconFile</key>
+ <string>Puzzles.icns</string>
+</dict>
+</plist>
View
Binary file not shown.
View
@@ -8,8 +8,6 @@
* - configurability. Will no doubt involve learning all about the
* dialog control side of Cocoa.
*
- * - needs an icon.
- *
* - not sure what I should be doing about default window
* placement. Centring new windows is a bit feeble, but what's
* better? Is there a standard way to tell the OS "here's the
@@ -744,9 +742,13 @@ int main(int argc, char **argv)
NSMenu *menu;
NSMenuItem *item;
AppController *controller;
+ NSImage *icon;
pool = [[NSAutoreleasePool alloc] init];
+
+ icon = [NSImage imageNamed:@"NSApplicationIcon"];
[NSApplication sharedApplication];
+ [NSApp setApplicationIconImage:icon];
controller = [[[AppController alloc] init] autorelease];

0 comments on commit f562bcd

Please sign in to comment.