patch.exe をリポジトリから削除
手動で配置が必要になった
PATH が通ったところに patch があればそれが利用されるようにした
branches/4-stable/doc/en/html/reference/develop.txt (diff) branches/4-stable/doc/ja/html/reference/develop.txt (diff)
branches/4-stable/libs/openssl_patch/patch.exe branches/4-stable/libs/openssl_patch/check_patch.bat (diff)| @@ -47,6 +47,9 @@ | ||
| 47 | 47 | Subversion for Windows (http://sourceforge.net/projects/win32svn/) |
| 48 | 48 | Use the compatible version for check-outed svn version. |
| 49 | 49 | Extract into libs\svn. ("svnversion.exe" is located in libs\svn\bin directory.) |
| 50 | + Patch | |
| 51 | + PATH の通ったところに patch がない場合は、libs\openssl_patch に "patch.exe" が配置されるようにしてください。 | |
| 52 | + https://gitforwindows.org/ (https://github.com/git-for-windows/git/releases/latest) からであれば、Git-x.xx.x-xx-bit.tar.bz2 をダウンロードして展開し、usr\bin 内の patch.exe, msys-gcc_s-1.dll, msys-2.0.dll をコピーします。 | |
| 50 | 53 | |
| 51 | 54 | |
| 52 | 55 | * Libraries |
| @@ -51,6 +51,9 @@ | ||
| 51 | 51 | Subversion for Windows (http://sourceforge.net/projects/win32svn/) |
| 52 | 52 | ソースのチェックアウトに使った svn と互換性のあるバージョン。 |
| 53 | 53 | libs\svn へ解凍します。("svnversion.exe" が libs\svn\bin に配置されるようにしてください) |
| 54 | + Patch | |
| 55 | + PATH の通ったところに patch がない場合は、libs\openssl_patch に "patch.exe" が配置されるようにしてください。 | |
| 56 | + https://gitforwindows.org/ (https://github.com/git-for-windows/git/releases/latest) からであれば、Git-x.xx.x-xx-bit.tar.bz2 をダウンロードして展開し、usr\bin 内の patch.exe, msys-gcc_s-1.dll, msys-2.0.dll をコピーします。 | |
| 54 | 57 | |
| 55 | 58 | |
| 56 | 59 | ■ ライブラリ |
| @@ -1,6 +1,8 @@ | ||
| 1 | 1 | @echo off |
| 2 | 2 | |
| 3 | -set folder=openssl_patch | |
| 3 | +rem cmdfolder は、patch を実行する .. から見た相対パス | |
| 4 | +set cmdfolder=openssl_patch | |
| 5 | + | |
| 4 | 6 | set cmdopt2=--binary --backup -p0 |
| 5 | 7 | set cmdopt1=--dry-run %cmdopt2% |
| 6 | 8 |
| @@ -10,14 +12,22 @@ | ||
| 10 | 12 | rem |
| 11 | 13 | |
| 12 | 14 | rem パッチコマンドの存在チェック |
| 13 | -set patchcmd="patch.exe" | |
| 14 | -if exist %patchcmd% (goto cmd_true) else goto cmd_false | |
| 15 | +rem ..\%cmdfolder%\patch.exe, PATHが通っているpatch の優先順 | |
| 16 | +pushd .. | |
| 17 | +set patchcmd="%cmdfolder%\patch.exe" | |
| 18 | +if exist %patchcmd% ( | |
| 19 | + popd | |
| 20 | + goto cmd_true | |
| 21 | +) | |
| 22 | +popd | |
| 15 | 23 | |
| 24 | +set patchcmd=patch | |
| 25 | +%patchcmd% -v | |
| 26 | +if %errorlevel% == 0 (goto cmd_true) else goto cmd_false | |
| 27 | + | |
| 16 | 28 | :cmd_true |
| 17 | 29 | |
| 18 | 30 | |
| 19 | -rem パッチの適用有無をチェック | |
| 20 | - | |
| 21 | 31 | :patch1 |
| 22 | 32 | rem freeaddrinfo/getnameinfo/getaddrinfo API(WindowsXP以降)依存除去のため |
| 23 | 33 | findstr /c:"# undef AI_PASSIVE" ..\openssl\crypto\bio\bio_local.h |
| @@ -25,8 +35,8 @@ | ||
| 25 | 35 | goto patch2 |
| 26 | 36 | :fail1 |
| 27 | 37 | pushd .. |
| 28 | -%folder%\patch %cmdopt1% < %folder%\ws2_32_dll_patch2.txt | |
| 29 | -%folder%\patch %cmdopt2% < %folder%\ws2_32_dll_patch2.txt | |
| 38 | +%patchcmd% %cmdopt1% < %folder%\ws2_32_dll_patch2.txt | |
| 39 | +%patchcmd% %cmdopt2% < %folder%\ws2_32_dll_patch2.txt | |
| 30 | 40 | popd |
| 31 | 41 | |
| 32 | 42 | :patch2 |
| @@ -44,8 +54,8 @@ | ||
| 44 | 54 | rem goto patch6 |
| 45 | 55 | rem :fail5 |
| 46 | 56 | rem pushd .. |
| 47 | -rem %folder%\patch %cmdopt1% < %folder%\RAND_bytes.txt | |
| 48 | -rem %folder%\patch %cmdopt2% < %folder%\RAND_bytes.txt | |
| 57 | +rem %patchcmd% %cmdopt1% < %folder%\RAND_bytes.txt | |
| 58 | +rem %patchcmd% %cmdopt2% < %folder%\RAND_bytes.txt | |
| 49 | 59 | rem popd |
| 50 | 60 | |
| 51 | 61 |
| @@ -56,8 +66,8 @@ | ||
| 56 | 66 | goto patch7 |
| 57 | 67 | :fail6 |
| 58 | 68 | pushd .. |
| 59 | -%folder%\patch %cmdopt1% < %folder%\atomic_api.txt | |
| 60 | -%folder%\patch %cmdopt2% < %folder%\atomic_api.txt | |
| 69 | +%patchcmd% %cmdopt1% < %folder%\atomic_api.txt | |
| 70 | +%patchcmd% %cmdopt2% < %folder%\atomic_api.txt | |
| 61 | 71 | popd |
| 62 | 72 | |
| 63 | 73 |
| @@ -69,8 +79,8 @@ | ||
| 69 | 79 | goto patch8 |
| 70 | 80 | :fail7 |
| 71 | 81 | pushd .. |
| 72 | -%folder%\patch %cmdopt1% < %folder%\CryptAcquireContextW2.txt | |
| 73 | -%folder%\patch %cmdopt2% < %folder%\CryptAcquireContextW2.txt | |
| 82 | +%patchcmd% %cmdopt1% < %folder%\CryptAcquireContextW2.txt | |
| 83 | +%patchcmd% %cmdopt2% < %folder%\CryptAcquireContextW2.txt | |
| 74 | 84 | popd |
| 75 | 85 | |
| 76 | 86 |
| @@ -85,8 +95,8 @@ | ||
| 85 | 95 | :fail8 |
| 86 | 96 | pushd .. |
| 87 | 97 | copy /b openssl\crypto\threads_win.c.orig openssl\crypto\threads_win.c.orig2 |
| 88 | -%folder%\patch %cmdopt1% < %folder%\atomic_api_win95.txt | |
| 89 | -%folder%\patch %cmdopt2% < %folder%\atomic_api_win95.txt | |
| 98 | +%patchcmd% %cmdopt1% < %folder%\atomic_api_win95.txt | |
| 99 | +%patchcmd% %cmdopt2% < %folder%\atomic_api_win95.txt | |
| 90 | 100 | popd |
| 91 | 101 | |
| 92 | 102 |
| @@ -99,8 +109,8 @@ | ||
| 99 | 109 | :fail9 |
| 100 | 110 | pushd .. |
| 101 | 111 | copy /b openssl\crypto\rand\rand_win.c.orig openssl\crypto\rand\rand_win.c.orig2 |
| 102 | -%folder%\patch %cmdopt1% < %folder%\CryptAcquireContextW_win95.txt | |
| 103 | -%folder%\patch %cmdopt2% < %folder%\CryptAcquireContextW_win95.txt | |
| 112 | +%patchcmd% %cmdopt1% < %folder%\CryptAcquireContextW_win95.txt | |
| 113 | +%patchcmd% %cmdopt2% < %folder%\CryptAcquireContextW_win95.txt | |
| 104 | 114 | popd |
| 105 | 115 | |
| 106 | 116 |
| @@ -128,9 +138,9 @@ | ||
| 128 | 138 | goto end |
| 129 | 139 | |
| 130 | 140 | :cmd_false |
| 131 | -echo パッチコマンド %patchcmd% が見つかりません | |
| 132 | -echo 下記サイトからダウンロードしてください | |
| 133 | -echo http://geoffair.net/projects/patch.htm | |
| 141 | +echo パッチコマンドが見つかりません | |
| 142 | +echo 下記サイトからダウンロードして、..\%cmdfolder% に patch.exe を配置してください | |
| 143 | +echo https://github.com/git-for-windows/git/releases/latest | |
| 134 | 144 | echo. |
| 135 | 145 | goto patchfail |
| 136 | 146 |
Tera Term