From fb452e0c69cedeccd75e8537c4e10b831fdbe230 Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Sun, 19 Jul 2015 21:59:45 +0200
Subject: [PATCH] [MODIF] Remove DSpellCheck from the package

Remove DSpellCheck plugin which has a hanging issue for Windows 10,
according Microsoft test team (ref:
https://github.com/notepad-plus-plus/notepad-plus-plus/issues/427)
---
 PowerEditor/installer/nppSetup.nsi   | 21 ++++++---------------
 PowerEditor/installer/packageAll.bat | 22 +++-------------------
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index d86fd986..02d973ca 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -625,6 +625,12 @@ Section -"Notepad++" mainSection
 		Rename "$INSTDIR\plugins\NppQCP.dll" "$INSTDIR\plugins\disabled\NppQCP.dll"
 		Delete "$INSTDIR\plugins\NppQCP.dll"
 		
+	IfFileExists "$INSTDIR\plugins\DSpellCheck.dll" 0 +4
+		MessageBox MB_OK "Due to the stability issue,$\nDSpellCheck.dll will be moved to the directory $\"disabled$\"" /SD IDOK
+		Rename "$INSTDIR\plugins\DSpellCheck.dll" "$INSTDIR\plugins\disabled\DSpellCheck.dll"
+		Delete "$INSTDIR\plugins\DSpellCheck.dll"
+	
+	
     ; Context Menu Management : removing old version of Context Menu module
 	IfFileExists "$INSTDIR\nppcm.dll" 0 +3
 		Exec 'regsvr32 /u /s "$INSTDIR\nppcm.dll"'
@@ -798,21 +804,6 @@ SectionGroupEnd
 SectionGroup "Plugins" Plugins
 	SetOverwrite on
 
-	${MementoSection} "Spell-Checker" DSpellCheck
-		Delete "$INSTDIR\plugins\DSpellCheck.dll"
-		SetOutPath "$INSTDIR\plugins"
-		File "..\bin\plugins\DSpellCheck.dll"
-		SetOutPath "$UPDATE_PATH\plugins\Config"
-		SetOutPath "$INSTDIR\plugins\Config\Hunspell"
-		File "..\bin\plugins\Config\Hunspell\dictionary.lst"
-		File "..\bin\plugins\Config\Hunspell\en_GB.aff"
-		File "..\bin\plugins\Config\Hunspell\en_GB.dic"
-		File "..\bin\plugins\Config\Hunspell\README_en_GB.txt"
-		File "..\bin\plugins\Config\Hunspell\en_US.aff"
-		File "..\bin\plugins\Config\Hunspell\en_US.dic"
-		File "..\bin\plugins\Config\Hunspell\README_en_US.txt"
-	${MementoSectionEnd}
-
 	${MementoSection} "Npp FTP" NppFTP
 		Delete "$INSTDIR\plugins\NppFTP.dll"
 		SetOutPath "$INSTDIR\plugins"
diff --git a/PowerEditor/installer/packageAll.bat b/PowerEditor/installer/packageAll.bat
index f083ba34..52f03167 100644
--- a/PowerEditor/installer/packageAll.bat
+++ b/PowerEditor/installer/packageAll.bat
@@ -47,7 +47,7 @@ copy /Y ..\bin\"notepad++.exe" .\minimalist\
 If ErrorLevel 1 PAUSE
 copy /Y ..\bin\SciLexer.dll .\minimalist\
 If ErrorLevel 1 PAUSE
-copy /Y copy ..\src\fonts\sourceCodePro\SourceCodePro-Regular.otf .\minimalist\
+copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-Regular.otf .\minimalist\
 If ErrorLevel 1 PAUSE
 
 
@@ -89,27 +89,10 @@ copy /Y ..\bin\"notepad++.exe" .\zipped.package.release\
 If ErrorLevel 1 PAUSE
 copy /Y ..\bin\SciLexer.dll .\zipped.package.release\
 If ErrorLevel 1 PAUSE
-copy ..\src\fonts\sourceCodePro\SourceCodePro-Regular.otf .\zipped.package.release\
+copy /Y ..\src\fonts\sourceCodePro\SourceCodePro-Regular.otf .\zipped.package.release\
 If ErrorLevel 1 PAUSE
 
 rem Plugins
-copy /Y "..\bin\plugins\DSpellCheck.dll" .\zipped.package.release\plugins\
-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\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin\plugins\Config\Hunspell\en_GB.aff" .\zipped.package.release\plugins\Config\Hunspell\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin\plugins\Config\Hunspell\README_en_GB.txt" .\zipped.package.release\plugins\Config\Hunspell\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin\plugins\Config\Hunspell\en_US.dic" .\zipped.package.release\plugins\Config\Hunspell\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin\plugins\Config\Hunspell\en_US.aff" .\zipped.package.release\plugins\Config\Hunspell\
-If ErrorLevel 1 PAUSE
-copy /Y "..\bin\plugins\Config\Hunspell\README_en_US.txt" .\zipped.package.release\plugins\Config\Hunspell\
-If ErrorLevel 1 PAUSE
-
 copy /Y "..\bin\plugins\NppFTP.dll" .\zipped.package.release\plugins\
 If ErrorLevel 1 PAUSE
 copy /Y "..\bin\plugins\NppExport.dll" .\zipped.package.release\plugins\
@@ -148,6 +131,7 @@ If ErrorLevel 1 PAUSE
 "C:\Program Files\7-Zip\7z.exe" a -r .\build\npp.bin.7z .\zipped.package.release\*
 If ErrorLevel 1 PAUSE
 "C:\Program Files (x86)\NSIS\Unicode\makensis.exe" nppSetup.nsi
+rem "C:\Program Files\NSIS\Unicode\makensis.exe" nppSetup.nsi
 
 
 @echo off