From 2a12a2c8a38eb166fcfda11f95b17f3d0a0a055f Mon Sep 17 00:00:00 2001 From: axial Date: Thu, 29 Mar 2007 07:56:50 +0000 Subject: [PATCH] MacProxy tweaks git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@1080 52acb1d6-8a22-11de-b505-999d5b087335 --- SLProxy/MacProxy/Launcher/Controller.m | 15 +++++++++++++-- SLProxy/MacProxy/Launcher/Info.plist | 2 +- .../Launcher.app/Contents/MacOS/Launcher | Bin 25092 -> 0 bytes .../Release/Launcher.app/Contents/PkgInfo | 1 - .../Resources/English.lproj/InfoPlist.strings | Bin 202 -> 0 bytes .../English.lproj/MainMenu.nib/classes.nib | 8 -------- .../English.lproj/MainMenu.nib/info.nib | 17 ----------------- .../MainMenu.nib/keyedobjects.nib | Bin 12970 -> 0 bytes .../Launcher.app/Contents/Resources/libsl.icns | Bin 23822 -> 0 bytes SLProxy/MacProxy/README.txt | 2 +- SLProxy/MacProxy/build.pl | 8 ++++---- 11 files changed, 19 insertions(+), 34 deletions(-) delete mode 100755 SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/MacOS/Launcher delete mode 100644 SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/PkgInfo delete mode 100644 SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/English.lproj/InfoPlist.strings delete mode 100644 SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib delete mode 100644 SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib delete mode 100644 SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib delete mode 100644 SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/libsl.icns diff --git a/SLProxy/MacProxy/Launcher/Controller.m b/SLProxy/MacProxy/Launcher/Controller.m index 1726ad6a..fff271b4 100644 --- a/SLProxy/MacProxy/Launcher/Controller.m +++ b/SLProxy/MacProxy/Launcher/Controller.m @@ -7,7 +7,6 @@ } + (void)failBecause:(NSString *)reason { - [killtask terminate]; NSRunCriticalAlertPanel(@"Failed to start Second Life.", reason, @"Quit", nil, nil); [NSApp terminate:nil]; } @@ -28,9 +27,17 @@ [task release]; } -- (void)awakeFromNib { +- (id)init { + [super init]; killtask = nil; + return self; +} +- (void)awakeFromNib { + [NSApp setDelegate:self]; +} + +- (void)applicationDidFinishLaunching:(NSNotification *)notification { /* Start the proxy, run Second Life, stop the proxy, and terminate. */ SLProxy *proxy = [[SLProxy alloc] init]; [self runSecondLifeWithLoginURL:[proxy loginURL]]; @@ -38,4 +45,8 @@ [NSApp terminate:self]; } +- (void)applicationWillTerminate:(NSNotification *)notification { + [killtask terminate]; +} + @end diff --git a/SLProxy/MacProxy/Launcher/Info.plist b/SLProxy/MacProxy/Launcher/Info.plist index 85696095..2f341811 100644 --- a/SLProxy/MacProxy/Launcher/Info.plist +++ b/SLProxy/MacProxy/Launcher/Info.plist @@ -20,7 +20,7 @@ ???? CFBundleVersion 1.0 - LSBackgroundOnly + LSUIElement MonoArguments diff --git a/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/MacOS/Launcher b/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/MacOS/Launcher deleted file mode 100755 index 408c811eb9dabf2b7e4847cda25ac0a3df5fe1ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25092 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 diff --git a/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/PkgInfo b/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/PkgInfo deleted file mode 100644 index bd04210f..00000000 --- a/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/English.lproj/InfoPlist.strings b/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index 997688e2fd53fd8d44166a1895730ea43ed42f47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmW-ZOAf&R6h+V2DjLH^R7?!S$b{#$5lbf^EkLAW3{7RTh oDE+A9pSg65nVdc!``%jXwyDfqOK2p - - - - IBDocumentLocation - 110 86 356 240 0 0 1440 878 - IBEditorPositions - - 29 - 109 299 338 44 0 0 1440 878 - - IBFramework Version - 446.1 - IBSystem Version - 8P2137 - - diff --git a/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/English.lproj/MainMenu.nib/keyedobjects.nib deleted file mode 100644 index 430b4de7ed3b1f43108c4ae8c6f5bb8171fdbd4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12970 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 diff --git a/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/libsl.icns b/SLProxy/MacProxy/Launcher/build/Release/Launcher.app/Contents/Resources/libsl.icns deleted file mode 100644 index c35d47cc382010e011b7b0ab35e61a7a42eb6924..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23822 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 svb>@f5d5*~J^y{@2e= 2; die "Please run MacProxy from within its own directory.\n" unless -d 'Launcher'; -my ($appname, $exe, $slproxy, $libsl) = @ARGV; +my ($appname, $exe, @libs) = @ARGV; print "Creating application bundle...\n"; @@ -14,7 +14,7 @@ and die "Failed; aborting.\n"; print "Embedding assemblies...\n"; -system('cp', $exe, $slproxy, $libsl, "$appname.app/Contents/Resources/Assemblies/") +system('cp', $exe, @libs, "$appname.app/Contents/Resources/Assemblies/") and die "Failed; aborting.\n"; print "Writing metadata...\n"; @@ -27,7 +27,7 @@ or die "Failed to open $appname.app/Contents/Info.plist; aborting.\n"; my $id = $appname; $id =~ s/[^a-z]//gi; $id = 'x' unless length $id; -$$_ =~ s!.*/!! foreach \$exe, \$slproxy, \$libsl; +$exe =~ s!.*/!!; while (<$ii>) { s/##NAME##/$appname/; s/##ID##/$id/;