Removed debug break-point.

[x264-launcher/x264-launcher.git] / z_build.bat

diff --git a/z_build.bat b/z_build.bat
index c98d1bc..d2b8ff2 100644 (file)
--- a/z_build.bat
+++ b/z_build.bat
@@ -2,8 +2,9 @@
 REM ///////////////////////////////////////////////////////////////////////////
 REM // Set Paths
 REM ///////////////////////////////////////////////////////////////////////////
-set "MSVC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build"
-set "TOOLS_VER=141"
+set "MSVC_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build"
+set "TOOLS_VER=142"
+set "SLN_FNAME=x264_launcher_MSVC2019.sln"
 
 REM ###############################################
 REM # DO NOT MODIFY ANY LINES BELOW THIS LINE !!! #
@@ -75,9 +76,9 @@ REM ///////////////////////////////////////////////////////////////////////////
 echo ---------------------------------------------------------------------
 echo BEGIN BUILD
 echo ---------------------------------------------------------------------
-MSBuild.exe /property:Configuration=release /property:Platform=win32 /target:clean   "%~dp0\x264_launcher_MSVC2017.sln"
+MSBuild.exe /property:Configuration=release /property:Platform=win32 /target:clean   "%~dp0\%SLN_FNAME%"
 if not "%ERRORLEVEL%"=="0" goto BuildError
-MSBuild.exe /property:Configuration=release /property:Platform=win32 /target:rebuild "%~dp0\x264_launcher_MSVC2017.sln"
+MSBuild.exe /property:Configuration=release /property:Platform=win32 /target:rebuild "%~dp0\%SLN_FNAME%"
 if not "%ERRORLEVEL%"=="0" goto BuildError
 
 REM ///////////////////////////////////////////////////////////////////////////
@@ -104,32 +105,40 @@ mkdir "%PACK_PATH%\toolset\x64"
 mkdir "%PACK_PATH%\toolset\x86\nvencc"
 mkdir "%PACK_PATH%\toolset\x64\nvencc"
 mkdir "%PACK_PATH%\sources"
-copy "%~dp0\bin\Win32\Release\x264_launcher.exe"        "%PACK_PATH%"
-copy "%~dp0\bin\Win32\Release\MUtils32-?.dll"           "%PACK_PATH%"
-copy "%~dp0\bin\Win32\Release\toolset\common\*.exe"     "%PACK_PATH%\toolset\common"
-copy "%~dp0\bin\Win32\Release\toolset\common\*.gpg"     "%PACK_PATH%\toolset\common"
-copy "%~dp0\bin\Win32\Release\toolset\x86\*.exe"        "%PACK_PATH%\toolset\x86"
-copy "%~dp0\bin\Win32\Release\toolset\x86\*.dll"        "%PACK_PATH%\toolset\x86"
-copy "%~dp0\bin\Win32\Release\toolset\x64\*.exe"        "%PACK_PATH%\toolset\x64"
-copy "%~dp0\bin\Win32\Release\toolset\x64\*.dll"        "%PACK_PATH%\toolset\x64"
-copy "%~dp0\bin\Win32\Release\toolset\x86\nvencc\*.exe" "%PACK_PATH%\toolset\x86\nvencc\"
-copy "%~dp0\bin\Win32\Release\toolset\x86\nvencc\*.dll" "%PACK_PATH%\toolset\x86\nvencc\"
-copy "%~dp0\bin\Win32\Release\toolset\x64\nvencc\*.exe" "%PACK_PATH%\toolset\x64\nvencc\"
-copy "%~dp0\bin\Win32\Release\toolset\x64\nvencc\*.dll" "%PACK_PATH%\toolset\x64\nvencc\"
-copy "%~dp0\etc\sources\*.xz"                           "%PACK_PATH%\sources"
-copy "%~dp0\LICENSE.html"                               "%PACK_PATH%"
-copy "%~dp0\*.txt"                                      "%PACK_PATH%"
+copy "%~dp0\bin\Win32\Release\x264_launcher.exe" "%PACK_PATH%"
+copy "%~dp0\bin\Win32\Release\MUtils32-?.dll"    "%PACK_PATH%"
+copy "%~dp0\res\toolset\*.txt"                   "%PACK_PATH%\toolset"
+copy "%~dp0\res\toolset\common\*.exe"            "%PACK_PATH%\toolset\common"
+copy "%~dp0\res\toolset\common\*.gpg"            "%PACK_PATH%\toolset\common"
+copy "%~dp0\res\toolset\x86\*.exe"               "%PACK_PATH%\toolset\x86"
+copy "%~dp0\res\toolset\x86\*.dll"               "%PACK_PATH%\toolset\x86"
+copy "%~dp0\res\toolset\x64\*.exe"               "%PACK_PATH%\toolset\x64"
+copy "%~dp0\res\toolset\x64\*.dll"               "%PACK_PATH%\toolset\x64"
+copy "%~dp0\res\toolset\x86\nvencc\*.exe"        "%PACK_PATH%\toolset\x86\nvencc\"
+copy "%~dp0\res\toolset\x86\nvencc\*.dll"        "%PACK_PATH%\toolset\x86\nvencc\"
+copy "%~dp0\res\toolset\x64\nvencc\*.exe"        "%PACK_PATH%\toolset\x64\nvencc\"
+copy "%~dp0\res\toolset\x64\nvencc\*.dll"        "%PACK_PATH%\toolset\x64\nvencc\"
+copy "%~dp0\etc\sources\*.xz"                    "%PACK_PATH%\sources"
+copy "%~dp0\etc\sources\*.txt"                   "%PACK_PATH%\sources"
+copy "%~dp0\LICENSE.html"                        "%PACK_PATH%"
+copy "%~dp0\*.txt"                               "%PACK_PATH%"
 
 REM ///////////////////////////////////////////////////////////////////////////
 REM // Copy dependencies
 REM ///////////////////////////////////////////////////////////////////////////
