Merge pull request #246 from k-takata/reenable-sodium

Enable libsodium again

Author: chrisbra

README.md

@@ -58,10 +58,10 @@ the [winpty repository](https://github.com/rprichard/winpty). This feature is
 currently considered experimental. Read the help at [:h
 terminal.txt](http://vimhelp.appspot.com/terminal.txt.html) for more
 information.
-<del>For supporting better encryption, it comes with the libsodium.dll from the
+For supporting better encryption, it comes with the libsodium.dll from the
 [libsodium repository](https://github.com/jedisct1/libsodium/releases/1.0.18-RELEASE)
 See the help at [:h 'cryptmethod'](https://vimhelp.org/options.txt.html#%27cryptmethod%27)
-for more details.</del> (currently disabled)
+for more details.
 
 Note: The zip archive might be considered unsecure in Windows, causing Windows
 to display a dialog box "These files might be harmful to your computer...". If

appveyor.bat

@@ -75,8 +75,8 @@ set UPX_URL=https://github.com/upx/upx/releases/download/v3.94/upx394w.zip
 :: ShellExecAsUser
 set SHELLEXECASUSER_URL=https://nsis.sourceforge.io/mediawiki/images/1/1d/ShellExecAsUserUnicodeUpdate.zip
 :: Libsodium (currently disabled)
-::set LIBSODIUM_URL=https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18-msvc.zip
-::set SODIUM_DIR=C:\libsodium
+set LIBSODIUM_URL=https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18-msvc.zip
+set SODIUM_DIR=C:\libsodium
 
 :: Subsystem version (targeting Windows XP)
 set SUBSYSTEM_VER32=5.01
@@ -190,13 +190,13 @@ call :downloadfile %SHELLEXECASUSER_URL% downloads\shellexecasuser.zip
 copy /Y c:\shellexecasuser\unicode\ShellExecAsUser.dll "%ProgramFiles(x86)%\NSIS\Plugins\x86-unicode"
 
 :: Install Libsodium
-:: call :downloadfile %LIBSODIUM_URL% downloads\libsodium.zip
-:: 7z x downloads\libsodium.zip -oc:\ > nul || exit 1
-:: if /i "%ARCH%"=="x64" (
-:: 	copy /Y C:\libsodium\x64\Release\v140\dynamic\libsodium.dll        vim\src\libsodium.dll
-:: ) else (
-:: 	copy /Y C:\libsodium\Win32\Release\v140\dynamic\libsodium.dll      vim\src\libsodium.dll
-:: )
+call :downloadfile %LIBSODIUM_URL% downloads\libsodium.zip
+7z x downloads\libsodium.zip -oc:\ > nul || exit 1
+if /i "%ARCH%"=="x64" (
+	copy /Y C:\libsodium\x64\Release\v140\dynamic\libsodium.dll        vim\src\libsodium.dll
+) else (
+	copy /Y C:\libsodium\Win32\Release\v140\dynamic\libsodium.dll      vim\src\libsodium.dll
+)
 
 :: Show PATH for debugging
 path
@@ -239,7 +239,7 @@ nmake -f Make_mvc.mak ^
 	DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
 	DYNAMIC_RUBY=yes RUBY=%RUBY_DIR% RUBY_MSVCRT_NAME=msvcrt ^
 	DYNAMIC_MZSCHEME=yes "MZSCHEME=%RACKET_DIR%" ^
-	TERMINAL=yes ^
+	TERMINAL=yes SODIUM=%SODIUM_DIR% ^
 	|| exit 1
 :: Build CUI version
 nmake -f Make_mvc.mak ^
@@ -251,7 +251,7 @@ nmake -f Make_mvc.mak ^
 	DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
 	DYNAMIC_RUBY=yes RUBY=%RUBY_DIR% RUBY_MSVCRT_NAME=msvcrt ^
 	DYNAMIC_MZSCHEME=yes "MZSCHEME=%RACKET_DIR%" ^
-	TERMINAL=yes ^
+	TERMINAL=yes SODIUM=%SODIUM_DIR% ^
 	|| exit 1
 :: Build translations
 pushd po
@@ -299,7 +299,7 @@ copy /Y GvimExt\*.reg      GvimExt32\
 copy /Y ..\README.txt ..\runtime
 copy /Y ..\vimtutor.bat ..\runtime
 copy /Y *.exe ..\runtime\
-:: copy /Y libsodium.dll ..\runtime\
+copy /Y libsodium.dll ..\runtime\
 copy /Y xxd\*.exe ..\runtime
 copy /Y tee\*.exe ..\runtime
 mkdir ..\runtime\GvimExt64

appveyor.yml

@@ -116,7 +116,7 @@ deploy:
       * [Python3](https://www.python.org/downloads/) 3.10
       * [Racket](https://download.racket-lang.org/) 8.3 (BC)
       * [RubyInstaller](http://rubyinstaller.org/downloads/) 3.0
-      <!-- * [libsodium](https://download.libsodium.org/libsodium/) 1.0.18 -->
+      * [libsodium](https://download.libsodium.org/libsodium/) 1.0.18
       </details>
 
       See the [README](https://github.com/vim/vim-win32-installer/blob/master/README.md) for detail.