diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index 858fac89..30d20745 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -336,6 +336,7 @@ ${MementoSection} "Script Examples" SecExample File ..\Examples\WordFuncTest.nsi File ..\Examples\Memento.nsi File ..\Examples\unicode.nsi + File ..\Examples\NSISMenu.nsi SetOutPath $INSTDIR\Examples\Plugin File ..\Examples\Plugin\exdll.c @@ -497,7 +498,7 @@ ${MementoSection} "Graphics" SecGraphics Delete $INSTDIR\Contrib\Icons\*.bmp RMDir $INSTDIR\Contrib\Icons SetOutPath $INSTDIR\Contrib\Graphics - File /r /x nsis-menu.ico "..\Contrib\Graphics\*.ico" + File /r "..\Contrib\Graphics\*.ico" File /r "..\Contrib\Graphics\*.bmp" ${MementoSectionEnd} diff --git a/Scripts/release.py b/Scripts/release.py index d0a009e8..a61beb95 100644 --- a/Scripts/release.py +++ b/Scripts/release.py @@ -271,7 +271,7 @@ def TestInstaller(): ) 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, 'scons and installer installations differ', 1