From eb12d43800cdb20efcec0dfc0ef3fbb76ec3bfb4 Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Fri, 17 Mar 2017 20:59:10 +0300
Subject: [PATCH] update windows build scripts

---
 contrib/build_mingw.cmd | 31 +++++++++++++++++--------------
 contrib/build_mingw.sh  | 12 ++++++++----
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/contrib/build_mingw.cmd b/contrib/build_mingw.cmd
index b5ac0d69..b104d79c 100644
--- a/contrib/build_mingw.cmd
+++ b/contrib/build_mingw.cmd
@@ -1,22 +1,25 @@
 @echo off
-title ���ઠ i2pd
+setlocal
 
-set "WD=C:\msys64"
+title Building i2pd
+
+set "WD=C:\msys64\usr\bin\"
+set MSYS2_PATH_TYPE=inherit
 set CHERE_INVOKING=enabled_from_arguments
-set MSYSCON=mintty.exe
+set MSYSCON=
 
-echo ���ઠ i2pd ��� win32. ������ Enter ��᫥ ����砭�� �������樨...
-set "MSYSTEM=MINGW32"
-set "CONTITLE=MinGW x32"
-start "%CONTITLE%" /WAIT C:\msys64\usr\bin\mintty.exe -i /msys2.ico /usr/bin/bash --login build_mingw.sh
-pause
+echo Building i2pd for win32. Press Enter after the end of compilation...
+set MSYSTEM=MINGW32
+set CONTITLE=MinGW x32
+start "%CONTITLE%" /WAIT "%WD%bash" --login build_mingw.sh
+pause > nul
 
-echo ���ઠ i2pd ��� win64. ������ Enter ��᫥ ����砭�� �������樨...
-set "MSYSTEM=MINGW64"
-set "CONTITLE=MinGW x64"
-start "%CONTITLE%" /WAIT C:\msys64\usr\bin\mintty.exe -i /msys2.ico /usr/bin/bash --login build_mingw.sh
-pause
+echo Building i2pd for win64. Press Enter after the end of compilation...
+set MSYSTEM=MINGW64
+set CONTITLE=MinGW x64
+start "%CONTITLE%" /WAIT "%WD%bash" --login build_mingw.sh
+pause > nul
 
-echo ���ઠ �����襭�...
+echo Build complete...
 pause
 exit /b 0
\ No newline at end of file
diff --git a/contrib/build_mingw.sh b/contrib/build_mingw.sh
index ec4b975b..ecc388c1 100644
--- a/contrib/build_mingw.sh
+++ b/contrib/build_mingw.sh
@@ -48,7 +48,8 @@ fi;
 echo "Собираем i2pd ${version} (коммит ${commit}) для ${arch}.";
 
 # Собираем приложение с разными параметрами, и архивируем в zip архивы.
-make USE_UPNP=yes USE_AVX=1 USE_AESNI=1 -j ${threads} > ${contrib}/build_avx_aesni.log 2>&1
+echo "Сборка AVX+AESNI";
+make USE_UPNP=yes USE_AVX=1 USE_AESNI=1 -j ${threads} > ${contrib}/build_${arch}_avx_aesni.log 2>&1
 if [ "$?" != 0 ]; then
 	echo "Сборка не удалась. Смотрите в build_avx_aesni.log";
 	exit 1;
@@ -56,7 +57,8 @@ fi;
 zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw_avx_aesni.zip i2pd.exe >> /dev/null
 make clean >> /dev/null
 
-make USE_UPNP=yes USE_AVX=1 -j ${threads} > ${contrib}/build_avx.log 2>&1
+echo "Сборка AVX";
+make USE_UPNP=yes USE_AVX=1 -j ${threads} > ${contrib}/build_${arch}_avx.log 2>&1
 if [ "$?" != 0 ]; then
 	echo "Сборка не удалась. Смотрите в build_avx.log.";
 	exit 1;
@@ -64,7 +66,8 @@ fi;
 zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw_avx.zip i2pd.exe >> /dev/null
 make clean >> /dev/null
 
-make USE_UPNP=yes USE_AESNI=1 -j ${threads} > ${contrib}/build_aesni.log 2>&1
+echo "Сборка AESNI";
+make USE_UPNP=yes USE_AESNI=1 -j ${threads} > ${contrib}/build_${arch}_aesni.log 2>&1
 if [ "$?" != 0 ]; then
 	echo "Сборка не удалась. Смотрите в build_aesni.log";
 	exit 1;
@@ -72,7 +75,8 @@ fi;
 zip -9 ${contrib}/i2pd_${version}_${commit}_${arch}_mingw_aesni.zip i2pd.exe >> /dev/null
 make clean >> /dev/null
 
-make USE_UPNP=yes -j ${threads} > ${contrib}/build.log 2>&1
+echo "Сборка без дополнительных инструкций";
+make USE_UPNP=yes -j ${threads} > ${contrib}/build_${arch}.log 2>&1
 if [ "$?" != 0 ]; then
 	echo "Сборка не удалась. Смотрите в build.log";
 	exit 1;