OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr

[Ttssh2-commit] [8938] patch.exe をリポジトリから削除

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2020年 9月 21日 (月) 09:52:58 JST 

Revision: 8938
          https://osdn.net/projects/ttssh2/scm/svn/commits/8938
Author:   nmaya
Date:     2020-09-21 09:52:57 +0900 (Mon, 21 Sep 2020)
Log Message:
-----------
patch.exe をリポジトリから削除

手動で配置が必要になった
PATH が通ったところに patch があればそれが利用されるようにした

Modified Paths:
--------------
    branches/4-stable/doc/en/html/reference/develop.txt
    branches/4-stable/doc/ja/html/reference/develop.txt
    branches/4-stable/libs/openssl_patch/check_patch.bat

Removed Paths:
-------------
    branches/4-stable/libs/openssl_patch/patch.exe

-------------- next part --------------
Modified: branches/4-stable/doc/en/html/reference/develop.txt
===================================================================
--- branches/4-stable/doc/en/html/reference/develop.txt	2020-09-11 15:47:32 UTC (rev 8937)
+++ branches/4-stable/doc/en/html/reference/develop.txt	2020-09-21 00:52:57 UTC (rev 8938)
@@ -47,6 +47,9 @@
   Subversion for Windows (http://sourceforge.net/projects/win32svn/)
     Use the compatible version for check-outed svn version.
     Extract into libs\svn. ("svnversion.exe" is located in libs\svn\bin directory.)
+  Patch
+    PATH \x82̒ʂ\xC1\x82\xBD\x82Ƃ\xB1\x82\xEB\x82\xC9 patch \x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82́Alibs\openssl_patch \x82\xC9 "patch.exe" \x82\xAA\x94z\x92u\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+    https://gitforwindows.org/ (https://github.com/git-for-windows/git/releases/latest) \x82\xA9\x82\xE7\x82ł\xA0\x82\xEA\x82΁AGit-x.xx.x-xx-bit.tar.bz2 \x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82ēW\x8AJ\x82\xB5\x81Ausr\bin \x93\xE0\x82\xCC patch.exe, msys-gcc_s-1.dll, msys-2.0.dll \x82\xF0\x83R\x83s\x81[\x82\xB5\x82܂\xB7\x81B
 
 
 * Libraries

Modified: branches/4-stable/doc/ja/html/reference/develop.txt
===================================================================
--- branches/4-stable/doc/ja/html/reference/develop.txt	2020-09-11 15:47:32 UTC (rev 8937)
+++ branches/4-stable/doc/ja/html/reference/develop.txt	2020-09-21 00:52:57 UTC (rev 8938)
@@ -51,6 +51,9 @@
   Subversion for Windows (http://sourceforge.net/projects/win32svn/)
     \x83\\x81[\x83X\x82̃`\x83F\x83b\x83N\x83A\x83E\x83g\x82Ɏg\x82\xC1\x82\xBD svn \x82ƌ݊\xB7\x90\xAB\x82̂\xA0\x82\xE9\x83o\x81[\x83W\x83\x87\x83\x93\x81B
     libs\svn \x82։𓀂\xB5\x82܂\xB7\x81B("svnversion.exe" \x82\xAA libs\svn\bin \x82ɔz\x92u\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2)
+  Patch
+    PATH \x82̒ʂ\xC1\x82\xBD\x82Ƃ\xB1\x82\xEB\x82\xC9 patch \x82\xAA\x82Ȃ\xA2\x8Fꍇ\x82́Alibs\openssl_patch \x82\xC9 "patch.exe" \x82\xAA\x94z\x92u\x82\xB3\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+    https://gitforwindows.org/ (https://github.com/git-for-windows/git/releases/latest) \x82\xA9\x82\xE7\x82ł\xA0\x82\xEA\x82΁AGit-x.xx.x-xx-bit.tar.bz2 \x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82ēW\x8AJ\x82\xB5\x81Ausr\bin \x93\xE0\x82\xCC patch.exe, msys-gcc_s-1.dll, msys-2.0.dll \x82\xF0\x83R\x83s\x81[\x82\xB5\x82܂\xB7\x81B
 
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A

Modified: branches/4-stable/libs/openssl_patch/check_patch.bat
===================================================================
--- branches/4-stable/libs/openssl_patch/check_patch.bat	2020-09-11 15:47:32 UTC (rev 8937)
+++ branches/4-stable/libs/openssl_patch/check_patch.bat	2020-09-21 00:52:57 UTC (rev 8938)
@@ -1,6 +1,8 @@
 @echo off
 
-set folder=openssl_patch
+rem cmdfolder \x82́Apatch \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9 .. \x82\xA9\x82猩\x82\xBD\x91\x8A\x91΃p\x83X
+set cmdfolder=openssl_patch
+
 set cmdopt2=--binary --backup -p0
 set cmdopt1=--dry-run %cmdopt2%
 
@@ -10,14 +12,22 @@
 rem
 
 rem \x83p\x83b\x83`\x83R\x83}\x83\x93\x83h\x82̑\xB6\x8D݃`\x83F\x83b\x83N
-set patchcmd="patch.exe"
-if exist %patchcmd% (goto cmd_true) else goto cmd_false
+rem ..\%cmdfolder%\patch.exe, PATH\x82\xAA\x92ʂ\xC1\x82Ă\xA2\x82\xE9patch \x82̗D\x90揇
+pushd ..
+set patchcmd="%cmdfolder%\patch.exe"
+if exist %patchcmd% (
+    popd
+    goto cmd_true
+)
+popd
 
+set patchcmd=patch
+%patchcmd% -v
+if %errorlevel% == 0 (goto cmd_true) else goto cmd_false
+
 :cmd_true
 
 
-rem \x83p\x83b\x83`\x82̓K\x97p\x97L\x96\xB3\x82\xF0\x83`\x83F\x83b\x83N
-
 :patch1
 rem freeaddrinfo/getnameinfo/getaddrinfo API(WindowsXP\x88ȍ~)\x88ˑ\xB6\x8F\x9C\x8B\x8E\x82̂\xBD\x82\xDF
 findstr /c:"# undef AI_PASSIVE" ..\openssl\crypto\bio\bio_local.h
@@ -25,8 +35,8 @@
 goto patch2
 :fail1
 pushd ..
-%folder%\patch %cmdopt1% < %folder%\ws2_32_dll_patch2.txt
-%folder%\patch %cmdopt2% < %folder%\ws2_32_dll_patch2.txt
+%patchcmd% %cmdopt1% < %folder%\ws2_32_dll_patch2.txt
+%patchcmd% %cmdopt2% < %folder%\ws2_32_dll_patch2.txt
 popd
 
 :patch2
@@ -44,8 +54,8 @@
 rem goto patch6
 rem :fail5
 rem pushd ..
-rem %folder%\patch %cmdopt1% < %folder%\RAND_bytes.txt
-rem %folder%\patch %cmdopt2% < %folder%\RAND_bytes.txt
+rem %patchcmd% %cmdopt1% < %folder%\RAND_bytes.txt
+rem %patchcmd% %cmdopt2% < %folder%\RAND_bytes.txt
 rem popd
 
 
@@ -56,8 +66,8 @@
 goto patch7
 :fail6
 pushd ..
-%folder%\patch %cmdopt1% < %folder%\atomic_api.txt
-%folder%\patch %cmdopt2% < %folder%\atomic_api.txt
+%patchcmd% %cmdopt1% < %folder%\atomic_api.txt
+%patchcmd% %cmdopt2% < %folder%\atomic_api.txt
 popd
 
 
@@ -69,8 +79,8 @@
 goto patch8
 :fail7
 pushd ..
-%folder%\patch %cmdopt1% < %folder%\CryptAcquireContextW2.txt
-%folder%\patch %cmdopt2% < %folder%\CryptAcquireContextW2.txt
+%patchcmd% %cmdopt1% < %folder%\CryptAcquireContextW2.txt
+%patchcmd% %cmdopt2% < %folder%\CryptAcquireContextW2.txt
 popd
 
 
@@ -85,8 +95,8 @@
 :fail8
 pushd ..
 copy /b openssl\crypto\threads_win.c.orig openssl\crypto\threads_win.c.orig2
-%folder%\patch %cmdopt1% < %folder%\atomic_api_win95.txt
-%folder%\patch %cmdopt2% < %folder%\atomic_api_win95.txt
+%patchcmd% %cmdopt1% < %folder%\atomic_api_win95.txt
+%patchcmd% %cmdopt2% < %folder%\atomic_api_win95.txt
 popd
 
 
@@ -99,8 +109,8 @@
 :fail9
 pushd ..
 copy /b openssl\crypto\rand\rand_win.c.orig openssl\crypto\rand\rand_win.c.orig2
-%folder%\patch %cmdopt1% < %folder%\CryptAcquireContextW_win95.txt
-%folder%\patch %cmdopt2% < %folder%\CryptAcquireContextW_win95.txt
+%patchcmd% %cmdopt1% < %folder%\CryptAcquireContextW_win95.txt
+%patchcmd% %cmdopt2% < %folder%\CryptAcquireContextW_win95.txt
 popd
 
 
@@ -128,9 +138,9 @@
 goto end
 
 :cmd_false
-echo \x83p\x83b\x83`\x83R\x83}\x83\x93\x83h %patchcmd% \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Ă\xAD\x82\xBE\x82\xB3\x82\xA2
-echo http://geoffair.net/projects/patch.htm
+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..\%cmdfolder% \x82\xC9 patch.exe \x82\xF0\x94z\x92u\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
+echo https://github.com/git-for-windows/git/releases/latest
 echo.
 goto patchfail
 

Deleted: branches/4-stable/libs/openssl_patch/patch.exe
===================================================================
(Binary files differ)

Ttssh2-commit メーリングリストの案内
Back to archive index