-copy "%~dp0\..\Prerequisites\MSVC\redist\vc\v%TOOLS_VER%_xp\x86\*.dll"              "%PACK_PATH%"
-copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtCore4.dll"            "%PACK_PATH%"
-copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtGui4.dll"             "%PACK_PATH%"
-copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtSvg4.dll"             "%PACK_PATH%"
-copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtXml4.dll"             "%PACK_PATH%"
-copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtXml4.dll"             "%PACK_PATH%"
-copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\plugins\imageformats\*.dll" "%PACK_PATH%\imageformats"
+if %TOOLS_VER% GEQ 142 (
+       set "PATH_REDIST_QT=%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%"
+       set "PATH_REDIST_VC=%~dp0\..\Prerequisites\MSVC\redist\vc\v%TOOLS_VER%"
+) else (
+       set "PATH_REDIST_QT=%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp"
+       set "PATH_REDIST_VC=%~dp0\..\Prerequisites\MSVC\redist\vc\v%TOOLS_VER%_xp"
+)
+copy "%PATH_REDIST_VC%\x86\*.dll"                         "%PACK_PATH%"
+copy "%PATH_REDIST_QT%\Shared\bin\QtCore4.dll"            "%PACK_PATH%"
+copy "%PATH_REDIST_QT%\Shared\bin\QtGui4.dll"             "%PACK_PATH%"
+copy "%PATH_REDIST_QT%\Shared\bin\QtSvg4.dll"             "%PACK_PATH%"
+copy "%PATH_REDIST_QT%\Shared\bin\QtXml4.dll"             "%PACK_PATH%"
+copy "%PATH_REDIST_QT%\Shared\plugins\imageformats\*.dll" "%PACK_PATH%\imageformats"
 del "%PACK_PATH%\imageformats\*d4.dll" 2> NUL
 if %TOOLS_VER% GEQ 140 (
        copy "%~dp0\..\Prerequisites\MSVC\redist\ucrt\DLLs\x86\*.dll" "%PACK_PATH%"
@@ -141,11 +150,13 @@ REM ///////////////////////////////////////////////////////////////////////////
 "%~dp0\..\Prerequisites\Pandoc\pandoc.exe" --from markdown_github+pandoc_title_block+header_attributes+implicit_figures --to html5 --toc -N --standalone -H "%~dp0\etc\css\style.inc" "%~dp0\README.md" | "%JAVA_HOME%\bin\java.exe" -jar "%~dp0\..\Prerequisites\HTMLCompressor\bin\htmlcompressor-1.5.3.jar" --compress-css -o "%PACK_PATH%\README.html"
 
 REM ///////////////////////////////////////////////////////////////////////////
-REM // Compress
+REM // Cleanse binaries
 REM ///////////////////////////////////////////////////////////////////////////
-"%~dp0\..\Prerequisites\UPX\upx.exe" --best "%PACK_PATH%\x264_launcher.exe"
-"%~dp0\..\Prerequisites\UPX\upx.exe" --best "%PACK_PATH%\MUtils32-1.dll"
-"%~dp0\..\Prerequisites\UPX\upx.exe" --best "%PACK_PATH%\Qt*.dll"
+"..\Prerequisites\RichHeaderEraser\rchhdrrsr.exe" "%PACK_PATH%\*.exe" "%PACK_PATH%\MUtils32*.dll" "%PACK_PATH%\Qt*.dll"
+
+:: "%~dp0\..\Prerequisites\UPX\upx.exe" --best "%PACK_PATH%\x264_launcher.exe"
+:: "%~dp0\..\Prerequisites\UPX\upx.exe" --best "%PACK_PATH%\MUtils32-1.dll"
+:: "%~dp0\..\Prerequisites\UPX\upx.exe" --best "%PACK_PATH%\Qt*.dll"
 
 REM ///////////////////////////////////////////////////////////////////////////
 REM // Attributes