Skip to content

Commit 6912110

Browse files
committed
no idea why this is suddenly needed
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7461 212acab6-be3b-0410-9dea-997c60f758d6
1 parent 44ee050 commit 6912110

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

SConstruct

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -587,12 +587,17 @@ Export('plugin_env plugin_uenv')
587587
if defenv['PLATFORM'] == 'win32':
588588
def build_nsis_menu_for_zip(target, source, env):
589589
cmdline = FindMakeNSIS(env, str(env['ZIPDISTDIR']))
590-
cmd = env.Command(None, source, cmdline + ' $SOURCE /X"OutFile %s"' % (target[0].abspath, ))
591-
AlwaysBuild(cmd)
590+
if Execute(f'"{cmdline}" "{source[0].abspath}" /X"OutFile {target[0].abspath}"'):
591+
Exit(1)
592592

593-
nsis_menu_target = defenv.Command(os.path.join('$ZIPDISTDIR', 'NSIS.exe'),
594-
os.path.join('$ZIPDISTDIR', 'Examples', 'NSISMenu.nsi'),
595-
build_nsis_menu_for_zip)
593+
nsis_menu_target = defenv.Command(
594+
os.path.join('$ZIPDISTDIR', 'NSIS.exe'),
595+
os.path.join('$ZIPDISTDIR', 'Examples', 'NSISMenu.nsi'),
596+
build_nsis_menu_for_zip
597+
)
598+
defenv.Depends(nsis_menu_target, r'$ZIPDISTDIR\makensis.exe')
599+
defenv.Depends(nsis_menu_target, r'$ZIPDISTDIR\Stubs')
600+
defenv.Depends(nsis_menu_target, r'$ZIPDISTDIR\Plugins')
596601
defenv.MakeReproducible(nsis_menu_target)
597602
defenv.Sign(nsis_menu_target)
598603

0 commit comments

Comments
 (0)