From fa44da6ea6145420d3caea4c69c2ea13d640cbe4 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Tue, 9 Jun 2009 01:55:02 +0000 Subject: [PATCH] * mac-fix-env.m: * Makefile.in (mac-fix-env): Remove. --- lib-src/ChangeLog | 5 +++ lib-src/Makefile.in | 3 -- lib-src/mac-fix-env.m | 72 ------------------------------------------- 3 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 lib-src/mac-fix-env.m diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f16bbda115..f519d137cd 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2006-06-09 Adrian Robert + + * mac-fix-env.m: + * Makefile.in (mac-fix-env): Remove. + 2006-06-06 David Reitter * Makefile.in (mac-fix-env): Compile it using ALL_CFLAGS. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index ffdeacc6b0..cb3cc4c1b7 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -449,6 +449,3 @@ update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS) update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" - -mac-fix-env: ${srcdir}/mac-fix-env.m - $(CC) ${ALL_CFLAGS} -o mac-fix-env ${srcdir}/mac-fix-env.m -prebind -framework Foundation diff --git a/lib-src/mac-fix-env.m b/lib-src/mac-fix-env.m deleted file mode 100644 index 9770fb866d..0000000000 --- a/lib-src/mac-fix-env.m +++ /dev/null @@ -1,72 +0,0 @@ -/* mac-fix-env: A small utility to pick up the shell environment on MacOS X - and insert it into the file ~/.MacOSX/environment.plist - creating if necessary. - Copyright (C) 1989, 1993, 2005, 2008, 2009 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -/* - usage: - Run from command line (in Terminal) once or whenever path changes: - - /Applications/Emacs.app/Contents/MacOS/bin/mac-fix-env - - (change initial part to where you installed Emacs). -*/ - -#import -#include - -int main(int argc, char *argv[]) -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - NSMutableDictionary *envPlist; - NSString *file = [[NSHomeDirectory() - stringByAppendingPathComponent:@".MacOSX"] - stringByAppendingPathComponent:@"environment.plist"]; - NSString *path = [NSString stringWithCString: getenv("PATH")]; - - envPlist = [[NSDictionary dictionaryWithContentsOfFile: file] mutableCopy]; - if (envPlist == nil) - { - // create - NSString *dir = [file stringByDeletingLastPathComponent]; - envPlist = [NSMutableDictionary dictionaryWithCapacity: 5]; - - if ([[NSFileManager defaultManager] fileExistsAtPath: dir] == NO) - { - if ([[NSFileManager defaultManager] createDirectoryAtPath:dir - attributes:nil]==NO) - { - NSLog(@":\nCould not create directory at '%@'; aborting.",dir); - return 1; - } - } - } - - [envPlist setObject: path forKey: @"PATH"]; - - if ([envPlist writeToFile: file atomically: YES] == NO) - { - NSLog(@":\nCould not write file at '%@'; aborting.", file); - return 1; - } - - NSLog(@":\nWrote file to '%@'.\nPlease inspect it to make sure PATH is correct.", file); - return 0; -} - -// arch-tag: 609d5528-5ac1-42c5-859b-24c14341ee3b -- 2.20.1