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

fix release scons/inst diff

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7068 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2018-12-15 22:11:30 +00:00
parent 2abc0c7ee9
commit 39cd5da3de
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/makensis.nsi
View file

@ -336,6 +336,7 @@ ${MementoSection} "Script Examples" SecExample
File ..\Examples\WordFuncTest.nsi File ..\Examples\WordFuncTest.nsi
File ..\Examples\Memento.nsi File ..\Examples\Memento.nsi
File ..\Examples\unicode.nsi File ..\Examples\unicode.nsi
File ..\Examples\NSISMenu.nsi
SetOutPath $INSTDIR\Examples\Plugin SetOutPath $INSTDIR\Examples\Plugin
File ..\Examples\Plugin\exdll.c File ..\Examples\Plugin\exdll.c
@ -497,7 +498,7 @@ ${MementoSection} "Graphics" SecGraphics
Delete $INSTDIR\Contrib\Icons\*.bmp Delete $INSTDIR\Contrib\Icons\*.bmp
RMDir $INSTDIR\Contrib\Icons RMDir $INSTDIR\Contrib\Icons
SetOutPath $INSTDIR\Contrib\Graphics SetOutPath $INSTDIR\Contrib\Graphics
File /r /x nsis-menu.ico "..\Contrib\Graphics\*.ico" File /r "..\Contrib\Graphics\*.ico"
File /r "..\Contrib\Graphics\*.bmp" File /r "..\Contrib\Graphics\*.bmp"
${MementoSectionEnd} ${MementoSectionEnd}

2
Scripts/release.py
View file

@ -271,7 +271,7 @@ def TestInstaller():
) )
run( run(
'diff -r insttest insttestscons | grep -v uninst-nsis.exe', 'diff -r insttest insttestscons | grep -v uninst-nsis.exe | grep -v NSIS.exe',
LOG_ALL, LOG_ALL,
'scons and installer installations differ', 'scons and installer installations differ',
1 1