Menu
▾
▴
finkcommander-commits — Announce commits to CVS repository
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
(14) |
Mar
(9) |
Apr
(4) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(6) |
Nov
|
Dec
|
| 2004 |
Jan
|
Feb
|
Mar
(2) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
|
From: monipol <mo...@us...> - 2009-11-22 06:03:22
|
Update of /cvsroot/finkcommander/FinkCommander In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22909 Modified Files: FinkController.m Added Files: SSHAskPass.sh Log Message: Support for SSH authentication without ssh-agent. --- NEW FILE: SSHAskPass.sh --- #!/bin/bash /usr/bin/osascript <<EOT tell application "System Events" activate set prompt to "Please enter your CVS password:" set dialogResult to display dialog prompt ¬ buttons {"OK"} default button ¬ "OK" default answer "" with icon 1 with hidden answer copy text returned of dialogResult to stdout end tell EOT Index: FinkController.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkController.m,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** FinkController.m 14 Nov 2009 05:59:41 -0000 1.170 --- FinkController.m 22 Nov 2009 04:38:34 -0000 1.171 *************** *** 1346,1350 **** --- 1346,1354 ---- NSString *exec = [args objectAtIndex:0]; NSMutableDictionary *envvars = [NSMutableDictionary dictionaryWithDictionary: [defaults objectForKey:FinkEnvironmentSettings]]; + NSString *askpass; [envvars setValue:[NSString stringWithUTF8String:getenv("SSH_AUTH_SOCK")] forKey:@"SSH_AUTH_SOCK"]; + [envvars setValue:@"0" forKey:@"DISPLAY"]; + askpass = [[[NSBundle mainBundle] resourcePath] stringByAppendingString:@"/SSHAskPass.sh"]; + [envvars setValue:askpass forKey:@"SSH_ASKPASS"]; pendingCommand = NO; //no command waiting in line |
|
From: monipol <mo...@us...> - 2009-11-22 06:03:18
|
Update of /cvsroot/finkcommander/FinkCommander/FinkCommander.xcodeproj In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22909/FinkCommander.xcodeproj Modified Files: project.pbxproj Log Message: Support for SSH authentication without ssh-agent. Index: project.pbxproj =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkCommander.xcodeproj/project.pbxproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project.pbxproj 4 Nov 2009 21:52:27 -0000 1.3 --- project.pbxproj 22 Nov 2009 04:38:34 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- /* Begin PBXBuildFile section */ + 148C8A6A10B8DA2A0013C39B /* SSHAskPass.sh in CopyFiles */ = {isa = PBXBuildFile; fileRef = 148C8A5A10B8D8D40013C39B /* SSHAskPass.sh */; }; 59E0400209CDC73B001280FD /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; 59E0400309CDC73B001280FD /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; *************** *** 114,117 **** --- 115,119 ---- dstSubfolderSpec = 7; files = ( + 148C8A6A10B8DA2A0013C39B /* SSHAskPass.sh in CopyFiles */, 59E0407009CDC73C001280FD /* Launcher in CopyFiles */, ); *************** *** 123,126 **** --- 125,129 ---- 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; + 148C8A5A10B8D8D40013C39B /* SSHAskPass.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = SSHAskPass.sh; sourceTree = "<group>"; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; }; *************** *** 377,380 **** --- 380,384 ---- isa = PBXGroup; children = ( + 148C8A5A10B8D8D40013C39B /* SSHAskPass.sh */, 59E0405A09CDC73B001280FD /* Info.plist */, F2C4F1D5084361C400CA6079 /* PackageInfo.nib */, *************** *** 1023,1028 **** GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = FCPrefix.pch; ! GCC_VERSION = 4.0; ! "GCC_VERSION[sdk=macosx10.5]" = 4.2; MACOSX_DEPLOYMENT_TARGET = 10.4; "MACOSX_DEPLOYMENT_TARGET[arch=ppc64]" = 10.5; --- 1027,1032 ---- GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = FCPrefix.pch; ! GCC_VERSION = com.apple.compilers.llvmgcc42; ! "GCC_VERSION[sdk=macosx10.5]" = com.apple.compilers.llvmgcc42; MACOSX_DEPLOYMENT_TARGET = 10.4; "MACOSX_DEPLOYMENT_TARGET[arch=ppc64]" = 10.5; |
|
From: monipol <mo...@us...> - 2009-11-22 06:03:09
|
Update of /cvsroot/finkcommander/FinkCommander In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25005 Modified Files: Info.plist Log Message: Add x86_64/10.5.0 to Info.plist (patch by Madd the Sane) Index: Info.plist =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/Info.plist,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Info.plist 4 Nov 2009 21:52:27 -0000 1.2 --- Info.plist 22 Nov 2009 05:03:18 -0000 1.3 *************** *** 29,35 **** <key>i386</key> <string>10.4.0</string> <key>ppc</key> <string>10.3.9</string> ! <key>x86_64</key> <string>10.5.0</string> </dict> --- 29,37 ---- <key>i386</key> <string>10.4.0</string> + <key>x86_64</key> + <string>10.5.0</string> <key>ppc</key> <string>10.3.9</string> ! <key>ppc64</key> <string>10.5.0</string> </dict> |
|
From: monipol <mo...@us...> - 2009-11-14 05:59:53
|
Update of /cvsroot/finkcommander/FinkCommander/SBTreeFiles In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31784/SBTreeFiles Modified Files: SBBrowserView.m SBOutlineView.m Log Message: Get rid of deprecation warnings. Index: SBBrowserView.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/SBTreeFiles/SBBrowserView.m,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** SBBrowserView.m 4 Nov 2009 21:52:27 -0000 1.12 --- SBBrowserView.m 14 Nov 2009 05:59:41 -0000 1.13 *************** *** 146,150 **** } ! -(BOOL)validateMenuItem:(id <NSMenuItem>)menuItem { return [self validateItem:menuItem]; --- 146,150 ---- } ! -(BOOL)validateMenuItem:(NSMenuItem *)menuItem { return [self validateItem:menuItem]; Index: SBOutlineView.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/SBTreeFiles/SBOutlineView.m,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SBOutlineView.m 30 Sep 2005 11:04:42 -0000 1.7 --- SBOutlineView.m 14 Nov 2009 05:59:41 -0000 1.8 *************** *** 140,144 **** } ! -(BOOL)validateMenuItem:(id <NSMenuItem>)menuItem { return [self validateItem:menuItem]; --- 140,144 ---- } ! -(BOOL)validateMenuItem:(NSMenuItem *)menuItem { return [self validateItem:menuItem]; |
|
From: monipol <mo...@us...> - 2009-11-14 05:59:53
|
Update of /cvsroot/finkcommander/FinkCommander In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31784 Modified Files: FinkConf.m FinkController.m FinkTableView.m FinkUtilities.m getpath.c Log Message: Get rid of deprecation warnings. Index: FinkController.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkController.m,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** FinkController.m 9 Nov 2009 03:19:49 -0000 1.169 --- FinkController.m 14 Nov 2009 05:59:41 -0000 1.170 *************** *** 1215,1219 **** //Disable menu items ! -(BOOL)validateMenuItem:(id <NSMenuItem>)menuItem { return [self validateItem: menuItem]; --- 1215,1219 ---- //Disable menu items ! -(BOOL)validateMenuItem:(NSMenuItem *)menuItem { return [self validateItem: menuItem]; Index: FinkUtilities.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkUtilities.m,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** FinkUtilities.m 15 Jun 2005 10:56:53 -0000 1.30 --- FinkUtilities.m 14 Nov 2009 05:59:41 -0000 1.31 *************** *** 98,102 **** } // NSLog(@"Writing table update script to %@", wpath); ! [scriptText writeToFile:wpath atomically:YES]; [defaults setBool:NO forKey:FinkBasePathFound]; } --- 98,102 ---- } // NSLog(@"Writing table update script to %@", wpath); ! [scriptText writeToFile:wpath atomically:YES encoding:NSUTF8StringEncoding error:NULL]; [defaults setBool:NO forKey:FinkBasePathFound]; } Index: FinkTableView.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkTableView.m,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** FinkTableView.m 4 Nov 2009 21:52:27 -0000 1.13 --- FinkTableView.m 14 Nov 2009 05:59:41 -0000 1.14 *************** *** 192,196 **** } ! -(BOOL)validateMenuItem:(id <NSMenuItem>)menuItem { return [self validateItem: menuItem]; --- 192,196 ---- } ! -(BOOL)validateMenuItem:(NSMenuItem *)menuItem { return [self validateItem: menuItem]; Index: FinkConf.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkConf.m,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** FinkConf.m 9 Nov 2009 03:19:49 -0000 1.36 --- FinkConf.m 14 Nov 2009 05:59:41 -0000 1.37 *************** *** 383,388 **** BOOL success; ! ! success = [fconfString writeToFile:tempFile atomically:YES]; if (! success){ NSRunCriticalAlertPanel(LS_ERROR, --- 383,387 ---- BOOL success; ! success = [fconfString writeToFile:tempFile atomically:YES encoding:NSUTF8StringEncoding error:NULL]; if (! success){ NSRunCriticalAlertPanel(LS_ERROR, Index: getpath.c =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/getpath.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** getpath.c 15 Sep 2002 04:45:20 -0000 1.1 --- getpath.c 14 Nov 2009 05:59:41 -0000 1.2 *************** *** 2,49 **** $Id$ ! File: getpath.c ! ! Copyright: © Copyright 2002 Apple Computer, Inc. All rights reserved. ! ! Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple Computer, Inc. ! ("Apple") in consideration of your agreement to the following terms, and your ! use, installation, modification or redistribution of this Apple software ! constitutes acceptance of these terms. If you do not agree with these terms, ! please do not use, install, modify or redistribute this Apple software. ! ! In consideration of your agreement to abide by the following terms, and subject ! to these terms, Apple grants you a personal, non-exclusive license, under AppleÕs ! copyrights in this original Apple software (the "Apple Software"), to use, ! reproduce, modify and redistribute the Apple Software, with or without ! modifications, in source and/or binary forms; provided that if you redistribute ! the Apple Software in its entirety and without modifications, you must retain ! this notice and the following text and disclaimers in all such redistributions of ! the Apple Software. Neither the name, trademarks, service marks or logos of ! Apple Computer, Inc. may be used to endorse or promote products derived from the ! Apple Software without specific prior written permission from Apple. Except as ! expressly stated in this notice, no other rights or licenses, express or implied, ! are granted by Apple herein, including but not limited to any patent rights that ! may be infringed by your derivative works or by other works in which the Apple ! Software may be incorporated. ! ! The Apple Software is provided by Apple on an "AS IS" basis. APPLE MAKES NO ! WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED ! WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR ! PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN ! COMBINATION WITH YOUR PRODUCTS. ! ! IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR ! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE ! GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ! ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION ! OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT ! (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ! ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! Change History (most recent first): ! 5/1/02 2.0d2 Improved the reliability of determining the path to the ! executable during self-repair. ! 12/19/01 2.0d1 First release of self-repair version. */ --- 2,38 ---- $Id$ ! FinkCommander ! ! Graphical user interface for Fink, a software package management system ! that automates the downloading, patching, compilation and installation of ! Unix software on Mac OS X. ! ! getpath.c is used to build the setuid root Launcher tool which runs ! fink and apt-get commands, terminates those commands at the request of the user and ! writes changes to fink.conf. ! ! This program is free software; you may redistribute it and/or modify ! it under the terms of the GNU General Public License as published by ! the Free Software Foundation; either version 2 of the License, or ! (at your option) any later version. ! ! This program 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 this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! ! Contact the author at sbu...@us.... ! ! Change History (most recent first): ! 11/14/09 Use _NSGetExecutablePath() only ! ! 5/1/02 2.0d2 Improved the reliability of determining the path to the ! executable during self-repair. ! 12/19/01 2.0d1 First release of self-repair version. */ *************** *** 58,159 **** #include <mach-o/dyld.h> - typedef int (*NSGetExecutablePathProcPtr)(char *buf, size_t *bufsize); - - - static int - NSGetExecutablePathOnTenOneAndEarlierOnly(char *execPath, size_t *execPathSize) - { - int err = 0; - char **cursor; - char *possiblyRelativePath; - char absolutePath[MAXPATHLEN]; - size_t absolutePathSize; - - assert(execPath != NULL); - assert(execPathSize != NULL); - - cursor = (char **) (*(_NSGetArgv()) + *(_NSGetArgc())); - - // There should be a NULL after the argv array. - // If not, error out. - - if (*cursor != 0) - err = -1; - - if (err == 0) - { - // Skip past the NULL after the argv array. - - cursor += 1; - - // Now, skip over the entire kernel-supplied environment, - // which is an array of char * terminated by a NULL. - - while (*cursor != 0) - { - cursor += 1; - } - - // Skip over the NULL terminating the environment. - - cursor += 1; - - // Now we have the path that was passed to exec - // (not the argv[0] path, but the path that the kernel - // actually executed). - - possiblyRelativePath = *cursor; - - // Convert the possibly relative path to an absolute - // path. We use realpath for expedience, although - // the real implementation of _NSGetExecutablePath - // uses getcwd and can return a path with symbolic links - // etc in it. - - if (realpath(possiblyRelativePath, absolutePath) == NULL) - err = -1; - } - - // Now copy the path out into the client's buffer, returning - // an error if the buffer isn't big enough. - - if (err == 0) - { - absolutePathSize = (strlen(absolutePath) + 1); - - if (absolutePathSize <= *execPathSize) - { - strcpy(execPath, absolutePath); - } - else - { - err = -1; - } - - *execPathSize = absolutePathSize; - } - - return err; - } - - - int ! MyGetExecutablePath(char *execPath, size_t *execPathSize) { ! if (NSIsSymbolNameDefined("__NSGetExecutablePath")) ! { ! return ((NSGetExecutablePathProcPtr) NSAddressOfSymbol(NSLookupAndBindSymbol("__NSGetExecutablePath")))(execPath, execPathSize); ! } ! else ! { ! // The function _NSGetExecutablePath() is new in Jaguar, so use this custom version when running on 10.1.x and earlier. ! return NSGetExecutablePathOnTenOneAndEarlierOnly(execPath, execPathSize); ! } } char* getPathToMyself() { ! size_t path_size = MAXPATHLEN; char* path = malloc(path_size); --- 47,60 ---- #include <mach-o/dyld.h> int ! MyGetExecutablePath(char *execPath, uint32_t *execPathSize) { ! // return ((NSGetExecutablePathProcPtr) NSAddressOfSymbol(NSLookupAndBindSymbol("__NSGetExecutablePath")))(execPath, execPathSize); ! return _NSGetExecutablePath(execPath, execPathSize); } char* getPathToMyself() { ! uint32_t path_size = MAXPATHLEN; char* path = malloc(path_size); |
|
From: monipol <mo...@us...> - 2009-11-09 03:19:58
|
Update of /cvsroot/finkcommander/FinkCommander In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14739 Modified Files: FinkConf.h FinkConf.m FinkController.m FinkInstallationInfo.m FinkPackageInfo.m Log Message: Improvements in the feedback e-mail messages. Fixes bug reports #1599362 and 1453809. Index: FinkController.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkController.m,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** FinkController.m 8 Nov 2009 19:17:39 -0000 1.168 --- FinkController.m 9 Nov 2009 03:19:49 -0000 1.169 *************** *** 746,749 **** --- 746,751 ---- NSString *sig = [installationInfo formattedEmailSig]; NSString *feedbackMessage; + NSString *emailTemplate; + NSString *emailBody; FinkPackage *pkg; NSMutableArray *pkgNames = [NSMutableArray arrayWithCapacity:5]; *************** *** 753,764 **** } if (typeOfFeedback == POSITIVE) ! feedbackMessage = @"Feedback: works for me"; else if (typeOfFeedback == NEGATIVE) ! feedbackMessage = @"Feedback: not good"; else ! feedbackMessage = @"Feedback: ???"; ! [packageInfo setEmailSig:sig]; while (nil != (pkg = [e nextObject])){ if (typeOfFeedback == POSITIVE && --- 755,769 ---- } + emailTemplate = @"Hello, there. This is a feedback e-mail with regard to package %@-%@. %@\n"; + if (typeOfFeedback == POSITIVE) ! feedbackMessage = @"It works like a charm, thanks!"; else if (typeOfFeedback == NEGATIVE) ! feedbackMessage = @"I am having the following problem(s):\n"; else ! feedbackMessage = @"Ooops, FinkCommander doesn't know whether this feedback is positive or negative!"; ! [packageInfo setEmailSig:sig]; + while (nil != (pkg = [e nextObject])){ if (typeOfFeedback == POSITIVE && *************** *** 774,778 **** [pkgNames addObject:[pkg name]]; } ! [[NSWorkspace sharedWorkspace] openURL:[packageInfo mailURLForPackage:pkg withBody:feedbackMessage]]; } if (typeOfFeedback == POSITIVE && [pkgNames count] > 0){ --- 779,784 ---- [pkgNames addObject:[pkg name]]; } ! emailBody = [NSString stringWithFormat:emailTemplate, [pkg name], [pkg version], feedbackMessage]; ! [[NSWorkspace sharedWorkspace] openURL:[packageInfo mailURLForPackage:pkg withBody:emailBody]]; } if (typeOfFeedback == POSITIVE && [pkgNames count] > 0){ Index: FinkInstallationInfo.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkInstallationInfo.m,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** FinkInstallationInfo.m 4 Nov 2009 21:52:27 -0000 1.26 --- FinkInstallationInfo.m 9 Nov 2009 03:19:49 -0000 1.27 *************** *** 65,70 **** //Run CLI tool to get its version information ! -(NSString *)versionOutputForExecutable:(NSString *)path ! usingArgument:(NSString *)arg { NSTask *versionTask = [[NSTask alloc] init]; --- 65,69 ---- //Run CLI tool to get its version information ! -(NSString *)versionOutputForExecutable:(NSString *)path usingArguments:(NSArray *)args { NSTask *versionTask = [[NSTask alloc] init]; *************** *** 79,84 **** [versionTask setLaunchPath: path]; ! if (arg){ ! [versionTask setArguments: [NSArray arrayWithObjects:arg, nil]]; } [versionTask setStandardOutput: pipeFromStdout]; --- 78,83 ---- [versionTask setLaunchPath: path]; ! if (args) { ! [versionTask setArguments: args]; } [versionTask setStandardOutput: pipeFromStdout]; *************** *** 92,96 **** NS_HANDLER //Handle NSFileHandleOperationException ! NSLog(@"Failed to read data stream from %@ %@", path, arg); return nil; NS_ENDHANDLER --- 91,96 ---- NS_HANDLER //Handle NSFileHandleOperationException ! // NSLog(@"Failed to read data stream from %@ %@", path, args); ! NSLog(@"Failed to read data stream from %@", path); return nil; NS_ENDHANDLER *************** *** 102,105 **** --- 102,111 ---- -(NSString *)versionOutputForExecutable:(NSString *)path + usingArgument:(NSString *) arg + { + return [self versionOutputForExecutable:path usingArguments:[NSArray arrayWithObjects:arg, nil]]; + } + + -(NSString *)versionOutputForExecutable:(NSString *)path { return [self versionOutputForExecutable:path usingArgument:@"--version"]; *************** *** 248,251 **** --- 254,281 ---- } + -(NSString *)distribution + { + NSString *finkConf = [[[NSUserDefaults standardUserDefaults] objectForKey: FinkBasePath] + stringByAppendingPathComponent: @"/etc/fink.conf"]; + NSString *version = [self versionOutputForExecutable:@"/usr/bin/grep" + usingArguments:[NSArray arrayWithObjects:@"^Distribution:", finkConf, nil]]; + + if (! version) return @"Unable to determine the distribution field\n"; + return version; + } + + -(NSString *)trees + { + NSString *finkConf = [[[NSUserDefaults standardUserDefaults] objectForKey: FinkBasePath] + stringByAppendingPathComponent: @"/etc/fink.conf"]; + NSString *version = [self versionOutputForExecutable:@"/usr/bin/grep" + usingArguments:[NSArray arrayWithObjects:@"^Trees:", finkConf, nil]]; + + if (! version) return @"Unable to determine the trees field\n"; + return version; + } + + + //------------------------------>All The Information Combined *************** *** 258,271 **** NSString *devTools; NSString *makeVersion; NSString *result; if ([gccVersion contains: @"not installed"]){ ! result = [NSString stringWithFormat: @"%@%@\n%@\n", ! finkVersion, macOSXVersion, gccVersion]; }else{ devTools = [self developerToolsInfo]; makeVersion = [self makeVersion]; ! result = [NSString stringWithFormat: @"%@%@\n%@\n%@\n%@\n", ! finkVersion, macOSXVersion, devTools, gccVersion, makeVersion]; } return result; --- 288,303 ---- NSString *devTools; NSString *makeVersion; + NSString *distribution = [self distribution]; + NSString *trees = [self trees]; NSString *result; if ([gccVersion contains: @"not installed"]){ ! result = [NSString stringWithFormat: @"%@%@\n%@\n%@%@", ! finkVersion, macOSXVersion, gccVersion, distribution, trees]; }else{ devTools = [self developerToolsInfo]; makeVersion = [self makeVersion]; ! result = [NSString stringWithFormat: @"%@%@\n%@\n%@\n%@\n%@%@", ! finkVersion, macOSXVersion, devTools, gccVersion, makeVersion, distribution, trees]; } return result; Index: FinkConf.h =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkConf.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** FinkConf.h 19 Jan 2003 03:44:46 -0000 1.22 --- FinkConf.h 9 Nov 2009 03:19:49 -0000 1.23 *************** *** 76,79 **** --- 76,80 ---- -(NSString *)fetchAltDir; -(void)setFetchAltDir:(NSString *)s; + -(NSString *)distribution; //Set flag that determines whether fink index Index: FinkConf.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkConf.m,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** FinkConf.m 17 Jun 2005 08:18:20 -0000 1.35 --- FinkConf.m 9 Nov 2009 03:19:49 -0000 1.36 *************** *** 326,329 **** --- 326,338 ---- } + -(NSString *)distribution + { + NSString *d = [finkConfDict objectForKey: @"Distribution"]; + if (d != nil) { + return d; + } + return @""; + } + //--------------------------------------------------->Write Changes to Fink.conf Index: FinkPackageInfo.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkPackageInfo.m,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** FinkPackageInfo.m 4 Nov 2009 21:52:27 -0000 1.31 --- FinkPackageInfo.m 9 Nov 2009 03:19:49 -0000 1.32 *************** *** 69,73 **** { return [[NSString stringWithFormat: ! @"mailto:%@?subject=%@-%@&body=%@\n\n%@", [pkg email], [pkg name], [pkg version], body, emailSig] URLByAddingPercentEscapesToString]; --- 69,73 ---- { return [[NSString stringWithFormat: ! @"mailto:%@?subject=(Fink) %@-%@&body=%@\n\n%@", [pkg email], [pkg name], [pkg version], body, emailSig] URLByAddingPercentEscapesToString]; |
|
From: monipol <mo...@us...> - 2009-11-08 19:17:50
|
Update of /cvsroot/finkcommander/FinkCommander In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29540 Modified Files: FinkController.m RELEASE_STEPS.txt Log Message: * Forward SSH_AUTH_SOCK to authorised processes so that selfupdate-cvs works (as long as ssh-agent is being used). * Add actual cvs tag to the release steps document. Index: RELEASE_STEPS.txt =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/RELEASE_STEPS.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RELEASE_STEPS.txt 11 Apr 2003 04:56:07 -0000 1.10 --- RELEASE_STEPS.txt 8 Nov 2009 19:17:39 -0000 1.11 *************** *** 23,29 **** Download and test ! Tag cvs with release number Upload web site ! Post announcement to FC SourceForge news, finkcommander-users, fink-users \ No newline at end of file --- 23,29 ---- Download and test ! Tag cvs with release number (cvs tag -R Version_0_5_5_Release) Upload web site ! Post announcement to FC SourceForge news, finkcommander-users, fink-users Index: FinkController.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkController.m,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** FinkController.m 4 Nov 2009 21:52:26 -0000 1.167 --- FinkController.m 8 Nov 2009 19:17:39 -0000 1.168 *************** *** 1339,1342 **** --- 1339,1344 ---- { NSString *exec = [args objectAtIndex:0]; + NSMutableDictionary *envvars = [NSMutableDictionary dictionaryWithDictionary: [defaults objectForKey:FinkEnvironmentSettings]]; + [envvars setValue:[NSString stringWithUTF8String:getenv("SSH_AUTH_SOCK")] forKey:@"SSH_AUTH_SOCK"]; pendingCommand = NO; //no command waiting in line *************** *** 1349,1353 **** [finkTask setArguments:args]; ! [finkTask setEnvironment:[defaults objectForKey:FinkEnvironmentSettings]]; [finkTask authorizeWithQuery]; [finkTask start]; --- 1351,1355 ---- [finkTask setArguments:args]; ! [finkTask setEnvironment:envvars]; [finkTask authorizeWithQuery]; [finkTask start]; |
|
From: Ben H. <be...@us...> - 2005-03-15 08:59:36
|
Update of /cvsroot/finkcommander/FinkCommander In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28257 Modified Files: FinkInstallationInfo.m Log Message: Recognize xcode Index: FinkInstallationInfo.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkInstallationInfo.m,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** FinkInstallationInfo.m 15 Mar 2003 23:39:16 -0000 1.21 --- FinkInstallationInfo.m 15 Mar 2005 08:59:13 -0000 1.22 *************** *** 10,13 **** --- 10,14 ---- //Constants #define MAY_TOOLS_VERSION @"2.0.1" + #define DEVTOOLS_TEST_PATH0 @"/Developer/Applications/Xcode.app/Contents/version.plist" #define DEVTOOLS_TEST_PATH1 @"/Developer/Applications/Project Builder.app/Contents/Resources/English.lproj/DevCDVersion.plist" #define DEVTOOLS_TEST_PATH2 @"/Developer/Applications/Interface Builder.app/Contents/version.plist" *************** *** 201,204 **** --- 202,214 ---- NSString *version; + if ([manager fileExistsAtPath: DEVTOOLS_TEST_PATH0]){ + Dprintf(@"Found file at %@", DEVTOOLS_TEST_PATH0); + version = [[NSDictionary dictionaryWithContentsOfFile: DEVTOOLS_TEST_PATH0] + objectForKey:@"CFBundleShortVersionString"]; + if (! version || [version length] < 3) return error; + version = [@"Xcode tools " stringByAppendingString:version]; + return version; + } + if ([manager fileExistsAtPath: DEVTOOLS_TEST_PATH1]){ Dprintf(@"Found file at %@", DEVTOOLS_TEST_PATH1); |
|
From: Ben H. <be...@us...> - 2004-04-19 23:50:59
|
Update of /cvsroot/finkcommander/FinkCommander/FinkCommander.pbproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13140/FinkCommander.pbproj Modified Files: project.pbxproj Log Message: 0.5.3 Index: project.pbxproj =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkCommander.pbproj/project.pbxproj,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** project.pbxproj 17 Mar 2004 05:22:09 -0000 1.108 --- project.pbxproj 19 Apr 2004 23:50:20 -0000 1.109 *************** *** 338,342 **** <string>APPL</string> <key>CFBundleShortVersionString</key> ! <string>0.5.2</string> <key>CFBundleSignature</key> <string>Fcmd</string> --- 338,342 ---- <string>APPL</string> <key>CFBundleShortVersionString</key> ! <string>0.5.3</string> <key>CFBundleSignature</key> <string>Fcmd</string> |
|
From: Ben H. <be...@us...> - 2004-04-13 02:15:51
|
Update of /cvsroot/finkcommander/FinkCommander In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10808 Modified Files: FinkPackage.m Log Message: Fix display of unstable/stable versions Index: FinkPackage.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkPackage.m,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** FinkPackage.m 17 Mar 2004 05:22:08 -0000 1.19 --- FinkPackage.m 13 Apr 2004 02:01:57 -0000 1.20 *************** *** 517,524 **** //Finally, if that failed, fall back to what fink said. Probably best, anyway. ! if(![mgr fileExistsAtPath:thePath] && [filename length] > 4) ! { ! return filename; ! } return thePath; } --- 517,525 ---- //Finally, if that failed, fall back to what fink said. Probably best, anyway. ! // This breaks the 'tree' parameter! bad! ! // if(![mgr fileExistsAtPath:thePath] && [filename length] > 4) ! // { ! // return filename; ! // } return thePath; } |
Update of /cvsroot/finkcommander/FinkCommander In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13163 Modified Files: Debugging.h FinkData.m FinkPackage.h FinkPackage.m FinkUtilities.m VERSION_HISTORY.html fpkg_list.pl version.xml Log Message: Fix .info file support. Index: Debugging.h =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/Debugging.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Debugging.h 21 Jun 2003 10:11:24 -0000 1.11 --- Debugging.h 17 Mar 2004 05:22:08 -0000 1.12 *************** *** 4,6 **** //Comment out to disable debugging code: ! #define DEBUGGING --- 4,6 ---- //Comment out to disable debugging code: ! //#define DEBUGGING Index: version.xml =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/version.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** version.xml 27 Oct 2002 18:00:47 -0000 1.4 --- version.xml 17 Mar 2004 05:22:08 -0000 1.5 *************** *** 4,8 **** <dict> <key>FinkCommander</key> ! <string>0.4.2</string> </dict> </plist> --- 4,8 ---- <dict> <key>FinkCommander</key> ! <string>0.5.1</string> </dict> </plist> Index: FinkData.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkData.m,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FinkData.m 4 Apr 2003 05:05:07 -0000 1.9 --- FinkData.m 17 Mar 2004 05:22:08 -0000 1.10 *************** *** 268,273 **** [p setUnstable:[packageComponents objectAtIndex: 5]]; [p setCategory:[packageComponents objectAtIndex: 6]]; ! [p setSummary:[packageComponents objectAtIndex: 7]]; ! [p setFulldesc:[packageComponents objectAtIndex: 8]]; /* Many package have identical versions in the stable and --- 268,274 ---- [p setUnstable:[packageComponents objectAtIndex: 5]]; [p setCategory:[packageComponents objectAtIndex: 6]]; ! [p setFilename:[packageComponents objectAtIndex: 7]]; ! [p setSummary:[packageComponents objectAtIndex: 8]]; ! [p setFulldesc:[packageComponents objectAtIndex: 9]]; /* Many package have identical versions in the stable and Index: VERSION_HISTORY.html =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/VERSION_HISTORY.html,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** VERSION_HISTORY.html 15 Mar 2003 23:39:16 -0000 1.22 --- VERSION_HISTORY.html 17 Mar 2004 05:22:08 -0000 1.23 *************** *** 9,14 **** <h2>Version History</h2> ! 0.5.0 Pending <ul> --- 9,20 ---- <h2>Version History</h2> + 0.5.2 3/2004 + <ul> + <li> Add selfupdate-rsync support</li> + <li> Add Regular Expression support to table filter (enable/disable in prefs)</li> + <li> Fix 'open info file' feature. + </ul> ! 0.5.1 <ul> Index: FinkPackage.h =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkPackage.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FinkPackage.h 9 Feb 2003 18:12:12 -0000 1.17 --- FinkPackage.h 17 Mar 2004 05:22:08 -0000 1.18 *************** *** 52,55 **** --- 52,56 ---- NSString *unstable; NSString *category; + NSString *filename; NSString *summary; NSString *fulldesc; *************** *** 88,91 **** --- 89,95 ---- -(void)setCategory:(NSString *)s; + -(NSString *)filename; + -(void)setFilename:(NSString *)s; + -(NSString *)summary; -(void)setSummary:(NSString *)s; Index: FinkPackage.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkPackage.m,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FinkPackage.m 11 Feb 2003 06:15:56 -0000 1.18 --- FinkPackage.m 17 Mar 2004 05:22:08 -0000 1.19 *************** *** 159,162 **** --- 159,175 ---- } + //Filename + -(NSString *)filename; + { + return filename; + } + + -(void)setFilename:(NSString *)s; + { + [s retain]; + [filename release]; + filename = s; + } + //Summary -(NSString *)summary; *************** *** 448,451 **** --- 461,465 ---- } + // This is slightly fragile. Should get the path from fink itself. -(NSString *)pathToPackageInTree:(NSString *)tree withExtension:(NSString *)ext *************** *** 457,461 **** NSString *distPath = [FinkPackage pathToDists]; NSString *pkgFileName, *thePath; ! NSArray *components; if (nil == fversion){ --- 471,476 ---- NSString *distPath = [FinkPackage pathToDists]; NSString *pkgFileName, *thePath; ! NSArray *components, *nameVariants; ! NSEnumerator *theEnum; if (nil == fversion){ *************** *** 464,492 **** } ! pkgFileName = [NSString stringWithFormat:@"%@-%@.%@", fname, fversion, ext]; ! if ([[self category] isEqualToString:@"crypto"]){ ! components = [NSArray arrayWithObjects:distPath, tree, @"crypto", ! @"finkinfo", pkgFileName, nil]; ! }else{ ! components = [NSArray arrayWithObjects:distPath, tree, @"main", ! @"finkinfo", [self category], pkgFileName, nil]; ! } ! thePath = [[NSString pathWithComponents:components] stringByResolvingSymlinksInPath]; ! ! if (! foundSplitoff && ! [fname rangeOfString:@"-"].length > 0 && ! ! [mgr fileExistsAtPath:thePath]){ ! NSMutableString *mutablePath = [[thePath mutableCopy] autorelease]; ! NSString *mutatedString; ! NSRange rangeToLastDash = ! NSMakeRange(0, [fname rangeOfString:@"-" options:NSBackwardsSearch].location); ! NSRange rangeOfName = [thePath rangeOfString:fname]; ! fname = [fname substringWithRange:rangeToLastDash]; ! [mutablePath replaceCharactersInRange:rangeOfName withString:fname]; ! mutatedString = [mutablePath stringByResolvingSymlinksInPath]; ! if ([mgr fileExistsAtPath:mutablePath]){ ! thePath = mutatedString; } } return thePath; --- 479,523 ---- } ! nameVariants = [NSArray arrayWithObjects: ! [NSString stringWithFormat:@"%@-%@.%@", fname, fversion, ext], ! [NSString stringWithFormat:@"%@.%@", fname, ext], ! nil]; ! theEnum = [nameVariants objectEnumerator]; ! while(pkgFileName = [theEnum nextObject]) ! { ! if ([[self category] isEqualToString:@"crypto"]){ ! components = [NSArray arrayWithObjects:distPath, tree, @"crypto", ! @"finkinfo", pkgFileName, nil]; ! }else{ ! components = [NSArray arrayWithObjects:distPath, tree, @"main", ! @"finkinfo", [self category], pkgFileName, nil]; ! } ! thePath = [[NSString pathWithComponents:components] stringByResolvingSymlinksInPath]; ! if (! foundSplitoff && ! [fname rangeOfString:@"-"].length > 0 && ! ! [mgr fileExistsAtPath:thePath]){ ! NSMutableString *mutablePath = [[thePath mutableCopy] autorelease]; ! NSString *mutatedString; ! NSRange rangeToLastDash = ! NSMakeRange(0, [fname rangeOfString:@"-" options:NSBackwardsSearch].location); ! NSRange rangeOfName = [thePath rangeOfString:fname]; ! ! fname = [fname substringWithRange:rangeToLastDash]; ! [mutablePath replaceCharactersInRange:rangeOfName withString:fname]; ! mutatedString = [mutablePath stringByResolvingSymlinksInPath]; ! if ([mgr fileExistsAtPath:mutablePath]){ ! thePath = mutatedString; ! } } + if([mgr fileExistsAtPath:thePath]){ + break; + } + } + + //Finally, if that failed, fall back to what fink said. Probably best, anyway. + if(![mgr fileExistsAtPath:thePath] && [filename length] > 4) + { + return filename; } return thePath; Index: FinkUtilities.m =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkUtilities.m,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** FinkUtilities.m 6 Feb 2003 05:46:31 -0000 1.28 --- FinkUtilities.m 17 Mar 2004 05:22:08 -0000 1.29 *************** *** 86,91 **** [manager createDirectoryAtPath:fcpath attributes:nil]; } ! ! if (! [manager fileExistsAtPath:wpath] || [defaults boolForKey:FinkBasePathFound]){ NSString *rpath = [[NSBundle mainBundle] pathForResource:@"fpkg_list" ofType:@"pl"]; NSMutableString *scriptText = [NSMutableString stringWithContentsOfFile:rpath]; --- 86,92 ---- [manager createDirectoryAtPath:fcpath attributes:nil]; } ! //Update the FinkCommander.pl every time for now - till we version it ! if(1){ ! // if (! [manager fileExistsAtPath:wpath] || [defaults boolForKey:FinkBasePathFound]){ NSString *rpath = [[NSBundle mainBundle] pathForResource:@"fpkg_list" ofType:@"pl"]; NSMutableString *scriptText = [NSMutableString stringWithContentsOfFile:rpath]; *************** *** 96,100 **** [scriptText replaceCharactersInRange:rangeOfBASEPATH withString:basePath]; } ! NSLog(@"Writing table update script to %@", wpath); [scriptText writeToFile:wpath atomically:YES]; [defaults setBool:NO forKey:FinkBasePathFound]; --- 97,101 ---- [scriptText replaceCharactersInRange:rangeOfBASEPATH withString:basePath]; } ! // NSLog(@"Writing table update script to %@", wpath); [scriptText writeToFile:wpath atomically:YES]; [defaults setBool:NO forKey:FinkBasePathFound]; Index: fpkg_list.pl =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/fpkg_list.pl,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** fpkg_list.pl 19 Jan 2003 03:44:46 -0000 1.17 --- fpkg_list.pl 17 Mar 2004 05:22:08 -0000 1.18 *************** *** 46,50 **** my ($vo, $lversion); #PkgVersion object, version number my ($pname, $iflag, $description, $full); #pkg data items ! my ($section, $lvinstalled, $lvstable, $lvunstable); #ditto --- 46,50 ---- my ($vo, $lversion); #PkgVersion object, version number my ($pname, $iflag, $description, $full); #pkg data items ! my ($section, $lvinstalled, $lvstable, $lvunstable, $lvfilename); #ditto *************** *** 97,101 **** $package = Fink::Package->package_by_name($pname); if ($package->is_virtual()) { ! $lvstable = $lvunstable = $iflag = $section = " "; $description = "virtual package"; $full = "virtual package"; --- 97,101 ---- $package = Fink::Package->package_by_name($pname); if ($package->is_virtual()) { ! $lvstable = $lvunstable = $lvfilename = $iflag = $section = " "; $description = "virtual package"; $full = "virtual package"; *************** *** 117,123 **** } else { $iflag = " "; } } print "----\n$pname**\n$iflag**\n$lversion**\n$lvinstalled**\n$lvstable**\n". ! "$lvunstable**\n$section**\n$description**\n$full\n"; } --- 117,129 ---- } else { $iflag = " "; + } + eval { #Post-0.19.0 fink + $lvfilename = $vo->get_filename() || " "; + }; + if ($@) { + $lvfilename = $vo->{_filename} || " "; } } print "----\n$pname**\n$iflag**\n$lversion**\n$lvinstalled**\n$lvstable**\n". ! "$lvunstable**\n$section**\n$lvfilename**\n$description**\n$full\n"; } |
|
From: Ben H. <be...@us...> - 2004-03-17 05:31:42
|
Update of /cvsroot/finkcommander/FinkCommander/FinkCommander.pbproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13163/FinkCommander.pbproj Modified Files: project.pbxproj Log Message: Fix .info file support. Index: project.pbxproj =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkCommander.pbproj/project.pbxproj,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** project.pbxproj 11 Apr 2003 04:56:07 -0000 1.107 --- project.pbxproj 17 Mar 2004 05:22:09 -0000 1.108 *************** *** 4,8 **** classes = { }; ! objectVersion = 38; objects = { 080E96DCFE201CFB7F000001 = { --- 4,8 ---- classes = { }; ! objectVersion = 39; objects = { [...1670 lines suppressed...] }; FBD2DBD803BAA14500A80165 = { *************** *** 2322,2332 **** --- 2659,2673 ---- FBEE855703B4E18400A80164 = { isa = PBXFileReference; + lastKnownFileType = image.tiff; path = flag.tiff; refType = 4; + sourceTree = "<group>"; }; FBEE855803B4E18400A80164 = { isa = PBXFileReference; + lastKnownFileType = image.tiff; path = header_flag.tiff; refType = 4; + sourceTree = "<group>"; }; FBEE855903B4E18400A80164 = { |
Update of /cvsroot/finkcommander/FinkCommander
In directory sc8-pr-cvs1:/tmp/cvs-serv20874
Modified Files:
FinkController.h FinkController.m FinkGlobals.h FinkGlobals.m
FinkPreferences.h FinkPreferences.m
Log Message:
Add regex support to filter. Add support for selfupdate-rsync, and make that the default toolbar item.
Index: FinkController.h
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkController.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** FinkController.h 24 Mar 2003 01:11:00 -0000 1.76
--- FinkController.h 14 Oct 2003 05:03:43 -0000 1.77
***************
*** 77,80 ****
--- 77,81 ----
#import <Cocoa/Cocoa.h>
+ #include <regex.h>
#import "FinkGlobals.h"
Index: FinkController.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkController.m,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** FinkController.m 21 Jun 2003 10:11:24 -0000 1.150
--- FinkController.m 14 Oct 2003 05:03:43 -0000 1.151
***************
*** 740,744 ****
NSString *sig = [installationInfo formattedEmailSig];
FinkPackage *pkg;
! NSMutableArray *pkgNames = [NSMutableArray arrayWithCapacity:5];
if (!packageInfo){
--- 740,744 ----
NSString *sig = [installationInfo formattedEmailSig];
FinkPackage *pkg;
! NSMutableArray *pkgNames = [NSMutableArray arrayWithCapacity:5];
if (!packageInfo){
***************
*** 965,968 ****
--- 965,969 ----
@"FinkRemoveBinaryItem",
@"FinkSelfUpdateItem",
+ @"FinkSelfUpdateRsyncItem",
@"FinkSelfUpdateCVSItem",
@"FinkUpdateallItem",
***************
*** 970,973 ****
--- 971,975 ----
@"FinkDescribeItem",
@"FinkTermInstallItem",
+ @"FinkTermRsyncItem",
@"FinkTermCvsItem",
@"FinkInteractItem",
***************
*** 986,990 ****
@"FinkInstallSourceItem",
@"FinkRemoveSourceItem",
! @"FinkSelfUpdateCVSItem",
NSToolbarSeparatorItemIdentifier,
@"FinkTerminateCommandItem",
--- 988,992 ----
@"FinkInstallSourceItem",
@"FinkRemoveSourceItem",
! @"FinkSelfUpdateRsyncItem",
NSToolbarSeparatorItemIdentifier,
@"FinkTerminateCommandItem",
***************
*** 1014,1017 ****
--- 1016,1020 ----
NSMutableArray *subset = [NSMutableArray array];
NSEnumerator *e = [[packages array] objectEnumerator];
+ regex_t regex;
FinkPackage *pkg;
***************
*** 1019,1023 ****
if ([defaults boolForKey: FinkScrollToSelection]){
[tableView storeSelectedObjectInfo];
! }
if ([filterText length] == 0){
--- 1022,1030 ----
if ([defaults boolForKey: FinkScrollToSelection]){
[tableView storeSelectedObjectInfo];
! }
! if ([defaults boolForKey: FinkAllowRegexFiltering]){
! regcomp(®ex, [filterText cString], REG_EXTENDED);
! // If regex construction fails it is no big deal really, probably in the middle of typing one like "Ben|"
! }
if ([filterText length] == 0){
***************
*** 1027,1030 ****
--- 1034,1041 ----
pkgAttribute = [[pkg valueForKey:field] lowercaseString];
/* If the value matches the filter term, add it to the subset */
+ if([defaults boolForKey: FinkAllowRegexFiltering] &&
+ !regexec(®ex, [pkgAttribute cString], 0, 0, 0)){
+ [subset addObject: pkg];
+ } else
if ([pkgAttribute contains:filterText]){
[subset addObject:pkg];
Index: FinkGlobals.h
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkGlobals.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** FinkGlobals.h 19 Jan 2003 03:44:46 -0000 1.39
--- FinkGlobals.h 14 Oct 2003 05:03:43 -0000 1.40
***************
*** 54,57 ****
--- 54,58 ----
extern NSString *FinkNeverAskForPassword;
extern NSString *FinkAlwaysScrollToBottom;
+ extern NSString *FinkAllowRegexFiltering;
extern NSString *FinkWarnBeforeRemoving;
extern NSString *FinkWarnBeforeTerminating;
Index: FinkGlobals.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkGlobals.m,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FinkGlobals.m 28 Dec 2002 06:06:51 -0000 1.20
--- FinkGlobals.m 14 Oct 2003 05:03:43 -0000 1.21
***************
*** 17,20 ****
--- 17,21 ----
NSString *FinkAlwaysChooseDefaults = @"FinkAlwaysChooseDefaults";
NSString *FinkScrollToSelection = @"FinkScrollToSelection";
+ NSString *FinkAllowRegexFiltering = @"FinkAllowRegexFiltering";
NSString *FinkHTTPProxyVariable = @"FinkHTTPProxyVariable";
NSString *FinkFTPProxyVariable = @"FinkFTPProxyVariable";
Index: FinkPreferences.h
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkPreferences.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** FinkPreferences.h 20 Feb 2003 04:58:59 -0000 1.37
--- FinkPreferences.h 14 Oct 2003 05:03:43 -0000 1.38
***************
*** 71,74 ****
--- 71,75 ----
//widgets used to alter table behavior
IBOutlet NSButton *scrollToSelectionButton;
+ IBOutlet NSButton *allowRegexFilterButton;
//widgets used to alter fink.conf
Index: FinkPreferences.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkPreferences.m,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** FinkPreferences.m 15 Mar 2003 23:39:16 -0000 1.50
--- FinkPreferences.m 14 Oct 2003 05:03:43 -0000 1.51
***************
*** 192,195 ****
--- 192,197 ----
[autoExpandOutputButton setState: [defaults boolForKey: FinkAutoExpandOutput]];
[scrollToSelectionButton setState: [defaults boolForKey: FinkScrollToSelection]];
+ [allowRegexFilterButton setState: [defaults boolForKey: FinkAllowRegexFiltering]];
+
[showRedundantPackagesButton setState: [defaults boolForKey: FinkShowRedundantPackages]];
[self setTitleBarImage: self]; //action method
***************
*** 355,358 ****
--- 357,361 ----
[defaults setBool: [warnBeforeTerminatingButton state] forKey: FinkWarnBeforeTerminating];
[defaults setBool: [giveEmailCreditButton state] forKey: FinkGiveEmailCredit];
+ [defaults setBool: [allowRegexFilterButton state] forKey: FinkAllowRegexFiltering];
if ([checkForUpdateButton state]){
[defaults setInteger:[checkForUpdateIntervalTextField intValue]
|
|
From: <be...@us...> - 2003-10-14 05:04:20
|
Update of /cvsroot/finkcommander/FinkCommander/English.lproj In directory sc8-pr-cvs1:/tmp/cvs-serv20874/English.lproj Modified Files: Toolbar.plist Log Message: Add regex support to filter. Add support for selfupdate-rsync, and make that the default toolbar item. Index: Toolbar.plist =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/English.lproj/Toolbar.plist,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Toolbar.plist 19 Jan 2003 03:44:46 -0000 1.12 --- Toolbar.plist 14 Oct 2003 05:03:45 -0000 1.13 *************** *** 140,143 **** --- 140,156 ---- <string>Update package descriptions from fink cvs repository</string> </dict> + <key>FinkSelfUpdateRsyncItem</key> + <dict> + <key>Action</key> + <string>runNonSpecificCommand</string> + <key>Image</key> + <string>cvs</string> + <key>Label</key> + <string>Selfupdate-rsync</string> + <key>Tag</key> + <integer>0</integer> + <key>ToolTip</key> + <string>Update package descriptions from fink rsync repository</string> + </dict> <key>FinkSelfUpdateItem</key> <dict> *************** *** 152,155 **** --- 165,183 ---- <key>ToolTip</key> <string>Update package descriptions and package manager</string> + </dict> + <key>FinkTermRsyncItem</key> + <dict> + <key>Action</key> + <string>runNonSpecificCommandInTerminal</string> + <key>Image</key> + <string>termcvs</string> + <key>Label</key> + <string>Selfupdate-rsync </string> + <key>PaletteLabel</key> + <string>Selfupdate-rsync in Terminal</string> + <key>Tag</key> + <integer>0</integer> + <key>ToolTip</key> + <string>Run selfupdate-rsync command in Terminal</string> </dict> <key>FinkTermCvsItem</key> |
|
From: <be...@us...> - 2003-10-14 05:04:17
|
Update of /cvsroot/finkcommander/FinkCommander/English.lproj/MainMenu.nib In directory sc8-pr-cvs1:/tmp/cvs-serv20874/English.lproj/MainMenu.nib Modified Files: info.nib keyedobjects.nib objects.nib Log Message: Add regex support to filter. Add support for selfupdate-rsync, and make that the default toolbar item. Index: info.nib =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/English.lproj/MainMenu.nib/info.nib,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** info.nib 15 Mar 2003 23:39:17 -0000 1.80 --- info.nib 14 Oct 2003 05:03:47 -0000 1.81 *************** *** 4,12 **** <dict> <key>IBDocumentLocation</key> ! <string>27 3 401 309 0 0 1024 746 </string> <key>IBEditorPositions</key> <dict> <key>29</key> ! <string>0 702 534 44 0 0 1024 746 </string> <key>553</key> <string>381 462 225 69 0 0 1024 746 </string> --- 4,12 ---- <dict> <key>IBDocumentLocation</key> ! <string>276 265 401 309 0 0 1280 1002 </string> <key>IBEditorPositions</key> <dict> <key>29</key> ! <string>0 958 534 44 0 0 1280 1002 </string> <key>553</key> <string>381 462 225 69 0 0 1024 746 </string> *************** *** 24,32 **** <key>IBOpenObjects</key> <array> - <integer>21</integer> <integer>29</integer> </array> <key>IBSystem Version</key> ! <string>6I32</string> </dict> </plist> --- 24,32 ---- <key>IBOpenObjects</key> <array> <integer>29</integer> + <integer>21</integer> </array> <key>IBSystem Version</key> ! <string>6R73</string> </dict> </plist> Index: keyedobjects.nib =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/English.lproj/MainMenu.nib/keyedobjects.nib,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 Binary files /tmp/cvsDtBDAH and /tmp/cvsO9enIe differ Index: objects.nib =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/English.lproj/MainMenu.nib/objects.nib,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 Binary files /tmp/cvsih4eeO and /tmp/cvsYhY95r differ |
|
From: <be...@us...> - 2003-10-14 05:04:15
|
Update of /cvsroot/finkcommander/FinkCommander/English.lproj/FinkCommander Help/html In directory sc8-pr-cvs1:/tmp/cvs-serv20874/English.lproj/FinkCommander Help/html Modified Files: commands.html Log Message: Add regex support to filter. Add support for selfupdate-rsync, and make that the default toolbar item. |
|
From: <be...@us...> - 2003-10-14 05:04:02
|
Update of /cvsroot/finkcommander/FinkCommander/English.lproj/Preferences.nib
In directory sc8-pr-cvs1:/tmp/cvs-serv20874/English.lproj/Preferences.nib
Modified Files:
classes.nib info.nib objects.nib
Log Message:
Add regex support to filter. Add support for selfupdate-rsync, and make that the default toolbar item.
Index: classes.nib
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/English.lproj/Preferences.nib/classes.nib,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** classes.nib 28 Dec 2002 06:06:52 -0000 1.28
--- classes.nib 14 Oct 2003 05:03:49 -0000 1.29
***************
*** 20,23 ****
--- 20,24 ----
OUTLETS = {
addEnvironmentSettingButton = NSButton;
+ allowRegexFilterButton = NSButton;
alwaysChooseDefaultsButton = NSButton;
autoExpandOutputButton = NSButton;
Index: info.nib
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/English.lproj/Preferences.nib/info.nib,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** info.nib 20 Feb 2003 04:58:59 -0000 1.36
--- info.nib 14 Oct 2003 05:03:49 -0000 1.37
***************
*** 4,8 ****
<dict>
<key>IBDocumentLocation</key>
! <string>16 3 387 240 0 0 1024 746 </string>
<key>IBFramework Version</key>
<string>291.0</string>
--- 4,8 ----
<dict>
<key>IBDocumentLocation</key>
! <string>149 105 387 240 0 0 1280 1002 </string>
<key>IBFramework Version</key>
<string>291.0</string>
***************
*** 88,98 ****
<string>525</string>
</array>
- <key>126</key>
- <array>
- <string>448</string>
- <string>447</string>
- <string>551</string>
- <string>557</string>
- </array>
<key>127</key>
<array>
--- 88,91 ----
***************
*** 137,140 ****
--- 130,148 ----
<string>326</string>
</array>
+ <key>136</key>
+ <array>
+ <string>587</string>
+ <string>586</string>
+ <string>588</string>
+ <string>585</string>
+ </array>
+ <key>137</key>
+ <array>
+ <string>591</string>
+ <string>551</string>
+ <string>557</string>
+ <string>447</string>
+ <string>448</string>
+ </array>
<key>29</key>
<array>
***************
*** 200,204 ****
</dict>
<key>IBLastGroupID</key>
! <string>136</string>
<key>IBOpenObjects</key>
<array>
--- 208,212 ----
</dict>
<key>IBLastGroupID</key>
! <string>138</string>
<key>IBOpenObjects</key>
<array>
***************
*** 206,210 ****
</array>
<key>IBSystem Version</key>
! <string>6I32</string>
</dict>
</plist>
--- 214,218 ----
</array>
<key>IBSystem Version</key>
! <string>6R73</string>
</dict>
</plist>
Index: objects.nib
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/English.lproj/Preferences.nib/objects.nib,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
Binary files /tmp/cvsOWWfA7 and /tmp/cvsO4WdQ4 differ
|
|
From: <be...@us...> - 2003-10-14 05:03:56
|
Update of /cvsroot/finkcommander/FinkCommander/German.lproj/FinkCommander Help/html In directory sc8-pr-cvs1:/tmp/cvs-serv20874/German.lproj/FinkCommander Help/html Modified Files: commands.html Log Message: Add regex support to filter. Add support for selfupdate-rsync, and make that the default toolbar item. |
|
From: <sbu...@us...> - 2003-06-21 10:11:30
|
Update of /cvsroot/finkcommander/FinkCommander
In directory sc8-pr-cvs1:/tmp/cvs-serv18639
Modified Files:
Debugging.h FinkController.m FinkOutputParser.h
FinkOutputParser.m TODO.txt
Log Message:
No idea; really old
Index: Debugging.h
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/Debugging.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Debugging.h 11 Apr 2003 04:56:07 -0000 1.10
--- Debugging.h 21 Jun 2003 10:11:24 -0000 1.11
***************
*** 4,6 ****
//Comment out to disable debugging code:
! //#define DEBUGGING
--- 4,6 ----
//Comment out to disable debugging code:
! #define DEBUGGING
Index: FinkController.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkController.m,v
retrieving revision 1.149
retrieving revision 1.150
diff -C2 -d -r1.149 -r1.150
*** FinkController.m 24 Mar 2003 01:11:00 -0000 1.149
--- FinkController.m 21 Jun 2003 10:11:24 -0000 1.150
***************
*** 593,598 ****
@"%d%b%Y" timeZone: nil locale: nil]];
}
-
-
[panel setRequiredFileType: @"txt"];
[panel beginSheetForDirectory:savePath
--- 593,596 ----
***************
*** 1534,1538 ****
commandTerminated = YES;
break;
! case RESOURCE_DIR:
output = NSLocalizedString(@"\nSelf-repair succeeded, but FinkCommander was unable to change the permissions of the FinkCommander.app/Contents/Resources directory.\nPlease see the README.html file, available at http://finkcommander.sourceforge.net, for instructions on changing the permissions manually.\n", @"Error message that may be displayed in output view");
break;
--- 1532,1536 ----
commandTerminated = YES;
break;
! case RESOURCE_DIR_ERROR:
output = NSLocalizedString(@"\nSelf-repair succeeded, but FinkCommander was unable to change the permissions of the FinkCommander.app/Contents/Resources directory.\nPlease see the README.html file, available at http://finkcommander.sourceforge.net, for instructions on changing the permissions manually.\n", @"Error message that may be displayed in output view");
break;
Index: FinkOutputParser.h
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkOutputParser.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** FinkOutputParser.h 21 Apr 2003 01:27:39 -0000 1.31
--- FinkOutputParser.h 21 Jun 2003 10:11:24 -0000 1.32
***************
*** 55,71 ****
ACTIVATE,
//Used only as signals
! PGID,
START_INSTALL,
PASSWORD_PROMPT,
PROMPT,
! MANDATORY_PROMPT,
! PROMPT_AND_START,
! START_AND_FETCH,
! START_AND_UNPACK,
! START_AND_ACTIVATE,
! RUNNING_SELF_REPAIR,
! SELF_REPAIR_COMPLETE,
! RESOURCE_DIR,
! SELF_REPAIR_FAILED
};
--- 55,71 ----
ACTIVATE,
//Used only as signals
! PGID,
START_INSTALL,
PASSWORD_PROMPT,
PROMPT,
! MANDATORY_PROMPT,
! PROMPT_AND_START,
! START_AND_FETCH,
! START_AND_UNPACK,
! START_AND_ACTIVATE,
! RUNNING_SELF_REPAIR,
! SELF_REPAIR_COMPLETE,
! RESOURCE_DIR_ERROR,
! SELF_REPAIR_FAILED
};
***************
*** 75,94 ****
NSUserDefaults *defaults;
! NSMutableDictionary *ptracker;
NSMutableArray *packageList;
! NSMutableArray *increments;
! NSString *command;
NSString *currentPackage;
! regex_t configure;
! regex_t prompt;
! regex_t manPrompt;
float increment;
int currentPhase;
! int pgid;
! BOOL installing;
BOOL readingPackageList;
! BOOL selfRepair;
}
--- 75,94 ----
NSUserDefaults *defaults;
! NSMutableDictionary *ptracker;
NSMutableArray *packageList;
! NSMutableArray *increments;
! NSString *command;
NSString *currentPackage;
! regex_t configure;
! regex_t prompt;
! regex_t manPrompt;
float increment;
int currentPhase;
! int pgid;
! BOOL installing;
BOOL readingPackageList;
! BOOL selfRepair;
}
Index: FinkOutputParser.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkOutputParser.m,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** FinkOutputParser.m 21 Apr 2003 01:27:39 -0000 1.29
--- FinkOutputParser.m 21 Jun 2003 10:11:24 -0000 1.30
***************
*** 1,8 ****
/*
! File: FinkOutputParser.m
See the header file, FinkOutputParser.h, for interface and license information.
! */
#import "FinkOutputParser.h"
--- 1,8 ----
/*
! File: FinkOutputParser.m
See the header file, FinkOutputParser.h, for interface and license information.
! */
#import "FinkOutputParser.h"
***************
*** 13,51 ****
#define IS_INSTALL_CMD(x) \
! ([(x) contains:@"install"] || \
! [(x) contains:@"build"] || \
! [(x) contains:@"update-all"] || \
! [(x) contains:@"selfupdate"])
!
//Line parsing macros
#define INSTALLTRIGGER(x) \
! ([(x) containsPattern:@"*following *package* will be *installed*"] || \
! [(x) contains:@"will be rebuilt"])
#define FETCHTRIGGER(x) \
! [(x) containsExpression:@"^(wget|curl|axel) -"]
#define UNPACKTRIGGER(x) \
! (([(x) containsPattern:@"mkdir -p */src/*"] && \
! ![(x) contains:@"root"]) || \
! [(x) containsExpression:@"/bin/(tar|bzip2) -.*"])
!
#define COMPILETRIGGER(x) \
! (([(x) hasPrefix: @"make"] && \
! ![(x) contains:@"makefile"]) || \
! [(x) containsExpression:@"^(g?[c+7]{2} (-[^E]| ))|Compiling |pbxbuild "])
!
#define CONFIG_PAT \
@"^(\\./configure|checking for|patching file) "
!
#define PROMPT_PAT \
! [NSString stringWithFormat: \
! @"proceed\\? \\[.*\\]|your choice:|Pick one|\\[[YyNn/]+\\]|[anonymous]|[root]|[%@]", \
! NSUserName()]
! //fink's --yes option does not work for these prompts:
! #define MANPROMPT_PAT \
! @"(CVS|cvs).*password|\\[default=N\\]|either license\\?|(key|return) to continue"
@implementation FinkOutputParser
--- 13,53 ----
#define IS_INSTALL_CMD(x) \
! ([(x) contains:@"install"] || \
! [(x) contains:@"build"] || \
! [(x) contains:@"update-all"] || \
! [(x) contains:@"selfupdate"])
!
//Line parsing macros
#define INSTALLTRIGGER(x) \
! ([(x) containsPattern:@"*following *package* will be *installed*"] || \
! [(x) contains:@"will be rebuilt"])
#define FETCHTRIGGER(x) \
! [(x) containsExpression:@"^(wget|curl|axel) -"]
#define UNPACKTRIGGER(x) \
! (([(x) containsPattern:@"mkdir -p */src/*"] && \
! ![(x) contains:@"root"]) || \
! [(x) containsExpression:@"/bin/(tar|bzip2) -.*"])
!
#define COMPILETRIGGER(x) \
! (([(x) hasPrefix: @"make"] && \
! ![(x) contains:@"makefile"]) || \
! [(x) containsExpression:@"^(g?[c+7]{2} (-[^E]| ))|Compiling |pbxbuild "])
!
#define CONFIG_PAT \
@"^(\\./configure|checking for|patching file) "
!
#define PROMPT_PAT \
! [NSString stringWithFormat: \
! @"proceed\\? \\[.*\\]|your choice:|Pick one|\\[[YyNn/]+\\]|\\[anonymous\\]|\\[root\\]|\\[%@\\]", \
! NSUserName()]
! //fink's --yes option does not work for these prompts:
! #define MANPROMPT_PAT \
! @"(CVS|cvs).*password|\\[default=N\\]|either license\\?|(key|[Rr]eturn) to continue"
!
! #define AFTER_EQUAL_SIGN 5
@implementation FinkOutputParser
***************
*** 61,65 ****
-(void)setCurrentPackage:(NSString *)p
{
! [p retain];
[currentPackage release];
currentPackage = p;
--- 63,67 ----
-(void)setCurrentPackage:(NSString *)p
{
! [p retain];
[currentPackage release];
currentPackage = p;
***************
*** 72,98 ****
{
if (self = [super init]){
! int aPrompt, mPrompt, config; //test regex compilation success
!
! defaults = [NSUserDefaults standardUserDefaults];
! command = [cmd retain];
! readingPackageList = NO;
! selfRepair = NO;
! installing = IS_INSTALL_CMD(command) && [exe contains:@"fink"];
! pgid = 0;
!
! /* Precompile regular expressions used to parse each line of output */
! config = compiledExpressionFromString(CONFIG_PAT, &configure);
! aPrompt = compiledExpressionFromString(PROMPT_PAT, &prompt);
! mPrompt = compiledExpressionFromString(MANPROMPT_PAT, &manPrompt);
! if (mPrompt != 0 || aPrompt != 0){
! NSLog(@"Compiling regex failed.");
! }
!
! if (installing){
! packageList = [[NSMutableArray alloc] init];
! [packageList addObject:@""];
! increments = [[NSMutableArray alloc] init];
! [self setCurrentPackage:@""];
! }
}
return self;
--- 74,100 ----
{
if (self = [super init]){
! int aPrompt, mPrompt, config; //test regex compilation success
!
! defaults = [NSUserDefaults standardUserDefaults];
! command = [cmd retain];
! readingPackageList = NO;
! selfRepair = NO;
! installing = IS_INSTALL_CMD(command) && [exe contains:@"fink"];
! pgid = 0;
!
! /* Precompile regular expressions used to parse each line of output */
! config = compiledExpressionFromString(CONFIG_PAT, &configure);
! aPrompt = compiledExpressionFromString(PROMPT_PAT, &prompt);
! mPrompt = compiledExpressionFromString(MANPROMPT_PAT, &manPrompt);
! if (mPrompt != 0 || aPrompt != 0){
! NSLog(@"Compiling regex failed.");
! }
!
! if (installing){
! packageList = [[NSMutableArray alloc] init];
! [packageList addObject:@""];
! increments = [[NSMutableArray alloc] init];
! [self setCurrentPackage:@""];
! }
}
return self;
***************
*** 101,115 ****
-(void)dealloc
{
! [ptracker release];
! [packageList release];
! [increments release];
! [command release];
! [currentPackage release];
!
! regfree(&configure);
! regfree(&prompt);
! regfree(&manPrompt);
!
! [super dealloc];
}
--- 103,117 ----
-(void)dealloc
{
! [ptracker release];
! [packageList release];
! [increments release];
! [command release];
! [currentPackage release];
!
! regfree(&configure);
! regfree(&prompt);
! regfree(&manPrompt);
!
! [super dealloc];
}
***************
*** 120,124 ****
{
[packageList addObjectsFromArray:[[line strip] componentsSeparatedByString:@" "]];
! Dprintf(@"Package list: %@", packageList);
}
--- 122,126 ----
{
[packageList addObjectsFromArray:[[line strip] componentsSeparatedByString:@" "]];
! Dprintf(@"Package list: %@", packageList);
}
***************
*** 130,163 ****
NSString *pname;
float cumulative[] = {
! 0.00, //NONE
! 0.20, //FETCH + .20
! 0.25, //UNPACK + .05
! 0.40, //CONFIGURE + .15
! 0.90, //COMPILE + .50
! 0.95, //BUILD + .05
! 1.00}; //ACTIVATE + .05
float perpkg = (100.0 - STARTING_INCREMENT) / (float)([packageList count]-1);
int i;
! if (!packageList){
! NSLog(@"Warning: Empty package list; unable to track installation state");
! return NO;
! }
!
! e = [packageList objectEnumerator];
if (! ptracker) ptracker = [[NSMutableDictionary alloc] init];
while (nil != (pname = [e nextObject])){
! [ptracker setObject:[NSNumber numberWithFloat:0.0] forKey:pname];
}
!
for (i = 0; i < 7; i++){
! float newincrement = cumulative[i] * perpkg;
! [increments insertObject: [NSNumber numberWithFloat: newincrement]
! atIndex:i];
! Dprintf(@"increment %d = %f", i, [[increments objectAtIndex:i] floatValue]);
}
currentPhase = NONE;
! return YES;
}
--- 132,165 ----
NSString *pname;
float cumulative[] = {
! 0.00, //NONE
! 0.20, //FETCH + .20
! 0.25, //UNPACK + .05
! 0.40, //CONFIGURE + .15
! 0.90, //COMPILE + .50
! 0.95, //BUILD + .05
! 1.00}; //ACTIVATE + .05
float perpkg = (100.0 - STARTING_INCREMENT) / (float)([packageList count]-1);
int i;
! if (!packageList){
! NSLog(@"Warning: Empty package list; unable to track installation state");
! return NO;
! }
!
! e = [packageList objectEnumerator];
if (! ptracker) ptracker = [[NSMutableDictionary alloc] init];
while (nil != (pname = [e nextObject])){
! [ptracker setObject:[NSNumber numberWithFloat:0.0] forKey:pname];
}
!
for (i = 0; i < 7; i++){
! float newincrement = cumulative[i] * perpkg;
! [increments insertObject: [NSNumber numberWithFloat: newincrement]
! atIndex:i];
! Dprintf(@"increment %d = %f", i, [[increments objectAtIndex:i] floatValue]);
}
currentPhase = NONE;
! return YES;
}
***************
*** 170,200 ****
{
float phaseTotal;
! float pkgTotal;
!
! if (!currentPackage || !packageList || [packageList count] < 1 || !ptracker){
! Dprintf(@"Data objects for installation tracking were not created");
! increment = 0;
! return;
! }
!
! phaseTotal = [[increments objectAtIndex:currentPhase] floatValue];
! if ([currentPackage isEqualToString:@"package"]){
! increment = 0;
! return;
! }else{
! pkgTotal = [[ptracker objectForKey:currentPackage] floatValue];
! }
!
! Dprintf(@"Incrementing for prior phase = %d, package = %@", currentPhase, currentPackage);
! if (phaseTotal > pkgTotal){
! increment = phaseTotal - pkgTotal;
! [ptracker setObject:[NSNumber numberWithFloat:phaseTotal] forKey:currentPackage];
! Dprintf(@"Adding increment: %f - %f = %f", phaseTotal, pkgTotal, increment);
! }else{
! increment = 0;
! Dprintf(@"Old total increment %f >= new total %f; setting increment to 0",
! pkgTotal, phaseTotal);
! }
}
--- 172,202 ----
{
float phaseTotal;
! float pkgTotal;
! if (!currentPackage || !packageList || [packageList count] < 1 || !ptracker){
! NSLog(@"Data objects for installation tracking were not created");
! increment = 0;
! return;
! }
!
! phaseTotal = [[increments objectAtIndex:currentPhase] floatValue];
! if ([currentPackage isEqualToString:@"package"]){
! increment = 0;
! return;
! }else{
! pkgTotal = [[ptracker objectForKey:currentPackage] floatValue];
! }
!
! Dprintf(@"Incrementing for prior phase = %d, package = %@", currentPhase, currentPackage);
! if (phaseTotal > pkgTotal){
! increment = phaseTotal - pkgTotal;
! [ptracker setObject:[NSNumber numberWithFloat:phaseTotal] forKey:currentPackage];
! Dprintf(@"Adding increment: %f - %f = %f", phaseTotal, pkgTotal, increment);
! }else{
! increment = 0;
! Dprintf(@"Old total increment %f >= new total %f; setting increment to 0",
! pkgTotal, phaseTotal);
!
! }
}
***************
*** 205,269 ****
NSString *candidate;
NSString *best = @"";
!
! if (!packageList){
! NSLog(@"Warning: No package list created; unable to determine current package");
! return best;
! }
! e = [packageList objectEnumerator];
! //first see if the line contains any of the names in the package list;
! //if so, return the longest name that matches
while (nil != (candidate = [e nextObject])){
! if ([line containsCI:candidate]){
! if ([candidate length] > [best length]){
! best = candidate;
! }
! }
}
- //sometimes the actual file name doesn't include the fink package name,
- //e.g. <pkg>-ssl is built from <pkg>-<version>.tgz;
- //so parse the line for the file name and look for it in the package name
- if ([best length] < 1 && [line contains:@"-"]){
- NSString *path = [[[[line strip] componentsSeparatedByString:@" "] lastObject] lastPathComponent];
- NSString *chars;
- NSMutableString *fname = [NSMutableString stringWithString:@""];
- NSScanner *lineScanner;
- NSCharacterSet *nums = [NSCharacterSet decimalDigitCharacterSet];
- BOOL foundDash;
-
- Dprintf(@"Failed to find listed package in line:%@", line);
- Dprintf(@"Found full file name+version %@ in line", path);
- lineScanner = [NSScanner scannerWithString:path];
- while (! [lineScanner isAtEnd]){
- foundDash = [lineScanner scanUpToString:@"-" intoString:&chars];
- if (! foundDash){
- Dprintf(@"Stopped scanning");
- break;
- }
- [fname appendString:chars];
- [lineScanner scanString:@"-" intoString:nil];
- if ([lineScanner scanCharactersFromSet:nums intoString:nil]){
- break;
- }
- [fname appendString:@"-"];
- }
- Dprintf(@"Looking for best match for %@ in:\n%@", fname,
- [packageList componentsJoinedByString:@" "]);
- if ([fname length] > 0){
- NSEnumerator *e = [packageList objectEnumerator];
- while (nil != (candidate = [e nextObject])){
- if ([candidate contains:fname]){ //e.g. wget-ssl contains wget
- Dprintf(@"Listed package %@ contains %@", candidate, fname);
- if ([best length] < 1){
- best = candidate;
- }else if ([candidate length] < [best length]){
- best = candidate;
- }
- }
- }
- }
- }
- if ([best length] < 1){
- best = @"package";
- }
return best;
}
--- 207,271 ----
NSString *candidate;
NSString *best = @"";
!
! if (!packageList){
! NSLog(@"Warning: No package list created; unable to determine current package");
! return best;
! }
! e = [packageList objectEnumerator];
! //first see if the line contains any of the names in the package list;
! //if so, return the longest name that matches
while (nil != (candidate = [e nextObject])){
! if ([line containsCI:candidate]){
! if ([candidate length] > [best length]){
! best = candidate;
! }
! }
! }
! //sometimes the actual file name doesn't include the fink package name,
! //e.g. <pkg>-ssl is built from <pkg>-<version>.tgz;
! //so parse the line for the file name and look for it in the package list
! if ([best length] < 1 && [line contains:@"-"]){
! NSString *path = [[[[line strip] componentsSeparatedByString:@" "] lastObject] lastPathComponent];
! NSString *chars;
! NSMutableString *fname = [NSMutableString stringWithString:@""];
! NSScanner *lineScanner;
! NSCharacterSet *nums = [NSCharacterSet decimalDigitCharacterSet];
! BOOL foundDash;
!
! Dprintf(@"Failed to find listed package in line:%@", line);
! Dprintf(@"Found full file name+version %@ in line", path);
! lineScanner = [NSScanner scannerWithString:path];
! while (! [lineScanner isAtEnd]){
! foundDash = [lineScanner scanUpToString:@"-" intoString:&chars];
! if (! foundDash){
! Dprintf(@"Stopped scanning");
! break;
! }
! [fname appendString:chars];
! [lineScanner scanString:@"-" intoString:nil];
! if ([lineScanner scanCharactersFromSet:nums intoString:nil]){
! break;
! }
! [fname appendString:@"-"];
! }
! Dprintf(@"Looking for best match for %@ in:\n%@", fname,
! [packageList componentsJoinedByString:@" "]);
! if ([fname length] > 0){
! e = [packageList objectEnumerator];
! while (nil != (candidate = [e nextObject])){
! if ([candidate contains:fname]){ //e.g. wget-ssl contains wget
! Dprintf(@"Listed package %@ contains %@", candidate, fname);
! if ([best length] < 1){
! best = candidate;
! }else if ([candidate length] < [best length]){
! best = candidate;
! }
! }
! }
! }
! }
! if ([best length] < 1){
! best = @"package";
}
return best;
}
***************
*** 273,418 ****
-(int)parseLineOfOutput:(NSString *)line
! {
! NSString *sline = [line strip];
! //Read process group id for Launcher
! if (!pgid && [line contains:@"PGID="]){
! pgid = [[line substringFromIndex:5] intValue];
! return PGID;
! }
! //Look for package lists
! if (installing && readingPackageList){
! //lines listing pkgs to be installed start with a space
! if ([line hasPrefix:@" "]){
! [self addPackagesFromLine:line];
! return NONE;
! }
! //skip blanks and intro for additional packages
! //continue to scan for package names
! if ([line length] < 1 ||
! [line contains: @"will be installed"]){
return NONE;
}
! //not blank, list or intro; done looking for package names
! readingPackageList = NO;
! //if we were unable to create a package list,
! //turn off installation state signals
! installing = [self setupInstall];
! //look for prompt or installation event immediately after pkg list
! if ([line containsCompiledExpression:&prompt]){
! if (installing){
! return PROMPT_AND_START;
! }
! return PROMPT;
! }
! if (installing && FETCHTRIGGER(sline)){
Dprintf(@"Fetch phase triggered by:\n%@", line);
[self setIncrementForLastPhase];
! [self setCurrentPackage:[self packageNameFromLine:line]];
currentPhase = FETCH;
! return START_AND_FETCH;
}
! if (installing && UNPACKTRIGGER(sline)){
Dprintf(@"Unpack phase triggered by:\n%@", line);
[self setIncrementForLastPhase];
[self setCurrentPackage:[self packageNameFromLine:line]];
currentPhase = UNPACK;
! return START_AND_UNPACK;
}
! if (installing && [line contains: @"dpkg -i"]){
Dprintf(@"Activate phase triggered by:\n%@", line);
[self setIncrementForLastPhase];
[self setCurrentPackage:[self packageNameFromLine:line]];
currentPhase = ACTIVATE;
! return START_AND_ACTIVATE;
}
! //signal FinkController to start deteriminate PI
! return START_INSTALL;
! }
! //Look for introduction to package lists
! if (installing && INSTALLTRIGGER(line)){
! Dprintf(@"Package scan triggered by:\n%@", line);
! readingPackageList = YES;
! return NONE;
! }
! //Look for installation events
! if (installing && FETCHTRIGGER(sline)){
! NSString *name = [self packageNameFromLine:line];
! Dprintf(@"Fetch phase triggered by:\n%@", line);
! //no action required if retrying failed download
! if ([name isEqualToString:currentPackage]) return NONE;
! [self setIncrementForLastPhase];
! [self setCurrentPackage:name];
! currentPhase = FETCH;
! return FETCH;
! }
! if (installing && (currentPhase != UNPACK) && UNPACKTRIGGER(sline)){
! Dprintf(@"Unpack phase triggered by:\n%@", line);
! [self setIncrementForLastPhase];
! [self setCurrentPackage:[self packageNameFromLine:line]];
! currentPhase = UNPACK;
! return UNPACK;
! }
! if (installing && (currentPhase == UNPACK) &&
! [sline containsCompiledExpression:&configure]){
! Dprintf(@"Configure phase triggered by:\n%@", line);
! [self setIncrementForLastPhase];
! currentPhase = CONFIGURE;
! return CONFIGURE;
! }
! if (installing && (currentPhase != COMPILE) && COMPILETRIGGER(sline)){
! Dprintf(@"Compile phase triggered by:\n%@", line);
! [self setIncrementForLastPhase];
! currentPhase = COMPILE;
! return COMPILE;
! }
! if (installing && [line contains: @"dpkg-deb -b"]){
! Dprintf(@"Build phase triggered by:\n%@", line);
! //make sure we catch up if this file is archived
! if (currentPhase < 1) currentPhase = COMPILE;
! [self setIncrementForLastPhase];
! [self setCurrentPackage:[self packageNameFromLine:line]];
! currentPhase = BUILD;
! return BUILD;
! }
! if (installing && [line contains: @"dpkg -i"]){
! Dprintf(@"Activate phase triggered by:\n%@", line);
! if (currentPhase < 1) currentPhase = COMPILE;
! [self setIncrementForLastPhase];
! [self setCurrentPackage:[self packageNameFromLine:line]];
! currentPhase = ACTIVATE;
! return ACTIVATE;
! }
! //Look for password events
! if ([line contains: @"Password:"]){
! return PASSWORD_PROMPT;
}
! //Look for prompts
! if ([line containsCompiledExpression:&manPrompt]){
! return MANDATORY_PROMPT;
}
! if ([line containsCompiledExpression:&prompt] &&
! ! [defaults boolForKey:FinkAlwaysChooseDefaults]){
! Dprintf(@"Found prompt: %@", line);
! return PROMPT;
}
! //Look for self-repair of tool
if ([line contains:@"Running self-repair"]){
selfRepair = YES;
return RUNNING_SELF_REPAIR;
}
! if (selfRepair && [line contains:@"Self-repair succeeded"]){
! selfRepair = NO;
! return SELF_REPAIR_COMPLETE;
! }
! if (selfRepair && [line contains:@"Unable to modify Resource directory\n"]){
! selfRepair = NO;
! return RESOURCE_DIR;
! }
! if ([line contains:@"Self-repair failed\n"]){
! selfRepair = NO;
! return SELF_REPAIR_FAILED;
}
! return NONE;
}
--- 275,425 ----
-(int)parseLineOfOutput:(NSString *)line
! {
! NSString *sline = [line strip];
! //Read process group id for Launcher
! if (!pgid && [line contains:@"PGID="]){
! pgid = [[line substringFromIndex:AFTER_EQUAL_SIGN] intValue];
! return PGID;
! }
! //Look for package lists
! if (installing && readingPackageList){
! //lines listing pkgs to be installed start with a space
! if ([line hasPrefix:@" "]){
! [self addPackagesFromLine:line];
! return NONE;
! }
! //skip blanks and intro for additional packages
! //continue to scan for package names
! if ([line length] < 1 ||
! [line contains: @"will be installed"]){
! return NONE;
! }
! //not blank, list or intro; done looking for package names
! readingPackageList = NO;
! //If we were unable to create a package list, setupInstall returns NO, so that
! //we skip any blocks conditioned on the installing flag
! installing = [self setupInstall];
! //look for prompt or installation event immediately after pkg list
! if ([line containsCompiledExpression:&prompt]){
! if (installing){
! return PROMPT_AND_START;
! }
! return PROMPT;
! }
! if (FETCHTRIGGER(sline)){
! Dprintf(@"Fetch phase triggered by:\n%@", line);
! [self setIncrementForLastPhase];
! [self setCurrentPackage:[self packageNameFromLine:line]];
! currentPhase = FETCH;
! return START_AND_FETCH;
! }
! if (UNPACKTRIGGER(sline)){
! Dprintf(@"Unpack phase triggered by:\n%@", line);
! [self setIncrementForLastPhase];
! [self setCurrentPackage:[self packageNameFromLine:line]];
! currentPhase = UNPACK;
! return START_AND_UNPACK;
! }
! if ([line contains: @"dpkg -i"]){
! Dprintf(@"Activate phase triggered by:\n%@", line);
! [self setIncrementForLastPhase];
! [self setCurrentPackage:[self packageNameFromLine:line]];
! currentPhase = ACTIVATE;
! return START_AND_ACTIVATE;
! }
! //signal FinkController to start deteriminate PI
! return START_INSTALL;
! }
! if (installing){
! //Look for introduction to package lists
! if (INSTALLTRIGGER(line)){
! Dprintf(@"Package scan triggered by:\n%@", line);
! readingPackageList = YES;
return NONE;
}
! //Look for installation events
! if (FETCHTRIGGER(sline)){
! NSString *name = [self packageNameFromLine:line];
Dprintf(@"Fetch phase triggered by:\n%@", line);
+ //no action required if retrying failed download
+ if ([name isEqualToString:currentPackage]) return NONE;
[self setIncrementForLastPhase];
! [self setCurrentPackage:name];
currentPhase = FETCH;
! return FETCH;
}
! if (currentPhase != UNPACK && UNPACKTRIGGER(sline)){
Dprintf(@"Unpack phase triggered by:\n%@", line);
[self setIncrementForLastPhase];
[self setCurrentPackage:[self packageNameFromLine:line]];
currentPhase = UNPACK;
! return UNPACK;
}
! if (currentPhase == UNPACK && [sline containsCompiledExpression:&configure]){
! Dprintf(@"Configure phase triggered by:\n%@", line);
! [self setIncrementForLastPhase];
! currentPhase = CONFIGURE;
! return CONFIGURE;
! }
! if (currentPhase != COMPILE && COMPILETRIGGER(sline)){
! Dprintf(@"Compile phase triggered by:\n%@", line);
! [self setIncrementForLastPhase];
! currentPhase = COMPILE;
! return COMPILE;
! }
! if ([line contains: @"dpkg-deb -b"]){
! Dprintf(@"Build phase triggered by:\n%@", line);
! //make sure we catch up if this file is archived
! if (currentPhase < 1) currentPhase = COMPILE;
! [self setIncrementForLastPhase];
! [self setCurrentPackage:[self packageNameFromLine:line]];
! currentPhase = BUILD;
! return BUILD;
! }
! if ([line contains: @"dpkg -i"]){
Dprintf(@"Activate phase triggered by:\n%@", line);
+ if (currentPhase < 1) currentPhase = COMPILE;
[self setIncrementForLastPhase];
[self setCurrentPackage:[self packageNameFromLine:line]];
currentPhase = ACTIVATE;
! return ACTIVATE;
}
! }
!
! //Look for prompts
! if ([line contains: @"Password:"]){
! return PASSWORD_PROMPT;
}
! if ([line containsCompiledExpression:&manPrompt]){
! return MANDATORY_PROMPT;
}
! if ([line containsCompiledExpression:&prompt] &&
! ! [defaults boolForKey:FinkAlwaysChooseDefaults]){
! Dprintf(@"Found prompt: %@", line);
! return PROMPT;
}
!
! //Look for self-repair messages
! //NB: Find a way to avoid looking for this in every line
if ([line contains:@"Running self-repair"]){
selfRepair = YES;
return RUNNING_SELF_REPAIR;
}
! if (selfRepair){
! if ([line contains:@"Self-repair succeeded"]){
! selfRepair = NO;
! return SELF_REPAIR_COMPLETE;
! }
! if ([line contains:@"Unable to modify Resource directory\n"]){
! selfRepair = NO;
! return RESOURCE_DIR_ERROR;
! }
! if ([line contains:@"Self-repair failed\n"]){
! selfRepair = NO;
! return SELF_REPAIR_FAILED;
! }
}
! return NONE;
}
***************
*** 422,431 ****
NSString *line;
int signal = NONE; //false when used as boolean value
-
- e = [[output componentsSeparatedByString: @"\n"] objectEnumerator];
! while (nil != (line = [e nextObject])){
! signal = [self parseLineOfOutput:line];
! if (signal) return signal;
}
return signal;
--- 429,438 ----
NSString *line;
int signal = NONE; //false when used as boolean value
! e = [[output componentsSeparatedByString: @"\n"] objectEnumerator];
!
! while (nil != (line = [e nextObject])){
! signal = [self parseLineOfOutput:line];
! if (signal) return signal;
}
return signal;
Index: TODO.txt
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/TODO.txt,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** TODO.txt 11 Apr 2003 04:56:07 -0000 1.50
--- TODO.txt 21 Jun 2003 10:11:24 -0000 1.51
***************
*** 1,3 ****
! VERSION 0.5.2:
Fix Environment table disappearing items bug
--- 1,11 ----
! VERSION 0.6.0:
!
! Search output
!
! i Regex support in filter and output search (wrote wrapper as NSString category)
!
! Custom command dialog
!
! Command queue
Fix Environment table disappearing items bug
***************
*** 22,41 ****
SHORT TERM:
- Custom command dialog
-
Warning dialog for first run of command in Terminal
Command to show man page for packages
- Command queue
-
Catch and highlight cvs errors during selfupdate-cvs
Show info panel for fink installation; mirror information in email
sig; Application->About Your Fink Installation... ?
-
- Search output
-
- i Regex support in filter and output search (wrote wrapper as NSString category)
Additional fink installation info:
--- 30,41 ----
|
|
From: <sbu...@us...> - 2003-04-21 01:27:45
|
Update of /cvsroot/finkcommander/FinkCommander
In directory sc8-pr-cvs1:/tmp/cvs-serv26076
Modified Files:
FinkOutputParser.h FinkOutputParser.m SBString.m
Log Message:
Using precompiled regexes in output parser
Index: FinkOutputParser.h
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkOutputParser.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** FinkOutputParser.h 19 Jan 2003 03:44:46 -0000 1.30
--- FinkOutputParser.h 21 Apr 2003 01:27:39 -0000 1.31
***************
*** 81,84 ****
--- 81,88 ----
NSString *currentPackage;
+ regex_t configure;
+ regex_t prompt;
+ regex_t manPrompt;
+
float increment;
int currentPhase;
***************
*** 86,90 ****
BOOL installing;
BOOL readingPackageList;
! BOOL self_repair;
}
--- 90,94 ----
BOOL installing;
BOOL readingPackageList;
! BOOL selfRepair;
}
Index: FinkOutputParser.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkOutputParser.m,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** FinkOutputParser.m 30 Mar 2003 03:40:53 -0000 1.28
--- FinkOutputParser.m 21 Apr 2003 01:27:39 -0000 1.29
***************
*** 31,37 ****
![(x) contains:@"root"]) || \
[(x) containsExpression:@"/bin/(tar|bzip2) -.*"])
-
- #define CONFIGURETRIGGER(x) \
- [(x) containsExpression:@"^(\./configure|checking for|patching file) "]
#define COMPILETRIGGER(x) \
--- 31,34 ----
***************
*** 39,60 ****
![(x) contains:@"makefile"]) || \
[(x) containsExpression:@"^(g?[c+7]{2} (-[^E]| ))|Compiling |pbxbuild "])
!
! #define ISPROMPT(x) \
! ([(x) containsPattern: @"*proceed? \[*"] || \
! [(x) contains: @"Make your choice:"] || \
! [(x) contains: @"Pick one:"] || \
! [(x) containsCI: @"[y/n]"] || \
! [(x) contains: @"[anonymous]"] || \
! [(x) contains: @"[root]"] || \
! [(x) contains: [NSString stringWithFormat: @"[%@]", NSUserName()]])
//fink's --yes option does not work for these prompts:
! #define ISMANDATORY_PROMPT(x) \
! ([(x) contains:@"cvs.sourceforge.net's password:"] || \
! [(x) contains:@"CVS password:"] || \
! [(x) contains:@"[default=N]?"] || \
! [(x) contains:@"either license?"] || \
! [(x) containsExpression:@"(key|return) to continue\.?$"])
!
@implementation FinkOutputParser
--- 36,51 ----
![(x) contains:@"makefile"]) || \
[(x) containsExpression:@"^(g?[c+7]{2} (-[^E]| ))|Compiling |pbxbuild "])
!
! #define CONFIG_PAT \
! @"^(\\./configure|checking for|patching file) "
!
! #define PROMPT_PAT \
! [NSString stringWithFormat: \
! @"proceed\\? \\[.*\\]|your choice:|Pick one|\\[[YyNn/]+\\]|[anonymous]|[root]|[%@]", \
! NSUserName()]
//fink's --yes option does not work for these prompts:
! #define MANPROMPT_PAT \
! @"(CVS|cvs).*password|\\[default=N\\]|either license\\?|(key|return) to continue"
@implementation FinkOutputParser
***************
*** 81,91 ****
{
if (self = [super init]){
defaults = [NSUserDefaults standardUserDefaults];
command = [cmd retain];
readingPackageList = NO;
! self_repair = NO;
installing = IS_INSTALL_CMD(command) && [exe contains:@"fink"];
pgid = 0;
if (installing){
packageList = [[NSMutableArray alloc] init];
--- 72,92 ----
{
if (self = [super init]){
+ int aPrompt, mPrompt, config; //test regex compilation success
+
defaults = [NSUserDefaults standardUserDefaults];
command = [cmd retain];
readingPackageList = NO;
! selfRepair = NO;
installing = IS_INSTALL_CMD(command) && [exe contains:@"fink"];
pgid = 0;
+ /* Precompile regular expressions used to parse each line of output */
+ config = compiledExpressionFromString(CONFIG_PAT, &configure);
+ aPrompt = compiledExpressionFromString(PROMPT_PAT, &prompt);
+ mPrompt = compiledExpressionFromString(MANPROMPT_PAT, &manPrompt);
+ if (mPrompt != 0 || aPrompt != 0){
+ NSLog(@"Compiling regex failed.");
+ }
+
if (installing){
packageList = [[NSMutableArray alloc] init];
***************
*** 106,109 ****
--- 107,114 ----
[currentPackage release];
+ regfree(&configure);
+ regfree(&prompt);
+ regfree(&manPrompt);
+
[super dealloc];
}
***************
*** 295,299 ****
installing = [self setupInstall];
//look for prompt or installation event immediately after pkg list
! if (ISPROMPT(line)){
if (installing){
return PROMPT_AND_START;
--- 300,304 ----
installing = [self setupInstall];
//look for prompt or installation event immediately after pkg list
! if ([line containsCompiledExpression:&prompt]){
if (installing){
return PROMPT_AND_START;
***************
*** 349,353 ****
return UNPACK;
}
! if (installing && (currentPhase == UNPACK) && CONFIGURETRIGGER(sline)){
Dprintf(@"Configure phase triggered by:\n%@", line);
[self setIncrementForLastPhase];
--- 354,359 ----
return UNPACK;
}
! if (installing && (currentPhase == UNPACK) &&
! [sline containsCompiledExpression:&configure]){
Dprintf(@"Configure phase triggered by:\n%@", line);
[self setIncrementForLastPhase];
***************
*** 383,390 ****
}
//Look for prompts
! if (ISMANDATORY_PROMPT(line)){
return MANDATORY_PROMPT;
}
! if (ISPROMPT(line) && ! [defaults boolForKey:FinkAlwaysChooseDefaults]){
Dprintf(@"Found prompt: %@", line);
return PROMPT;
--- 389,397 ----
}
//Look for prompts
! if ([line containsCompiledExpression:&manPrompt]){
return MANDATORY_PROMPT;
}
! if ([line containsCompiledExpression:&prompt] &&
! ! [defaults boolForKey:FinkAlwaysChooseDefaults]){
Dprintf(@"Found prompt: %@", line);
return PROMPT;
***************
*** 392,408 ****
//Look for self-repair of tool
if ([line contains:@"Running self-repair"]){
! self_repair = YES;
return RUNNING_SELF_REPAIR;
}
! if (self_repair && [line contains:@"Self-repair succeeded"]){
! self_repair = NO;
return SELF_REPAIR_COMPLETE;
}
! if (self_repair && [line contains:@"Unable to modify Resource directory\n"]){
! self_repair = NO;
return RESOURCE_DIR;
}
if ([line contains:@"Self-repair failed\n"]){
! self_repair = NO;
return SELF_REPAIR_FAILED;
}
--- 399,415 ----
//Look for self-repair of tool
if ([line contains:@"Running self-repair"]){
! selfRepair = YES;
return RUNNING_SELF_REPAIR;
}
! if (selfRepair && [line contains:@"Self-repair succeeded"]){
! selfRepair = NO;
return SELF_REPAIR_COMPLETE;
}
! if (selfRepair && [line contains:@"Unable to modify Resource directory\n"]){
! selfRepair = NO;
return RESOURCE_DIR;
}
if ([line contains:@"Self-repair failed\n"]){
! selfRepair = NO;
return SELF_REPAIR_FAILED;
}
Index: SBString.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/SBString.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** SBString.m 24 Mar 2003 01:11:00 -0000 1.12
--- SBString.m 21 Apr 2003 01:27:39 -0000 1.13
***************
*** 69,72 ****
--- 69,73 ----
r = [self rangeOfCompiledExpression:&expr
inRange:range];
+ regfree(&expr);
return r;
}
***************
*** 103,110 ****
NSLog(@"Error executing regular expression:\n%s", errmsg);
}
- regfree(re);
return r;
}
- regfree(re);
//Add location of substring searhced to determine location within string
r.location = matches[0].rm_so + range.location;
--- 104,109 ----
|
|
From: <sbu...@us...> - 2003-04-11 04:56:12
|
Update of /cvsroot/finkcommander/FinkCommander/SBTreeFiles
In directory sc8-pr-cvs1:/tmp/cvs-serv2741/SBTreeFiles
Modified Files:
SBTreeWindowController.m
Log Message:
last version 0.5.1 changes
Index: SBTreeWindowController.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/SBTreeFiles/SBTreeWindowController.m,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** SBTreeWindowController.m 11 Feb 2003 21:41:49 -0000 1.17
--- SBTreeWindowController.m 11 Apr 2003 04:56:07 -0000 1.18
***************
*** 93,96 ****
--- 93,99 ----
[sbBrowser release];
[sbBrowser setTree:sbTree];
+
+ [loadingIndicator setStyle:NSProgressIndicatorSpinningStyle];
+ [loadingIndicator setDisplayedWhenStopped:NO];
}
***************
*** 219,223 ****
[sbBrowser reloadColumn:0];
[loadingIndicator stopAnimation:self];
! [loadingIndicator removeFromSuperview];
}
--- 222,226 ----
[sbBrowser reloadColumn:0];
[loadingIndicator stopAnimation:self];
! //[loadingIndicator removeFromSuperview];
}
|
|
From: <sbu...@us...> - 2003-04-11 04:56:11
|
Update of /cvsroot/finkcommander/FinkCommander/FinkCommander.pbproj In directory sc8-pr-cvs1:/tmp/cvs-serv2741/FinkCommander.pbproj Modified Files: project.pbxproj Log Message: last version 0.5.1 changes Index: project.pbxproj =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/FinkCommander.pbproj/project.pbxproj,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** project.pbxproj 20 Feb 2003 20:45:39 -0000 1.106 --- project.pbxproj 11 Apr 2003 04:56:07 -0000 1.107 *************** *** 312,316 **** <string>Fcmd</string> <key>CFBundleVersion</key> ! <string>.cvs</string> <key>NSAppleScriptEnabled</key> <string>YES</string> --- 312,316 ---- <string>Fcmd</string> <key>CFBundleVersion</key> ! <string>.release</string> <key>NSAppleScriptEnabled</key> <string>YES</string> |
|
From: <sbu...@us...> - 2003-04-11 04:56:11
|
Update of /cvsroot/finkcommander/FinkCommander
In directory sc8-pr-cvs1:/tmp/cvs-serv2741
Modified Files:
Debugging.h Launcher.c RELEASE_STEPS.txt TODO.txt
Log Message:
last version 0.5.1 changes
Index: Debugging.h
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/Debugging.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Debugging.h 20 Feb 2003 04:58:59 -0000 1.9
--- Debugging.h 11 Apr 2003 04:56:07 -0000 1.10
***************
*** 4,6 ****
//Comment out to disable debugging code:
! #define DEBUGGING
--- 4,6 ----
//Comment out to disable debugging code:
! //#define DEBUGGING
Index: Launcher.c
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/Launcher.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Launcher.c 30 Mar 2003 03:40:53 -0000 1.15
--- Launcher.c 11 Apr 2003 04:56:07 -0000 1.16
***************
*** 218,222 ****
int result = FALSE;
int resrep = TRUE;
! int chownerr;
int chmoderr;
char* path_to_self = getPathToMyself();
--- 218,222 ----
int result = FALSE;
int resrep = TRUE;
! int chownerr = 0;
int chmoderr;
char* path_to_self = getPathToMyself();
Index: RELEASE_STEPS.txt
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/RELEASE_STEPS.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RELEASE_STEPS.txt 20 Feb 2003 20:45:38 -0000 1.9
--- RELEASE_STEPS.txt 11 Apr 2003 04:56:07 -0000 1.10
***************
*** 5,11 ****
Compile with DEBUGGING undefined and "Deployment" selected
! Download web site and update, including version references in index.php and version.xml
! run ~/FCFiles/mkpkgs.sh
Upload each file
--- 5,13 ----
Compile with DEBUGGING undefined and "Deployment" selected
! Download web site and update, including:
! version references in index.php and version.xml
! new file in /history
! run ~/bin/mkpkgs.sh
Upload each file
Index: TODO.txt
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/TODO.txt,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** TODO.txt 24 Mar 2003 01:11:00 -0000 1.49
--- TODO.txt 11 Apr 2003 04:56:07 -0000 1.50
***************
*** 1,18 ****
- VERSION 0.5.1 (bug fix); target release date = 3/23/03
-
- d Fix bug causing hang during selfupdate-cvs
-
- d Fix bug causing crash on setting same item more than once in Environment
- table
-
- d Fix bug -- erroneous success report for self-repair when FC is run from
- Disk Image
-
- d Update perl script whenever base path is set in Preferences
-
- d Fix crash on gnome-core-dev installation
-
- Fix crash on gnucash installation
-
VERSION 0.5.2:
--- 1,2 ----
|
|
From: <sbu...@us...> - 2003-03-30 03:40:58
|
Update of /cvsroot/finkcommander/FinkCommander
In directory sc8-pr-cvs1:/tmp/cvs-serv18528
Modified Files:
AuthorizedExecutable.m FinkOutputParser.m Launcher.c
Log Message:
Misc changes
Index: AuthorizedExecutable.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/AuthorizedExecutable.m,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AuthorizedExecutable.m 24 Mar 2003 01:11:00 -0000 1.10
--- AuthorizedExecutable.m 30 Mar 2003 03:40:53 -0000 1.11
***************
*** 299,303 ****
}
! // Internal routine used to capture output asynchronously.
// If a delegate overrides the executableFinished:withStatus method,
// it will be called when the command exits.
--- 299,303 ----
}
! // Internal routines used to capture output asynchronously.
// If a delegate overrides the executableFinished:withStatus method,
// it will be called when the command exits.
***************
*** 305,308 ****
--- 305,310 ----
// (void)executableFinished:(AuthorizedExecutable*)exe withStatus:(int)status;
//
+
+ //Helper method
-(NSString *)stringFromOutputData:(NSData *)data
{
***************
*** 310,317 ****
NS_DURING
! outputString = [NSString stringWithCString:[data bytes]];
return outputString;
NS_HANDLER
! return @"FinkCommander Warning: Unable to decode C string.\n";
NS_ENDHANDLER
;
--- 312,319 ----
NS_DURING
! outputString = [NSString stringWithCString:[data bytes] length:[data length]];
return outputString;
NS_HANDLER
! return @"WARNING: Unable to decode output for display.\n";
NS_ENDHANDLER
;
***************
*** 365,369 ****
NSPipe *stdinPipe = nil;
NSPipe *stdoutPipe = nil;
! NSPipe *stderrPipe = nil;
[output setString:@""];
--- 367,371 ----
NSPipe *stdinPipe = nil;
NSPipe *stdoutPipe = nil;
! //NSPipe *stderrPipe = nil;
[output setString:@""];
***************
*** 392,396 ****
stdoutPipe = [NSPipe pipe];
stdinPipe = [NSPipe pipe];
! stderrPipe = [NSPipe pipe];
stdinHandle = [stdinPipe fileHandleForWriting];
--- 394,398 ----
stdoutPipe = [NSPipe pipe];
stdinPipe = [NSPipe pipe];
! //stderrPipe = [NSPipe pipe];
stdinHandle = [stdinPipe fileHandleForWriting];
***************
*** 398,403 ****
stdoutHandle = [stdoutPipe fileHandleForReading];
[stdoutHandle retain];
! stderrHandle = [stderrPipe fileHandleForReading];
! [stderrHandle retain];
[[NSNotificationCenter defaultCenter]
--- 400,405 ----
stdoutHandle = [stdoutPipe fileHandleForReading];
[stdoutHandle retain];
! //stderrHandle = [stderrPipe fileHandleForReading];
! //[stderrHandle retain];
[[NSNotificationCenter defaultCenter]
***************
*** 406,415 ****
name:NSFileHandleReadCompletionNotification
object:stdoutHandle];
[[NSNotificationCenter defaultCenter]
addObserver:self selector:@selector(captureStdErr:)
name:NSFileHandleReadCompletionNotification
object:stderrHandle];
[stdoutHandle readInBackgroundAndNotify];
! [stderrHandle readInBackgroundAndNotify];
task = [[NSTask alloc] init];
--- 408,419 ----
name:NSFileHandleReadCompletionNotification
object:stdoutHandle];
+ #ifdef UNDEF
[[NSNotificationCenter defaultCenter]
addObserver:self selector:@selector(captureStdErr:)
name:NSFileHandleReadCompletionNotification
object:stderrHandle];
+ #endif
[stdoutHandle readInBackgroundAndNotify];
! //[stderrHandle readInBackgroundAndNotify];
task = [[NSTask alloc] init];
***************
*** 417,421 ****
[task setStandardOutput:stdoutPipe];
[task setStandardInput:stdinPipe];
! [task setStandardError:stderrPipe];
[task setLaunchPath:[self authExecutable]];
--- 421,427 ----
[task setStandardOutput:stdoutPipe];
[task setStandardInput:stdinPipe];
! //my change:
! [task setStandardError:stdoutPipe];
! //[task setStandardError:stderrPipe];
[task setLaunchPath:[self authExecutable]];
***************
*** 466,477 ****
[stdinHandle closeFile];
[stdoutHandle closeFile];
! [stderrHandle closeFile];
[stdinHandle release];
[stdoutHandle release];
! [stderrHandle release];
task = nil;
stdoutHandle = nil;
stdinHandle = nil;
! stderrHandle = nil;
if ([[self delegate]
respondsToSelector:@selector(executableFinished:withStatus:)])
--- 472,483 ----
[stdinHandle closeFile];
[stdoutHandle closeFile];
! //[stderrHandle closeFile];
[stdinHandle release];
[stdoutHandle release];
! //[stderrHandle release];
task = nil;
stdoutHandle = nil;
stdinHandle = nil;
! //stderrHandle = nil;
if ([[self delegate]
respondsToSelector:@selector(executableFinished:withStatus:)])
Index: FinkOutputParser.m
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/FinkOutputParser.m,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** FinkOutputParser.m 24 Mar 2003 01:11:00 -0000 1.27
--- FinkOutputParser.m 30 Mar 2003 03:40:53 -0000 1.28
***************
*** 50,54 ****
//fink's --yes option does not work for these prompts:
! #define ISMANDATORY_PROMPT(x) \
([(x) contains:@"cvs.sourceforge.net's password:"] || \
[(x) contains:@"CVS password:"] || \
--- 50,54 ----
//fink's --yes option does not work for these prompts:
! #define ISMANDATORY_PROMPT(x) \
([(x) contains:@"cvs.sourceforge.net's password:"] || \
[(x) contains:@"CVS password:"] || \
Index: Launcher.c
===================================================================
RCS file: /cvsroot/finkcommander/FinkCommander/Launcher.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Launcher.c 15 Mar 2003 23:39:16 -0000 1.14
--- Launcher.c 30 Mar 2003 03:40:53 -0000 1.15
***************
*** 279,283 ****
fprintf(stderr, "/n/nWARNING: Unable to modify Resource directory\n");
}else{
! fprintf(stderr, "/n/nERROR: Self-repair failed. Please be sure you are running FinkCommander from a directory and disk you are authorized to modify.\n");
}
return ! result; //will be used as exit code; so return 0 if successful, 1 otherwise
--- 279,283 ----
fprintf(stderr, "/n/nWARNING: Unable to modify Resource directory\n");
}else{
! fprintf(stderr, "/n/nERROR: Self-repair failed. Please be sure you are running FinkCommander from a directory and disk you are authorized to modify (e.g., not a disk image).\n");
}
return ! result; //will be used as exit code; so return 0 if successful, 1 otherwise
|
|
From: <sbu...@us...> - 2003-03-24 01:11:07
|
Update of /cvsroot/finkcommander/FinkCommander/SBTreeFiles In directory sc8-pr-cvs1:/tmp/cvs-serv24345/SBTreeFiles Modified Files: SBOutlineView.h SBTreeWindowController.h SBUtilities.h Log Message: Simplified regex methods; fixed gnome-core-dev bug Index: SBOutlineView.h =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/SBTreeFiles/SBOutlineView.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SBOutlineView.h 11 Feb 2003 06:15:57 -0000 1.4 --- SBOutlineView.h 24 Mar 2003 01:11:01 -0000 1.5 *************** *** 22,27 **** */ - - #import <Cocoa/Cocoa.h> #import "SBUtilities.h" --- 22,25 ---- Index: SBTreeWindowController.h =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/SBTreeFiles/SBTreeWindowController.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** SBTreeWindowController.h 11 Feb 2003 21:41:49 -0000 1.10 --- SBTreeWindowController.h 24 Mar 2003 01:11:01 -0000 1.11 *************** *** 2,8 **** File: SBTreeWindowController.h ! Creates the custom views and controllers, as well as the SBFileItemTree, ! for a particular package file browser window. ! Copyright (C) 2002, 2003 Steven J. Burr --- 2,17 ---- File: SBTreeWindowController.h ! Serves as the window controller for a particular package file browser window ! and creates the following model objects, custom views and controllers: ! ! * An SBFileItemTree (M), a tree-structured collection of SBFileItems (M); ! ! * An SBOutlineViewController (C), which connects the SBFileItemTree to the ! custom SBOutlineView; ! ! * An SBBrowserView (V/C), which uses delegate methods to display the SBFileItem ! tree in a browser view and customizes the view's behavior with the help of ! an SBBrowserMatrix (V); ! Copyright (C) 2002, 2003 Steven J. Burr Index: SBUtilities.h =================================================================== RCS file: /cvsroot/finkcommander/FinkCommander/SBTreeFiles/SBUtilities.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SBUtilities.h 17 Feb 2003 21:05:30 -0000 1.3 --- SBUtilities.h 24 Mar 2003 01:11:01 -0000 1.4 *************** *** 29,31 **** inline void Dprintf(NSString *fmt,...); #endif - --- 29,30 ---- |