Tera TermRevision: 9237
https://osdn.net/projects/ttssh2/scm/svn/commits/9237
Author: nmaya
Date: 2021-05-09 15:06:32 +0900 (Sun, 09 May 2021)
Log Message:
-----------
ビルド用バッチファイルを調整
VS2005にSP1が適用されているか・Platform SDKが導入されているかチェック
MF4-stable
r9218, r9219, r9228, r9235
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/9218
https://osdn.net/projects/ttssh2/scm/svn/commits/9219
https://osdn.net/projects/ttssh2/scm/svn/commits/9228
https://osdn.net/projects/ttssh2/scm/svn/commits/9235
Modified Paths:
--------------
trunk/installer/build.bat
trunk/libs/buildSFMT.bat
trunk/libs/buildall.bat
trunk/libs/buildopenssl11.bat
trunk/libs/openssl_patch/apply_patch.bat
-------------- next part --------------
Modified: trunk/installer/build.bat
===================================================================
--- trunk/installer/build.bat 2021-05-04 11:28:35 UTC (rev 9236)
+++ trunk/installer/build.bat 2021-05-09 06:06:32 UTC (rev 9237)
@@ -63,7 +63,7 @@
echo VS160COMNTOOLS=c:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\
@echo on
pause
-exit /b
+goto fail
:vsinstdir
rem Visual Studio\x82̃o\x81[\x83W\x83\x87\x83\x93\x94\xBB\x95\xCA
@@ -80,7 +80,7 @@
if /I %VSCMNDIR% EQU "%VS160COMNTOOLS%" goto vs2019
echo Unknown Visual Studio version
-exit /b
+goto fail
:vs2005
set TERATERMSLN=..\teraterm\ttermpro.v8.sln
@@ -89,8 +89,25 @@
set TTXKANJISLN=..\TTXKanjiMenu\ttxkanjimenu.v8.sln
set TTPMENUSLN=..\ttpmenu\ttpmenu.v8.sln
set TTXSAMPLESLN=..\TTXSamples\TTXSamples.v8.sln
-goto vsend
+rem VS2005\x82\xC9SP1\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82邩\x82\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9
+cl /? 2>&1 | findstr /C:"14.00.50727.762"
+echo %errorlevel%
+
+if %errorlevel% == 0 (
+ goto vsend
+)
+
+echo "VS2005\x82\xC9SP1\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82悤\x82ł\xB7"
+set /P ANS2005="\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9\x81H(y/n)"
+if "%ANS2005%"=="y" (
+ goto vsend
+) else (
+ echo "build.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ goto fail
+)
+
+
:vs2008
set TERATERMSLN=..\teraterm\ttermpro.v9.sln
set TTSSHSLN=..\ttssh2\ttssh.v9.sln
@@ -163,6 +180,10 @@
rem \x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0\x83R\x83\x93\x83p\x83C\x83\x8B
pushd ..\libs
CALL buildall.bat
+if ERRORLEVEL 1 (
+ echo "build.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ goto fail
+)
popd
Modified: trunk/libs/buildSFMT.bat
===================================================================
--- trunk/libs/buildSFMT.bat 2021-05-04 11:28:35 UTC (rev 9236)
+++ trunk/libs/buildSFMT.bat 2021-05-09 06:06:32 UTC (rev 9237)
@@ -34,7 +34,7 @@
GOTO END
:FILE_FALSE
-ECHO "\x83o\x81[\x83W\x83\x87\x83\x93\x83t\x83@\x83C\x83\x8B\x82\xAA\x8C\xA9\x82\xA9\x82\xE8\x82Ȃ\xA2\x82̂ŐV\x8BK\x8D쐬\x82\xB5\x82܂\xB7"
+ECHO "\x83o\x81[\x83W\x83\x87\x83\x93\x83t\x83@\x83C\x83\x8B\x82\xAA\x8C\xA9\x82\xA9\x82\xE7\x82Ȃ\xA2\x82̂ŐV\x8BK\x8D쐬\x82\xB5\x82܂\xB7"
echo #define SFMT_VERSION "Unknown" > %filename%
GOTO END
Modified: trunk/libs/buildall.bat
===================================================================
--- trunk/libs/buildall.bat 2021-05-04 11:28:35 UTC (rev 9236)
+++ trunk/libs/buildall.bat 2021-05-09 06:06:32 UTC (rev 9237)
@@ -1,4 +1,23 @@
CALL buildoniguruma6.bat
+if ERRORLEVEL 1 (
+ echo "buildall.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ exit /b 1
+)
+
CALL buildzlib.bat
+if ERRORLEVEL 1 (
+ echo "buildall.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ exit /b 1
+)
+
CALL buildopenssl11.bat
+if ERRORLEVEL 1 (
+ echo "buildall.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ exit /b 1
+)
+
CALL buildSFMT.bat
+if ERRORLEVEL 1 (
+ echo "buildall.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ exit /b 1
+)
Modified: trunk/libs/buildopenssl11.bat
===================================================================
--- trunk/libs/buildopenssl11.bat 2021-05-04 11:28:35 UTC (rev 9236)
+++ trunk/libs/buildopenssl11.bat 2021-05-09 06:06:32 UTC (rev 9237)
@@ -12,6 +12,10 @@
if ERRORLEVEL 1 goto patch_end
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
:patch_end
@@ -43,4 +47,26 @@
move apps\openssl.exe out32
:build_end
+
+rem Visual Studio 2005 \x82̏ꍇ\x82\xCD 2003 R2 Platform SDK \x82̓\xB1\x93\xFC\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9
+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 (
+ echo OpenSSL\x82̃r\x83\x8B\x83h\x82\xAA\x90\xB3\x8F\xED\x8FI\x97\xB9\x82\xB5\x82܂\xB5\x82\xBD\x81B
+)
+ ＠ echo on
+
+
+:end
cd ..
Modified: trunk/libs/openssl_patch/apply_patch.bat
===================================================================
--- trunk/libs/openssl_patch/apply_patch.bat 2021-05-04 11:28:35 UTC (rev 9236)
+++ trunk/libs/openssl_patch/apply_patch.bat 2021-05-09 06:06:32 UTC (rev 9237)
@@ -134,7 +134,6 @@
:patch_end
echo "\x83p\x83b\x83`\x82͓K\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7"
-timeout 5
goto end
@@ -142,16 +141,14 @@
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
+ 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
+ echo "apply_patch.bat \x82\xF0\x8FI\x97\xB9\x82\xB5\x82܂\xB7"
+ exit /b 1
)
-
goto end
+
:cmd_false
echo \x83p\x83b\x83`\x83R\x83}\x83\x93\x83h\x82\xAA\x8C\xA9\x82\xA9\x82\xE8\x82܂\xB9\x82\xF1
echo \x89\xBA\x8BL\x83T\x83C\x83g\x82\xA9\x82\xE7\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82āA..\%folder% \x82\xC9 Git-x.xx.x-32-bit.tar.bz2 \x93\xE0\x82\xCC
@@ -160,7 +157,6 @@
echo.
goto patchfail
+
:end
@echo on
-
-