makensis.exe: if not in %PATH%, search in a default dir

- search makensis.exe in %PROGRAMFILES%/NSIS
- display a message when makensis.exe is not found.

issue2634
review392001
This commit is contained in:
Pierre-Louis Bonicoli committed 2012-06-19 22:32:15 +02:00
1 parent 68bd90797b
commit 1e62c1ec7c
1 file changed
+5 -1
+5 -1
View File
@@ -181,7 +181,8 @@ if os.name == 'nt':
return None
def find_makensis():
for directory in os.environ['PATH'].split(';'):
default_path = os.path.join(os.environ['PROGRAMFILES'], 'NSIS')
for directory in os.environ['PATH'].split(';') + [default_path]:
if not os.path.isdir(directory):
continue
path = os.path.join(directory, 'makensis.exe')
@@ -267,6 +268,9 @@ if os.name == 'nt':
Popen([makensis, "/DVERSION=" + VERSION,
str(os.path.join(os.path.dirname(__file__),
'setup-single.nsi'))]).wait()
else:
print "makensis.exe not found: installers can not be created, "\
"skip setup.nsi and setup-single.nsi"
elif sys.platform == 'darwin':
def find_gtk_dir():