BuildArc.cmd: Use downloaded files

diff --git a/BuildArc.cmd b/BuildArc.cmd
index 6517bf2..605d6ea 100644 (file)
--- a/BuildArc.cmd
+++ b/BuildArc.cmd
@@ -1,49 +1,20 @@
-cd /d "%~dp0"
+pushd "%~dp0"
 
+setlocal
 call SetVersion.cmd
 set DISTDIR=.\Build\Releases
 set path="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%path%
 
+del /q /s "%DISTDIR%" > NUL 2> NUL
 mkdir "%DISTDIR%" 2> NUL
 
 copy "Build\WinMerge-%RCVER%-Setup.exe" "%DISTDIR%\WinMerge-%SAFEAPPVER%-Setup.exe"
 copy "Build\WinMerge-%RCVER%-x64-Setup.exe" "%DISTDIR%\WinMerge-%SAFEAPPVER%-x64-Setup.exe"
 
-mkdir "%DISTDIR%\zip-version\WinMerge\" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\Languages" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\Languages" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\Filters" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\Filters" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\MergePlugins" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\MergePlugins" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\Docs" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\Docs" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\frhed" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\frhed" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\frhed\Docs" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\frhed\Docs" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\frhed\Languages" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\frhed\Languages" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\WinIMerge" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\WinIMerge" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\Merge7z" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\Merge7z" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\Merge7z\Lang" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\Merge7z\Lang" 2> NUL
-
-mkdir "%DISTDIR%\zip-version\WinMerge\GnuWin32" 2> NUL
-mkdir "%DISTDIR%\x64-zip-version\WinMerge\GnuWin32" 2> NUL
+for %%i in (Languages Filters MergePlugins Docs Frhed\Docs Frhed\Languages WinIMerge Merge7z\Lang GnuWin32) do (
+  mkdir "%DISTDIR%\zip-version\WinMerge\%%i" 2> NUL
+  mkdir "%DISTDIR%\x64-zip-version\WinMerge\%%i" 2> NUL
+)
 
 rem Readme
 for %%i in (Translations\Docs\Readme\ReadMe-*.txt) do (
@@ -51,9 +22,17 @@ for %%i in (Translations\Docs\Readme\ReadMe-*.txt) do (
   copy "%%i" "%DISTDIR%\x64-zip-version\WinMerge\%%~nxi"
 )
 
+rem Docs
+for %%i in (Src\COPYING Docs\Users\Contributors.txt Docs\Users\Files.txt Docs\Users\ReadMe.txt) do (
+  copy "%%i" "%DISTDIR%\zip-version\WinMerge"
+  copy "%%i" "%DISTDIR%\x64-zip-version\WinMerge"
+)
+
 rem Help
-copy Build\Manual\htmlhelp\WinMerge.chm "%DISTDIR%\zip-version\WinMerge\Docs"
-copy Build\Manual\htmlhelp\WinMerge.chm "%DISTDIR%\x64-zip-version\WinMerge\Docs"
+for %%i in (Build\Manual\htmlhelp\WinMerge.chm Docs\Users\ReleaseNotes.html Docs\Users\ChangeLog.txt) do (
+  copy "%%i" "%DISTDIR%\zip-version\WinMerge\Docs"
+  copy "%%i" "%DISTDIR%\x64-zip-version\WinMerge\Docs"
+)
 
 rem Excecutables
 copy Build\MergeUnicodeRelease\WinMergeU.exe "%DISTDIR%\zip-version\WinMerge\"
@@ -61,9 +40,9 @@ copy Build\X64\MergeUnicodeRelease\WinMergeU.exe "%DISTDIR%\x64-zip-version\WinM
 copy Plugins\WinMerge32BitPluginProxy\Release\WinMerge32BitPluginProxy.exe "%DISTDIR%\x64-zip-version\WinMerge\"
 
 rem ShellExtension
-copy "Build\ShellExtensionUnicode Release mindependency\ShellExtensionU.dll" "%DISTDIR%\zip-version\WinMerge\"
-copy "Build\X64\ShellExtensionUnicode Release mindependency\ShellExtensionX64.dll" "%DISTDIR%\zip-version\WinMerge\"
-copy "Build\X64\ShellExtensionUnicode Release mindependency\ShellExtensionX64.dll" "%DISTDIR%\x64-zip-version\WinMerge\"
+copy "Build\ShellExtension\ShellExtensionU.dll" "%DISTDIR%\zip-version\WinMerge\"
+copy "Build\ShellExtension\ShellExtensionX64.dll" "%DISTDIR%\zip-version\WinMerge\"
+copy "Build\ShellExtension\ShellExtensionX64.dll" "%DISTDIR%\x64-zip-version\WinMerge\"
 copy ShellExtension\*Register.bat "%DISTDIR%\zip-version\WinMerge\"
 copy ShellExtension\*Register.bat "%DISTDIR%\x64-zip-version\WinMerge\"
 
@@ -74,9 +53,9 @@ copy Build\X64\MergeUnicodeRelease\Languages\*.po "%DISTDIR%\x64-zip-version\Win
 copy Build\X64\MergeUnicodeRelease\MergeLang.dll "%DISTDIR%\x64-zip-version\WinMerge\"
 
 rem Filters
-for %%i in (Build\Filters\*.flt Build\Filters\*.tmpl Build\Filters\*.txt) do (
-  copy "%%i" "%DISTDIR%\zip-version\WinMerge\Filters\%%~nxi"
-  copy "%%i" "%DISTDIR%\x64-zip-version\WinMerge\Filters\%%~nxi"
+for %%i in (Filters\*.flt Filters\*.tmpl Filters\*.txt) do (
+  copy "%%i" "%DISTDIR%\zip-version\WinMerge\Filters"
+  copy "%%i" "%DISTDIR%\x64-zip-version\WinMerge\Filters"
 )
 
 rem Plugins
@@ -86,53 +65,51 @@ copy Plugins\dlls\*.sct "%DISTDIR%\zip-version\WinMerge\MergePlugins\"
 copy Plugins\dlls\*.sct "%DISTDIR%\x64-zip-version\WinMerge\MergePlugins\"
 del "%DISTDIR%\zip-version\WinMerge\MergePlugins\CompareMS*.dll"
 del "%DISTDIR%\zip-version\WinMerge\MergePlugins\Watch*OfLog.dll"
-rem del "%DISTDIR%\zip-version\WinMerge\MergePlugins\DisplayXMLFiles.dll"
+del "%DISTDIR%\zip-version\WinMerge\MergePlugins\DisplayXMLFiles.dll"
 del "%DISTDIR%\x64-zip-version\WinMerge\MergePlugins\Watch*OfLog.dll"
-rem del "%DISTDIR%\x64-zip-version\WinMerge\MergePlugins\DisplayXMLFiles.dll"
+del "%DISTDIR%\x64-zip-version\WinMerge\MergePlugins\DisplayXMLFiles.dll"
 
 rem 7zPlugins
-copy Build\MergeUnicodeRelease\Merge7z\Merge7z*.dll "%DISTDIR%\zip-version\WinMerge\Merge7z\"
-copy Build\MergeUnicodeRelease\Merge7z\7z.dll "%DISTDIR%\zip-version\WinMerge\Merge7z\"
-copy Build\MergeUnicodeRelease\Merge7z\*.txt "%DISTDIR%\zip-version\WinMerge\Merge7z\"
-copy Build\MergeUnicodeRelease\Merge7z\Lang\*.txt "%DISTDIR%\zip-version\WinMerge\Merge7z\Lang\"
-copy Build\X64\MergeUnicodeRelease\Merge7z\Merge7z*.dll "%DISTDIR%\x64-zip-version\WinMerge\Merge7z\"
-copy Build\X64\MergeUnicodeRelease\Merge7z\7z.dll "%DISTDIR%\x64-zip-version\WinMerge\Merge7z\"
-copy Build\X64\MergeUnicodeRelease\Merge7z\*.txt "%DISTDIR%\x64-zip-version\WinMerge\Merge7z\"
-copy Build\X64\MergeUnicodeRelease\Merge7z\Lang\*.txt "%DISTDIR%\x64-zip-version\WinMerge\Merge7z\Lang\"
+copy Build\Merge7z\Merge7z*.dll "%DISTDIR%\zip-version\WinMerge\Merge7z\"
+copy Build\Merge7z\7z.dll "%DISTDIR%\zip-version\WinMerge\Merge7z\"
+copy Build\Merge7z\*.txt "%DISTDIR%\zip-version\WinMerge\Merge7z\"
+copy Build\Merge7z\Lang\*.txt "%DISTDIR%\zip-version\WinMerge\Merge7z\Lang\"
+copy Build\X64\Merge7z\Merge7z*.dll "%DISTDIR%\x64-zip-version\WinMerge\Merge7z\"
+copy Build\X64\Merge7z\7z.dll "%DISTDIR%\x64-zip-version\WinMerge\Merge7z\"
+copy Build\X64\Merge7z\*.txt "%DISTDIR%\x64-zip-version\WinMerge\Merge7z\"
+copy Build\X64\Merge7z\Lang\*.txt "%DISTDIR%\x64-zip-version\WinMerge\Merge7z\Lang\"
 
 rem Frhed
 copy Externals\Frhed\GPL.txt "%DISTDIR%\zip-version\WinMerge\frhed\"
-rem copy Externals\Frhed\Build\FRHED_vc10\Win32\UnicodeRelease\frhed.exe "%DISTDIR%\zip-version\WinMerge\frhed\"
-copy Externals\Frhed\Build\FRHED_vc10\Win32\UnicodeRelease\hekseditU.dll "%DISTDIR%\zip-version\WinMerge\frhed\"
-copy Externals\Frhed\Build\FRHED_vc10\Win32\UnicodeRelease\Docs\*.txt "%DISTDIR%\zip-version\WinMerge\frhed\Docs"
-copy Externals\Frhed\Build\FRHED_vc10\Win32\UnicodeRelease\Docs\Sample.tpl "%DISTDIR%\zip-version\WinMerge\frhed\Docs"
-copy Externals\Frhed\Build\FRHED_vc10\Win32\UnicodeRelease\Languages\*.po "%DISTDIR%\zip-version\WinMerge\frhed\Languages"
-copy Externals\Frhed\Build\FRHED_vc10\Win32\UnicodeRelease\Languages\heksedit.lng "%DISTDIR%\zip-version\WinMerge\frhed\Languages"
-copy Externals\Frhed\GPL.txt "%DISTDIR%\x64-zip-version\WinMerge\frhed\"
-rem copy Externals\Frhed\Build\FRHED_vc10\x64\UnicodeRelease\frhed.exe "%DISTDIR%\x64-zip-version\WinMerge\frhed\"
-copy Externals\Frhed\Build\FRHED_vc10\x64\UnicodeRelease\hekseditU.dll "%DISTDIR%\x64-zip-version\WinMerge\frhed\"
-copy Externals\Frhed\Build\FRHED_vc10\x64\UnicodeRelease\Docs\*.txt "%DISTDIR%\x64-zip-version\WinMerge\frhed\Docs"
-copy Externals\Frhed\Build\FRHED_vc10\x64\UnicodeRelease\Docs\Sample.tpl "%DISTDIR%\x64-zip-version\WinMerge\frhed\Docs"
-copy Externals\Frhed\Build\FRHED_vc10\x64\UnicodeRelease\Languages\*.po "%DISTDIR%\x64-zip-version\WinMerge\frhed\Languages"
-copy Externals\Frhed\Build\FRHED_vc10\x64\UnicodeRelease\Languages\heksedit.lng "%DISTDIR%\x64-zip-version\WinMerge\frhed\Languages"
+rem copy Build\Frhed\frhed.exe "%DISTDIR%\zip-version\WinMerge\frhed\"
+copy Build\Frhed\hekseditU.dll "%DISTDIR%\zip-version\WinMerge\frhed\"
+copy Build\Frhed\Docs\*.txt "%DISTDIR%\zip-version\WinMerge\frhed\Docs"
+copy Build\Frhed\Docs\Sample.tpl "%DISTDIR%\zip-version\WinMerge\frhed\Docs"
+copy Build\Frhed\Languages\*.po "%DISTDIR%\zip-version\WinMerge\frhed\Languages"
+copy Build\Frhed\Languages\heksedit.lng "%DISTDIR%\zip-version\WinMerge\frhed\Languages"
+copy Build\Frhed\GPL.txt "%DISTDIR%\x64-zip-version\WinMerge\frhed\"
+rem copy Build\x64Frhed\frhed.exe "%DISTDIR%\x64-zip-version\WinMerge\frhed\"
+copy Build\x64\Frhed\hekseditU.dll "%DISTDIR%\x64-zip-version\WinMerge\frhed\"
+copy Build\x64\Frhed\Docs\*.txt "%DISTDIR%\x64-zip-version\WinMerge\frhed\Docs"
+copy Build\x64\Frhed\Docs\Sample.tpl "%DISTDIR%\x64-zip-version\WinMerge\frhed\Docs"
+copy Build\x64\Frhed\Languages\*.po "%DISTDIR%\x64-zip-version\WinMerge\frhed\Languages"
+copy Build\x64\Frhed\Languages\heksedit.lng "%DISTDIR%\x64-zip-version\WinMerge\frhed\Languages"
 
 rem WinIMerge
-copy Externals\WinIMerge\GPL.txt "%DISTDIR%\zip-version\WinMerge\WinIMerge\"
-copy Externals\WinIMerge\freeimage-license-gplv2.txt "%DISTDIR%\zip-version\WinMerge\WinIMerge\"
-rem copy Externals\WinIMerge\Build\Release\WinIMerge.exe "%DISTDIR%\zip-version\WinMerge\WinIMerge\"
-copy Externals\WinIMerge\Build\Release\WinIMergeLib.dll "%DISTDIR%\zip-version\WinMerge\WinIMerge\"
-copy "%VS120COMNTOOLS%\..\..\VC\redist\x86\Microsoft.VC120.OpenMP\vcomp120.dll" "%DISTDIR%\zip-version\WinMerge\"
-copy "%VS140COMNTOOLS%\..\..\VC\redist\x86\Microsoft.VC140.OpenMP\vcomp140.dll" "%DISTDIR%\zip-version\WinMerge\"
-copy Externals\WinIMerge\GPL.txt "%DISTDIR%\x64-zip-version\WinMerge\WinIMerge\"
-copy Externals\WinIMerge\freeimage-license-gplv2.txt "%DISTDIR%\x64-zip-version\WinMerge\WinIMerge\"
-rem copy Externals\WinIMerge\Build\x64\Release\WinIMerge.exe "%DISTDIR%\x64-zip-version\WinMerge\WinIMerge\"
-copy Externals\WinIMerge\Build\x64\Release\WinIMergeLib.dll "%DISTDIR%\x64-zip-version\WinMerge\WinIMerge\"
-copy "%VS120COMNTOOLS%\..\..\VC\redist\x64\Microsoft.VC120.OpenMP\vcomp120.dll" "%DISTDIR%\x64-zip-version\WinMerge\"
-copy "%VS140COMNTOOLS%\..\..\VC\redist\x64\Microsoft.VC140.OpenMP\vcomp140.dll" "%DISTDIR%\x64-zip-version\WinMerge\"
+copy Build\WinIMerge\GPL.txt "%DISTDIR%\zip-version\WinMerge\WinIMerge\"
+copy Build\WinIMerge\freeimage-license-gplv2.txt "%DISTDIR%\zip-version\WinMerge\WinIMerge\"
+rem copy Build\WinIMerge\bin\WinIMerge.exe "%DISTDIR%\zip-version\WinMerge\WinIMerge\"
+copy Build\WinIMerge\bin\WinIMergeLib.dll "%DISTDIR%\zip-version\WinMerge\WinIMerge\"
+copy Build\WinIMerge\bin\vcomp*.dll "%DISTDIR%\zip-version\WinMerge\"
+copy Build\WinIMerge\GPL.txt "%DISTDIR%\x64-zip-version\WinMerge\WinIMerge\"
+copy Build\WinIMerge\freeimage-license-gplv2.txt "%DISTDIR%\x64-zip-version\WinMerge\WinIMerge\"
+rem copy Build\WinIMerge\bin64\WinIMerge.exe "%DISTDIR%\x64-zip-version\WinMerge\WinIMerge\"
+copy Build\WinIMerge\bin64\WinIMergeLib.dll "%DISTDIR%\x64-zip-version\WinMerge\WinIMerge\"
+copy Build\WinIMerge\bin64\vcomp*.dll "%DISTDIR%\zip-version\WinMerge\"
 
 rem Patch
-xcopy /s/y "C:\Program Files\WinMerge\GnuWin32" "%DISTDIR%\zip-version\WinMerge\GnuWin32\"
-xcopy /s/y "C:\Program Files\WinMerge\GnuWin32" "%DISTDIR%\x64-zip-version\WinMerge\GnuWin32\"
+xcopy /s/y Build\GnuWin32 "%DISTDIR%\zip-version\WinMerge\GnuWin32\"
+xcopy /s/y Build\GnuWin32 "%DISTDIR%\x64-zip-version\WinMerge\GnuWin32\"
 
 7z.exe a -tzip "%DISTDIR%\winmerge-%SAFEAPPVER%-exe.zip" "%DISTDIR%\zip-version\WinMerge\"
 7z.exe a -tzip "%DISTDIR%\winmerge-%SAFEAPPVER%-x64-exe.zip" "%DISTDIR%\x64-zip-version\WinMerge\"
@@ -160,4 +137,4 @@ for /F "delims=" %%f in ('type "%DISTDIR%\files.txt"') do (
   for /F %%h in ('certutil -hashfile %%f SHA256 ^| findstr -v hash') do echo %%~nxf: https://www.virustotal.com/en/file/%%h/analysis/
 )
 
-pause
+popd