diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index 91963559c..a0c98bb4a 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -451,6 +451,7 @@ Section -"Notepad++" mainSection File "..\bin\langs.model.xml" File "..\bin\config.model.xml" File "..\bin\stylers.model.xml" + File "..\bin\contextMenu.xml" File "..\bin\functionList.xml" SetOverwrite off @@ -755,11 +756,6 @@ SectionGroup "Plugins" Plugins SetOutPath "$INSTDIR\plugins" File "..\bin\plugins\DSpellCheck.dll" SetOutPath "$UPDATE_PATH\plugins\Config" -/* - SetOverwrite off - File "..\bin\plugins\Config\DSpellCheck.ini" - SetOverwrite on -*/ SetOutPath "$INSTDIR\plugins\Config\Hunspell" File "..\bin\plugins\Config\Hunspell\dictionary.lst" File "..\bin\plugins\Config\Hunspell\en_GB.aff" @@ -798,6 +794,12 @@ SectionGroup "Plugins" Plugins File "..\bin\updater\gpup.exe" SectionEnd + Section "Mime Tools" MimeTools + Delete "$INSTDIR\plugins\mimeTools.dll" + SetOutPath "$INSTDIR\plugins" + File "..\bin\plugins\mimeTools.dll" + SectionEnd + Section "Converter" Converter Delete "$INSTDIR\plugins\NppConverter.dll" SetOutPath "$INSTDIR\plugins" @@ -1411,6 +1413,9 @@ SectionGroup un.Plugins Section un.Converter Delete "$INSTDIR\plugins\NppConverter.dll" SectionEnd + Section un.MimeTools + Delete "$INSTDIR\plugins\mimeTools.dll" + SectionEnd Section un.PluginManager Delete "$INSTDIR\plugins\PluginManager.dll" Delete "$INSTDIR\updater\gpup.exe" diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat index 8bae3ad6f..9880c6e6a 100644 --- a/PowerEditor/installer/packageAll.bat +++ b/PowerEditor/installer/packageAll.bat @@ -92,8 +92,6 @@ If ErrorLevel 1 PAUSE rem Plugins copy /Y "..\bin\plugins\DSpellCheck.dll" .\zipped.package.release\plugins\ If ErrorLevel 1 PAUSE -rem copy /Y "..\bin\plugins\Config\DSpellCheck.ini" .\zipped.package.release\plugins\Config\ -rem If ErrorLevel 1 PAUSE copy /Y "..\bin\plugins\Config\Hunspell\dictionary.lst" .\zipped.package.release\plugins\Config\Hunspell\ If ErrorLevel 1 PAUSE copy /Y "..\bin\plugins\Config\Hunspell\en_GB.dic" .\zipped.package.release\plugins\Config\Hunspell\ @@ -113,6 +111,8 @@ copy /Y "..\bin\plugins\NppFTP.dll" .\zipped.package.release\plugins\ If ErrorLevel 1 PAUSE copy /Y "..\bin\plugins\NppExport.dll" .\zipped.package.release\plugins\ If ErrorLevel 1 PAUSE +copy /Y "..\bin\plugins\mimeTools.dll" .\zipped.package.release\plugins\ +If ErrorLevel 1 PAUSE copy /Y "..\bin\plugins\NppConverter.dll" .\zipped.package.release\plugins\ If ErrorLevel 1 PAUSE