merge with stable

5 files changed, 6 insertions, 7 deletions

diff --git a/tools/build_scripts/a_SetVar32.bat.sample b/tools/build_scripts/a_SetVar32.bat.sample
index 68297c6586..5d7fc852af 100644
--- a/tools/build_scripts/a_SetVar32.bat.sample
+++ b/tools/build_scripts/a_SetVar32.bat.sample
@@ -4,7 +4,6 @@ set SourceDir=%~dp0
 for %%a in (%SourceDir:~0,-1%) do set "SourceDir=%%a"
 set DropDir=%Drive%\Dropbox
 set StableInstDir=%SourceDir%\tools\installer_ng_stable
-set GetIt=%StableInstDir%\Tools\wget.exe
 set Arch=%Drive%\Arch
 set ArchPdb=%Drive%\ArchPdb
 set ArchDistr=%Drive%\ArchDistr
diff --git a/tools/build_scripts/a_SetVar64.bat.sample b/tools/build_scripts/a_SetVar64.bat.sample
index 25a6872c57..84119732ec 100644
--- a/tools/build_scripts/a_SetVar64.bat.sample
+++ b/tools/build_scripts/a_SetVar64.bat.sample
@@ -4,7 +4,6 @@ set SourceDir=%~dp0
 for %%a in (%SourceDir:~0,-1%) do set "SourceDir=%%a"
 set DropDir=%Drive%\Dropbox
 set StableInstDir=%SourceDir%\tools\installer_ng_stable
-set GetIt=%StableInstDir%\Tools\wget.exe
 set Arch=%Drive%\Arch64
 set ArchPdb=%Drive%\ArchPdb64
 set ArchDistr=%Drive%\ArchDistr
diff --git a/tools/build_scripts/z3_PackArchivesStable.bat b/tools/build_scripts/z3_PackArchivesStable.bat
index 6124afbfa9..f3506d9d6c 100644
--- a/tools/build_scripts/z3_PackArchivesStable.bat
+++ b/tools/build_scripts/z3_PackArchivesStable.bat
@@ -9,14 +9,15 @@ for /F "tokens=1,2,3,4 delims= " %%i in (build\build.no.stable) do (
   )
 )
 
+call a_SetVar%tp%.bat
+
 if /i '%tp%' == '64' set bit=_x64
-if /i '%tp%' == '32' set CompileString=..\Tools\InnoSetup5\ISCC.exe /Dptx86 /DAppVer=%MirVer% "MirandaNG.iss" 
-if /i '%tp%' == '64' set CompileString=..\Tools\InnoSetup5\ISCC.exe /DAppVer=%MirVer% "MirandaNG.iss"
+if /i '%tp%' == '32' set CompileString=%ISCC% /Dptx86 /DAppVer=%MirVer% "MirandaNG.iss" 
+if /i '%tp%' == '64' set CompileString=%ISCC% /DAppVer=%MirVer% "MirandaNG.iss"
 
 set comp=%2
 if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto :EOF)
 
-call a_SetVar%tp%.bat
 if not exist %ArchDistr% mkdir %ArchDistr%
 
 pushd "%comp%\Symbols%tp%"
@@ -47,8 +48,8 @@ mkdir InnoNG_%tp%
 mkdir InnoNG_%tp%\Files\Languages
 copy /V /Y MirandaNG.iss InnoNG_%tp%
 xcopy Common\* InnoNG_%tp% /I /S /V /Y
-Tools\wget.exe -O tmp\InnoSetup5.7z https://miranda-ng.org/distr/installer/InnoSetup5.7z
-Tools\wget.exe -O tmp\MNG_Sounds.7z https://miranda-ng.org/distr/addons/Sounds/MNG_Sounds.7z
+curl -o tmp\InnoSetup5.7z https://miranda-ng.org/distr/installer/InnoSetup5.7z
+curl -o tmp\MNG_Sounds.7z https://miranda-ng.org/distr/addons/Sounds/MNG_Sounds.7z
 %CompressIt% x tmp\InnoSetup5.7z -y -oTools
 %CompressIt% x %ArchDistr%\miranda-ng-v%MirVer%%bit%.7z -y -oInnoNG_%tp%\Files
 %CompressIt% x tmp\MNG_Sounds.7z -y -oInnoNG_%tp%\Files
diff --git a/tools/installer_ng/Tools/wget.exe b/tools/installer_ng/Tools/wget.exe
deleted file mode 100644
index f2a11c17dd..0000000000
--- a/tools/installer_ng/Tools/wget.exe
+++ /dev/null
diff --git a/tools/installer_ng_stable/Tools/wget.exe b/tools/installer_ng_stable/Tools/wget.exe
deleted file mode 100644
index f2a11c17dd..0000000000
--- a/tools/installer_ng_stable/Tools/wget.exe
+++ /dev/null