Mercurial > emacs
changeset 103353:ab0dc2b38d97
* mac-fix-env.m: * Makefile.in (mac-fix-env): Remove.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Tue, 09 Jun 2009 01:55:02 +0000 |
| parents | 827a8db0b5ad |
| children | 974d71b2e2c5 |
| files | lib-src/ChangeLog lib-src/Makefile.in lib-src/mac-fix-env.m |
| diffstat | 3 files changed, 5 insertions(+), 75 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Mon Jun 08 22:47:11 2009 +0000 +++ b/lib-src/ChangeLog Tue Jun 09 01:55:02 2009 +0000 @@ -1,3 +1,8 @@ +2006-06-09 Adrian Robert <Adrian.B.Robert@gmail.com> + + * mac-fix-env.m: + * Makefile.in (mac-fix-env): Remove. + 2006-06-06 David Reitter <david.reitter@gmail.com> * Makefile.in (mac-fix-env): Compile it using ALL_CFLAGS.
--- a/lib-src/Makefile.in Mon Jun 08 22:47:11 2009 +0000 +++ b/lib-src/Makefile.in Tue Jun 09 01:55:02 2009 +0000 @@ -449,6 +449,3 @@ 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
--- a/lib-src/mac-fix-env.m Mon Jun 08 22:47:11 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 <http://www.gnu.org/licenses/>. */ - -/* - 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 <Foundation/Foundation.h> -#include <stdlib.h> - -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