dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge history and chm fix from 2.48

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6682 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-12-11 20:25:17 +00:00
parent 95dfc73889
commit e2db35bf45
2 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Docs/src/SConscript
View file

@ -158,12 +158,16 @@ env.Append(BUILDERS = {'Halibut' : docs_builder})
# fix hhc.exe reverse return value - UGLY
old_spawn = env['SPAWN']
def new_spawn(*args, **kw):
if 'hhc' in args[3]:
if len(args) == 5:
args = (args[0], args[1], args[2], args[3], {'PATH': args[4]['PATH']})
else:
kw['env'] = {}
result = old_spawn(*args, **kw)
for p in args[3]:
if 'hhc.exe' in p.lower():
return not result
return result
env['SPAWN'] = new_spawn
# BUILD!