X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=DownloadDeps.cmd;h=5b52091e7f3fe1d6835ad450f04b5ab812999113;hb=1453eab29353a48d1f9a857b6cc127c2165ea1d6;hp=d10556dd85eba5b83c07de141c86389371bd9cd3;hpb=8ec616a487ef3354f5b1a7a77c5e68ee54e91830;p=winmerge-jp%2Fwinmerge-jp.git

diff --git a/DownloadDeps.cmd b/DownloadDeps.cmd
index d10556dd8..5b52091e7 100644
--- a/DownloadDeps.cmd
+++ b/DownloadDeps.cmd
@@ -1,15 +1,29 @@
+@echo off
 setlocal
 set path="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%path%
+7z > NUL
+if not %ERRORLEVEL% == 0 (
+  echo 7-Zip is not installed
+  goto :eof
+)
+@echo on
+
 set downloadsdir=%~dp0\build\WinMergeDownloadDeps
 set urls_destdirs=^
 https://github.com/WinMerge/winmerge/releases/download/winmerge_manual_another_build_tools_v2/winmerge_manual_another_build_tools_v2.zip!Docs\Manual\Tools ^
-https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.17.13.0/ShellExtension-1.17.13.0.zip!Build ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.2/Merge7z1900.2-win32.zip!Build ^
-https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.2/Merge7z1900.2-x64.zip!Build\X64 ^
-https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.4-win32.zip!Build ^
-https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.4-x64.zip!Build\X64 ^
-https://github.com/WinMerge/winimerge/releases/download/1.0.18.0/winimerge-1-0-18-0-exe.zip!Build ^
+https://github.com/WinMerge/winmerge/releases/download/ShellExtension-1.17.14.0/ShellExtension-1.17.14.0.zip!Build ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-win32.zip!Build ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-x64.zip!Build\X64 ^
+https://github.com/WinMerge/winmerge/releases/download/Merge7z1900.5/Merge7z1900.5-ARM64.zip!Build\ARM64 ^
+https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-win32.zip!Build ^
+https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-x64.zip!Build\X64 ^
+https://github.com/WinMerge/frhed/releases/download/0.10904.2017/frhed-0.10904.2017.7-ARM64.zip!Build\ARM64 ^
+https://github.com/WinMerge/winimerge/releases/download/v1.0.30/winimerge-1.0.30.0-exe.zip!Build ^
 https://github.com/WinMerge/patch/releases/download/v2.5.9-7/patch-2.5.9-7-bin.zip!Build\GnuWin32 ^
+https://github.com/htacg/tidy-html5/releases/download/5.4.0/tidy-5.4.0-w32-mt-XP.zip!Build\tidy-html5 ^
+https://github.com/htacg/tidy-html5/archive/refs/tags/5.4.0.zip!Build\tidy-html5 ^
+https://github.com/stedolan/jq/releases/download/jq-1.4/jq-win32.exe!Build\jq ^
+https://github.com/stedolan/jq/archive/refs/tags/jq-1.4.zip!Build\jq ^
 http://www.magicnotes.com/steelbytes/SBAppLocale_ENG.zip!Docs\Manual\Tools
 
 pushd "%~dp0"
@@ -20,7 +34,50 @@ for %%p in (%urls_destdirs%) do (
     if not exist %downloadsdir%\%%~nxu (
       powershell -command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest %%u -Outfile %downloadsdir%\%%~nxu"
     )
-    7z x %downloadsdir%\%%~nxu -aoa -o%%v
+    if "%%~xu" == ".zip" (
+      7z x %downloadsdir%\%%~nxu -aoa -o%%v
+    ) else (
+      mkdir %%v > NUL
+      copy %downloadsdir%\%%~nxu %%v
+    )
+  )
+)
+
+for /d %%i in (build\tidy-html5\tidy-5.4.0-w32-mt-XP\*) do move %%i build\tidy-html5\
+
+for %%i in (Build Build\X64 Build\ARM64) do (
+  for %%j in (Release Debug Test) do (
+    mkdir %%i\%%j\Merge7z 2> NUL
+    mkdir %%i\%%j\WinIMerge 2> NUL
+    mkdir %%i\%%j\Frhed 2> NUL
+    mkdir %%i\%%j\Filters 2> NUL
+    mkdir %%i\%%j\ColorSchemes 2> NUL
+    mkdir %%i\%%j\MergePlugins 2> NUL
+    mkdir %%i\%%j\Commands\jq 2> NUL
+    mkdir %%i\%%j\Commands\tidy-html5 2> NUL
+    mkdir %%i\%%j\Commands\GnuWin32 2> NUL
+    xcopy /s/y %%i\Merge7z %%i\%%j\Merge7z\
+    xcopy /s/y %%i\Frhed %%i\%%j\Frhed\
+    xcopy /s/y Build\GnuWin32 %%i\%%j\Commands\GnuWin32\
+    copy Build\jq\jq-win32.exe %%i\%%j\Commands\jq\jq.exe
+    copy Build\jq\jq-jq-1.4\COPYING %%i\%%j\Commands\jq\
+    copy Build\tidy-html5\bin\tidy.* %%i\%%j\Commands\tidy-html5\
+    copy Build\tidy-html5\tidy-html5-5.4.0\README\LICENSE.md %%i\%%j\Commands\tidy-html5\
+    xcopy /s/y Plugins\Commands %%i\%%j\Commands
+    xcopy /s/y Filters %%i\%%j\Filters\
+    xcopy /s/y ColorSchemes %%i\%%j\ColorSchemes\
+    xcopy /s/y Plugins\dlls\*.sct %%i\%%j\MergePlugins\
+    xcopy /s/y Plugins\Plugins.xml %%i\%%j\MergePlugins\
+    if "%%i" == "Build" (
+      copy Build\WinIMerge\bin\WinIMergeLib.dll %%i\%%j\WinIMerge\
+      copy Plugins\dlls\*.dll %%i\%%j\MergePlugins\
+    ) else if "%%i" == "Build\X64" (
+      copy Build\WinIMerge\bin64\WinIMergeLib.dll %%i\%%j\WinIMerge\
+      copy Plugins\dlls\X64\*.dll %%i\%%j\MergePlugins\
+    ) else if "%%i" == "Build\ARM64" (
+      copy Build\WinIMerge\binARM64\WinIMergeLib.dll %%i\%%j\WinIMerge\
+      copy Plugins\dlls\ARM64\*.dll %%i\%%j\MergePlugins\
+    )
   )
 )