Merge branch 'Python_Upgrade'

This commit is contained in:
Matthias Neeracher 2018-02-17 22:44:23 +01:00
commit ed6d389c5c
3 changed files with 4 additions and 4 deletions

View File

@ -11,9 +11,9 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
@interface VLAppController : NSObject { @interface VLAppController : NSObject {
IBOutlet id lilypondPath; IBOutlet NSMenu * lilypondPath;
IBOutlet id mirrorWin; IBOutlet id mirrorWin;
IBOutlet id debugMenu; IBOutlet NSMenu * debugMenu;
NSString * toolPath; NSString * toolPath;
NSString * appPath; NSString * appPath;

View File

@ -258,7 +258,7 @@
url:[NSURL URLWithString:@"http://lilypond.org/web/install"]] url:[NSURL URLWithString:@"http://lilypond.org/web/install"]]
) )
quit = YES; quit = YES;
if (![self getLineFromCommand:@"bash -l -c 'which python2.5'"]) if (![self getLineFromCommand:@"bash -l -c 'which python2.7'"])
if ([self promptForSoftwareInstallation:@"Download from python.org" if ([self promptForSoftwareInstallation:@"Download from python.org"
withTitle: @"Python 2.5 Not Found!" withTitle: @"Python 2.5 Not Found!"
explanation: explanation:

View File

@ -1,4 +1,4 @@
#!/usr/bin/env python2.5 #!/usr/bin/env python2.7
""" """
The program "MMA - Musical Midi Accompaniment" and the associated The program "MMA - Musical Midi Accompaniment" and the associated