diff options
| author | Adrian Robert | 2009-06-09 01:55:02 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-06-09 01:55:02 +0000 |
| commit | fa44da6ea6145420d3caea4c69c2ea13d640cbe4 (patch) | |
| tree | c6a3b8e3fefcd26cb2ad42271acc5ddd47db1290 | |
| parent | 0cf681b6af638101d21f41cede785613a9011697 (diff) | |
| download | emacs-fa44da6ea6145420d3caea4c69c2ea13d640cbe4.tar.gz emacs-fa44da6ea6145420d3caea4c69c2ea13d640cbe4.zip | |
* mac-fix-env.m: * Makefile.in (mac-fix-env): Remove.
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 3 | ||||
| -rw-r--r-- | lib-src/mac-fix-env.m | 72 |
3 files changed, 5 insertions, 75 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f16bbda115b..f519d137cda 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2006-06-09 Adrian Robert <Adrian.B.Robert@gmail.com> | ||
| 2 | |||
| 3 | * mac-fix-env.m: | ||
| 4 | * Makefile.in (mac-fix-env): Remove. | ||
| 5 | |||
| 1 | 2006-06-06 David Reitter <david.reitter@gmail.com> | 6 | 2006-06-06 David Reitter <david.reitter@gmail.com> |
| 2 | 7 | ||
| 3 | * Makefile.in (mac-fix-env): Compile it using ALL_CFLAGS. | 8 | * Makefile.in (mac-fix-env): Compile it using ALL_CFLAGS. |
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index ffdeacc6b0b..cb3cc4c1b74 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -449,6 +449,3 @@ update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS) | |||
| 449 | update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) | 449 | update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) |
| 450 | $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ | 450 | $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ |
| 451 | -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" | 451 | -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" |
| 452 | |||
| 453 | mac-fix-env: ${srcdir}/mac-fix-env.m | ||
| 454 | $(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 9770fb866da..00000000000 --- a/lib-src/mac-fix-env.m +++ /dev/null | |||
| @@ -1,72 +0,0 @@ | |||
| 1 | /* mac-fix-env: A small utility to pick up the shell environment on MacOS X | ||
| 2 | and insert it into the file ~/.MacOSX/environment.plist | ||
| 3 | creating if necessary. | ||
| 4 | Copyright (C) 1989, 1993, 2005, 2008, 2009 Free Software Foundation, Inc. | ||
| 5 | |||
| 6 | This file is part of GNU Emacs. | ||
| 7 | |||
| 8 | GNU Emacs is free software: you can redistribute it and/or modify | ||
| 9 | it under the terms of the GNU General Public License as published by | ||
| 10 | the Free Software Foundation, either version 3 of the License, or | ||
| 11 | (at your option) any later version. | ||
| 12 | |||
| 13 | GNU Emacs is distributed in the hope that it will be useful, | ||
| 14 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | GNU General Public License for more details. | ||
| 17 | |||
| 18 | You should have received a copy of the GNU General Public License | ||
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | ||
| 20 | |||
| 21 | /* | ||
| 22 | usage: | ||
| 23 | Run from command line (in Terminal) once or whenever path changes: | ||
| 24 | |||
| 25 | /Applications/Emacs.app/Contents/MacOS/bin/mac-fix-env | ||
| 26 | |||
| 27 | (change initial part to where you installed Emacs). | ||
| 28 | */ | ||
| 29 | |||
| 30 | #import <Foundation/Foundation.h> | ||
| 31 | #include <stdlib.h> | ||
| 32 | |||
| 33 | int main(int argc, char *argv[]) | ||
| 34 | { | ||
| 35 | NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; | ||
| 36 | NSMutableDictionary *envPlist; | ||
| 37 | NSString *file = [[NSHomeDirectory() | ||
| 38 | stringByAppendingPathComponent:@".MacOSX"] | ||
| 39 | stringByAppendingPathComponent:@"environment.plist"]; | ||
| 40 | NSString *path = [NSString stringWithCString: getenv("PATH")]; | ||
| 41 | |||
| 42 | envPlist = [[NSDictionary dictionaryWithContentsOfFile: file] mutableCopy]; | ||
| 43 | if (envPlist == nil) | ||
| 44 | { | ||
| 45 | // create | ||
| 46 | NSString *dir = [file stringByDeletingLastPathComponent]; | ||
| 47 | envPlist = [NSMutableDictionary dictionaryWithCapacity: 5]; | ||
| 48 | |||
| 49 | if ([[NSFileManager defaultManager] fileExistsAtPath: dir] == NO) | ||
| 50 | { | ||
| 51 | if ([[NSFileManager defaultManager] createDirectoryAtPath:dir | ||
| 52 | attributes:nil]==NO) | ||
| 53 | { | ||
| 54 | NSLog(@":\nCould not create directory at '%@'; aborting.",dir); | ||
| 55 | return 1; | ||
| 56 | } | ||
| 57 | } | ||
| 58 | } | ||
| 59 | |||
| 60 | [envPlist setObject: path forKey: @"PATH"]; | ||
| 61 | |||
| 62 | if ([envPlist writeToFile: file atomically: YES] == NO) | ||
| 63 | { | ||
| 64 | NSLog(@":\nCould not write file at '%@'; aborting.", file); | ||
| 65 | return 1; | ||
| 66 | } | ||
| 67 | |||
| 68 | NSLog(@":\nWrote file to '%@'.\nPlease inspect it to make sure PATH is correct.", file); | ||
| 69 | return 0; | ||
| 70 | } | ||
| 71 | |||
| 72 | // arch-tag: 609d5528-5ac1-42c5-859b-24c14341ee3b | ||