turn off manual prebinding as it's no longer needed for any OS version we

care about 10.2+
This commit is contained in:
pinkerton%aol.net 2004-07-12 17:37:00 +00:00
Родитель 82883c9cd1
Коммит af9d4d8eef
2 изменённых файлов: 0 добавлений и 44 удалений

Просмотреть файл

@ -187,9 +187,6 @@ typedef enum EBookmarkOpenBehavior
+ (NSImage*)createImageForDragging:(NSImage*)aIcon title:(NSString*)aTitle;
- (void)updatePrebinding;
- (void)prebindFinished:(NSNotification *)aNotification;
- (void)pumpGeckoEventQueue;
// used by export bookmarks popup to say what file extension should be used on the resulting

Просмотреть файл

@ -184,9 +184,6 @@ const int kReuseWindowOnAE = 2;
-(void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
#ifdef _BUILD_STATIC_BIN
[self updatePrebinding];
#endif
// initialize if we haven't already.
PreferenceManager *pm = [PreferenceManager sharedInstance];
@ -1310,44 +1307,6 @@ const int kReuseWindowOnAE = 2;
[mFindDialog applicationWasActivated];
}
- (void) updatePrebinding
{
// For MacOS 10.2 and higher, don't do anything, since
// the OS updates our prebinding automatically, except on 10.3 where
// they screwed up and it doesn't work.
struct utsname u;
uname(&u);
float osVersion = atof(u.release);
if (osVersion >= 6.0 && osVersion < 7.0) // Only bail for 10.2.x
return;
// Check our prebinding status. If we didn't launch prebound,
// fork the update script.
if (!_dyld_launched_prebound()) {
NSLog(@"Not prebound, launching update script");
NSTask* aTask = [[NSTask alloc] init];
NSArray* args = [NSArray arrayWithObject: @"redo-prebinding.sh"];
[aTask setCurrentDirectoryPath:[[[NSBundle mainBundle] executablePath] stringByDeletingLastPathComponent]];
[aTask setLaunchPath:@"/bin/sh"];
[aTask setArguments:args];
[[NSNotificationCenter defaultCenter] addObserver: self
selector:@selector(prebindFinished:)
name:NSTaskDidTerminateNotification
object: nil];
[aTask launch];
}
}
- (void)prebindFinished:(NSNotification *)aNotification
{
[[aNotification object] release];
}
//
// -aboutWindow:
//