Tera TermRevision: 9259
https://osdn.net/projects/ttssh2/scm/svn/commits/9259
Author: nmaya
Date: 2021-05-20 19:57:40 +0900 (Thu, 20 May 2021)
Log Message:
-----------
OpenSSL ビルド時に openssl.exe がなかった場合にどうするかユーザへ問い合わせたあと、常に else 側を通る問題を修正
括弧内で set した変数の値はすぐに参照できないため
Modified Paths:
--------------
branches/4-stable/libs/buildopenssl11.bat
-------------- next part --------------
Modified: branches/4-stable/libs/buildopenssl11.bat
===================================================================
--- branches/4-stable/libs/buildopenssl11.bat 2021-05-19 15:39:46 UTC (rev 9258)
+++ branches/4-stable/libs/buildopenssl11.bat 2021-05-20 10:57:40 UTC (rev 9259)
@@ -13,8 +13,8 @@
pushd ..\openssl_patch
call apply_patch.bat
if ERRORLEVEL 1 (
- echo "buildopenssl11.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
- exit /b 1
+ popd
+ goto fail
)
popd
@@ -52,21 +52,27 @@
echo %CL_VER% | find "Compiler Version 14" >nul
if ERRORLEVEL 1 goto end
@echo off
-if not exist out32\openssl.exe (
- echo crypt32.lib \x82\xAA\x83\x8A\x83\x93\x83N\x82ł\xAB\x82\xB8\x82Ƀo\x83C\x83i\x83\x8A\x82\xAA\x8D쐬\x82ł\xAB\x82Ă\xA2\x82܂\xB9\x82\xF1\x81B
- echo Platform SDK\x82\xAA\x93\xB1\x93\xFC\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x89\\x90\xAB\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
- set /P ANS2003SDK="\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9\x81H(y/n)"
- if "%ANS2003SDK%"=="y" (
- goto end
- ) else (
- echo "buildopenssl11.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
- exit /b 1
- )
-) else (
+if exist out32\openssl.exe (
echo OpenSSL\x82̃r\x83\x8B\x83h\x82\xAA\x90\xB3\x8F\xED\x8FI\x97\xB9\x82\xB5\x82܂\xB5\x82\xBD\x81B
+ goto end
)
+echo crypt32.lib \x82\xAA\x83\x8A\x83\x93\x83N\x82ł\xAB\x82\xB8\x82Ƀo\x83C\x83i\x83\x8A\x82\xAA\x8D쐬\x82ł\xAB\x82Ă\xA2\x82܂\xB9\x82\xF1\x81B
+echo Platform SDK\x82\xAA\x93\xB1\x93\xFC\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x89\\x90\xAB\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
+set /P ANS2003SDK="\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9\x81H(y/n)"
+if "%ANS2003SDK%"=="y" (
+ goto end
+) else (
+ goto fail
+)
+
+:end
+cd ..
@echo on
+exit /b 0
-:end
+:fail
cd ..
+echo "buildopenssl11.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ ＠ echo on
+exit /b 1