microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 03:04:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use python2.7

Browse Source
This commit is contained in:
Matthias Neeracher 2017-11-24 06:00:13 +01:00
parent 323d1cd0ca
commit a315f7b322
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Sources/VLAppController.mm
View File

@ -5,7 +5,7 @@
// //
// (MN) Matthias Neeracher // (MN) Matthias Neeracher
// //
// Copyright © 2005-2011 Matthias Neeracher // Copyright © 2005-2017 Matthias Neeracher
// //
#import "VLAppController.h" #import "VLAppController.h"
@ -192,7 +192,9 @@
} else if (toolPath && !appPath) { } else if (toolPath && !appPath) {
wantTool = true; wantTool = true;
[defaults setObject:toolPath forKey:@"VLLilypondPath"]; [defaults setObject:toolPath forKey:@"VLLilypondPath"];
} } else {
[defaults setObject:(wantTool ? toolPath : appPath) forKey:@"VLLilypondPath"];
}
[lilypondPath selectItemWithTag:wantTool ? 0 : 1]; [lilypondPath selectItemWithTag:wantTool ? 0 : 1];
if (VLDebugFlags::ShowDebugMenu()) { if (VLDebugFlags::ShowDebugMenu()) {
@ -216,7 +218,7 @@
? @"Install through fink" ? @"Install through fink"
: label : label
alternateButton:@"Continue" alternateButton:@"Continue"
otherButton:hasFink otherButton:hasFink
? label ? label
: @"" : @""
informativeTextWithFormat: expl, hasFink informativeTextWithFormat: expl, hasFink
@ -258,11 +260,11 @@
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.7 Not Found!"
explanation: explanation:
@"Python 2.5 is needed to play accompaniments. The " @"Python 2.7 is needed to play accompaniments. The "
"version preinstalled on your computer is not recent " "version preinstalled on your computer is not recent "
"enough. If you continue without installing, you will be " "enough. If you continue without installing, you will be "
"unable to play accompaniments, or save as MIDI.%@" "unable to play accompaniments, or save as MIDI.%@"

2
mma/mma.py
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