Tera TermRevision: 7821
https://osdn.net/projects/ttssh2/scm/svn/commits/7821
Author: yutakapon
Date: 2019-06-28 20:19:38 +0900 (Fri, 28 Jun 2019)
Log Message:
-----------
OpenSSLのビルド時、パッチ(openssl_build_patch.txt)が適用されているかを
事前にチェックするようにした。
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/36876
Modified Paths:
--------------
branches/openssl_1_1_1_v2/libs/buildopenssl11.bat
Added Paths:
-----------
branches/openssl_1_1_1_v2/libs/openssl_patch/check_patch.bat
-------------- next part --------------
Modified: branches/openssl_1_1_1_v2/libs/buildopenssl11.bat
===================================================================
--- branches/openssl_1_1_1_v2/libs/buildopenssl11.bat 2019-06-28 10:36:31 UTC (rev 7820)
+++ branches/openssl_1_1_1_v2/libs/buildopenssl11.bat 2019-06-28 11:19:38 UTC (rev 7821)
@@ -1,3 +1,11 @@
+
+rem \x83p\x83b\x83`\x93K\x97p\x83`\x83F\x83b\x83N
+pushd openssl_patch
+call check_patch.bat
+popd
+
+rem OpenSSL\x82̃r\x83\x8B\x83h\x82ֈڍs
+
cd openssl
if exist "out32.dbg\libcrypto.lib" goto build_dbg_end
Added: branches/openssl_1_1_1_v2/libs/openssl_patch/check_patch.bat
===================================================================
--- branches/openssl_1_1_1_v2/libs/openssl_patch/check_patch.bat (rev 0)
+++ branches/openssl_1_1_1_v2/libs/openssl_patch/check_patch.bat 2019-06-28 11:19:38 UTC (rev 7821)
@@ -0,0 +1,29 @@
+ ＠ echo off
+
+rem
+rem OpenSSL 1.1.1\x82Ƀp\x83b\x83`\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82邩\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9
+rem
+
+findstr /c:"# undef AI_PASSIVE" ..\openssl\crypto\bio\bio_lcl.h
+if ERRORLEVEL 1 goto fail
+
+echo "\x83p\x83b\x83`\x82͓K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7"
+timeout 5
+goto end
+
+:fail
+echo "\x83p\x83b\x83`\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82悤\x82ł\xB7"
+set /P ANS="\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9\x81H(y/n)"
+if "%ANS%"=="y" (
+ goto end
+) else if "%ANS%"=="n" (
+ echo "\x83o\x83b\x83`\x83t\x83@\x83C\x83\x8B\x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ exit /b
+) else (
+ goto fail
+)
+
+:end
+ ＠ echo on
+
+