X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=z_build.bat;h=a99af23fe12aad59b180fb94ebe46647229c1a03;hb=413c93a4586c8366bcf2c94180f4cd746fe49644;hp=aefd41f875c4af8414abe6ce375838d0eefdf8b4;hpb=3bc039eb9e9d953cf38f82f0068340f47d726eab;p=x264-launcher%2Fx264-launcher.git diff --git a/z_build.bat b/z_build.bat index aefd41f..a99af23 100644 --- a/z_build.bat +++ b/z_build.bat @@ -2,16 +2,14 @@ REM /////////////////////////////////////////////////////////////////////////// REM // Set Paths REM /////////////////////////////////////////////////////////////////////////// -set "MSVC_PATH=C:\Program Files\Microsoft Visual Studio 12.0\VC" -set "NSIS_PATH=C:\Program Files\NSIS\Unicode" -set "QTVC_PATH=C:\Qt\4.8.5" -set "UPX3_PATH=C:\Program Files\UPX" +set "MSVC_PATH=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build" +set "TOOLS_VER=143" +set "SLN_FNAME=x264_launcher_MSVC2022.sln" REM ############################################### REM # DO NOT MODIFY ANY LINES BELOW THIS LINE !!! # REM ############################################### - REM /////////////////////////////////////////////////////////////////////////// REM // Setup environment REM /////////////////////////////////////////////////////////////////////////// @@ -26,20 +24,24 @@ if "%VCINSTALLDIR%"=="" ( echo %%VCINSTALLDIR%% not specified. Please check your MSVC_PATH var! goto BuildError ) -if "%QTDIR%"=="" ( - echo %%QTDIR%% not specified. Please check your MSVC_PATH var! +if not exist "%VCToolsInstallDir%\bin\HostX86\x86\cl.exe" ( + echo C++ compiler not found. Please check your MSVC_PATH var! goto BuildError ) -if not exist "%VCINSTALLDIR%\bin\cl.exe" ( - echo C++ compiler not found. Please check your MSVC_PATH var! +if "%QTDIR%"=="" ( + echo %%QTDIR%% not specified. Please check your QTDIR var! goto BuildError ) if not exist "%QTDIR%\bin\moc.exe" ( - echo Qt meta compiler not found. Please check your QTVC_PATH var! + echo Qt meta compiler not found. Please check your QTDIR var! + goto BuildError +) +if not exist "%QTDIR%\include\QtCore\qglobal.h" ( + echo %%QTDIR%% header files not found. Please check your QTDIR var! goto BuildError ) -if not exist "%PDOC_PATH%\pandoc.exe" ( - echo Pandoc binary could not be found. Please check your PDOC_PATH var! +if not exist "%JAVA_HOME%\bin\java.exe" ( + echo Java runtime not found. Please check your JAVA_HOME var! goto BuildError ) @@ -48,25 +50,35 @@ REM // Get current date and time (in ISO format) REM /////////////////////////////////////////////////////////////////////////// set "ISO_DATE=" set "ISO_TIME=" -if not exist "%~dp0\etc\date.exe" BuildError -for /F "tokens=1,2 delims=:" %%a in ('"%~dp0\etc\date.exe" +ISODATE:%%Y-%%m-%%d') do ( +if not exist "%~dp0\..\Prerequisites\MSYS\1.0\bin\date.exe" goto BuildError +for /F "tokens=1,2 delims=:" %%a in ('"%~dp0\..\Prerequisites\MSYS\1.0\bin\date.exe" +ISODATE:%%Y-%%m-%%d') do ( if "%%a"=="ISODATE" set "ISO_DATE=%%b" ) -for /F "tokens=1,2,3,4 delims=:" %%a in ('"%~dp0\etc\date.exe" +ISOTIME:%%T') do ( +for /F "tokens=1,2,3,4 delims=:" %%a in ('"%~dp0\..\Prerequisites\MSYS\1.0\bin\date.exe" +ISOTIME:%%T') do ( if "%%a"=="ISOTIME" set "ISO_TIME=%%b:%%c:%%d" ) if "%ISO_DATE%"=="" goto BuildError if "%ISO_TIME%"=="" goto BuildError REM /////////////////////////////////////////////////////////////////////////// +REM // Clean up temp files +REM /////////////////////////////////////////////////////////////////////////// +echo --------------------------------------------------------------------- +echo CLEAN UP +echo --------------------------------------------------------------------- +for %%i in (bin,obj,tmp) do ( + del /Q /S /F "%~dp0\%%i\*.*" +) + +REM /////////////////////////////////////////////////////////////////////////// REM // Build the binaries REM /////////////////////////////////////////////////////////////////////////// echo --------------------------------------------------------------------- echo BEGIN BUILD echo --------------------------------------------------------------------- -MSBuild.exe /property:Configuration=release /target:clean "%~dp0\x264_launcher_MSVC2013.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 /target:rebuild "%~dp0\x264_launcher_MSVC2013.sln" +MSBuild.exe /property:Configuration=release /property:Platform=win32 /target:rebuild "%~dp0\%SLN_FNAME%" if not "%ERRORLEVEL%"=="0" goto BuildError REM /////////////////////////////////////////////////////////////////////////// @@ -87,47 +99,64 @@ echo --------------------------------------------------------------------- set "PACK_PATH=%TMP%\~%RANDOM%%RANDOM%.tmp" mkdir "%PACK_PATH%" mkdir "%PACK_PATH%\imageformats" +mkdir "%PACK_PATH%\toolset\common" mkdir "%PACK_PATH%\toolset\x86" mkdir "%PACK_PATH%\toolset\x64" -mkdir "%PACK_PATH%\toolset\common" +mkdir "%PACK_PATH%\toolset\x86\nvencc" +mkdir "%PACK_PATH%\toolset\x64\nvencc" mkdir "%PACK_PATH%\sources" -copy "%~dp0\bin\Release\*.exe" "%PACK_PATH%" -copy "%~dp0\bin\Release\toolset\x86\*.exe" "%PACK_PATH%\toolset\x86" -copy "%~dp0\bin\Release\toolset\x86\*.dll" "%PACK_PATH%\toolset\x86" -copy "%~dp0\bin\Release\toolset\x64\*.exe" "%PACK_PATH%\toolset\x64" -copy "%~dp0\bin\Release\toolset\x64\*.dll" "%PACK_PATH%\toolset\x64" -copy "%~dp0\bin\Release\toolset\common\*.exe" "%PACK_PATH%\toolset\common" -copy "%~dp0\bin\Release\toolset\common\*.gpg" "%PACK_PATH%\toolset\common" -copy "%~dp0\etc\sources\*.tar" "%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\*.crt" "%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 /////////////////////////////////////////////////////////////////////////// -for %%i in (100, 110, 120) do ( - if exist "%MSVC_PATH%\redist\x86\Microsoft.VC%%i.CRT\*.dll" ( - copy "%MSVC_PATH%\redist\x86\Microsoft.VC%%i.CRT\msvc?%%i.dll" "%PACK_PATH%" - ) +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\10.0.17763\x86\*.dll" "%PACK_PATH%" ) -copy "%QTVC_PATH%\bin\QtCore4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\bin\QtGui4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\bin\QtSvg4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\bin\QtXml4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\bin\QtXml4.dll" "%PACK_PATH%" -copy "%QTVC_PATH%\plugins\imageformats\*.dll" "%PACK_PATH%\imageformats" -del "%PACK_PATH%\imageformats\*d4.dll" REM /////////////////////////////////////////////////////////////////////////// REM // Generate Docs REM /////////////////////////////////////////////////////////////////////////// -"%PDOC_PATH%\pandoc.exe" --from markdown_github+header_attributes --to html5 --standalone -H "%~dp0\etc\css\style.inc" "%~dp0\README.md" --output "%PACK_PATH%\README.html" +"%~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 /////////////////////////////////////////////////////////////////////////// -"%UPX3_PATH%\upx.exe" --brute "%PACK_PATH%\*.exe" -"%UPX3_PATH%\upx.exe" --best "%PACK_PATH%\*.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 @@ -160,20 +189,31 @@ REM /////////////////////////////////////////////////////////////////////////// REM // Create Tag REM /////////////////////////////////////////////////////////////////////////// echo Simple x264/x265 Launcher - graphical front-end for x264 and x265 > "%PACK_PATH%\BUILD_TAG.txt" -echo Copyright (C) 2004-2014 LoRd_MuldeR ^ >> "%PACK_PATH%\BUILD_TAG.txt" +echo Copyright (C) 2004-2021 LoRd_MuldeR ^ >> "%PACK_PATH%\BUILD_TAG.txt" echo. >> "%PACK_PATH%\BUILD_TAG.txt" echo Build #%BUILD_NO%, created on %ISO_DATE% at %ISO_TIME% >> "%PACK_PATH%\BUILD_TAG.txt" echo. >> "%PACK_PATH%\BUILD_TAG.txt" echo. >> "%PACK_PATH%\BUILD_TAG.txt" -"%~dp0\etc\cat.exe" "%~dp0\etc\setup\build.nfo" >> "%PACK_PATH%\BUILD_TAG.txt" +"%~dp0\..\Prerequisites\MSYS\1.0\bin\cat.exe" "%~dp0\etc\setup\build.nfo" >> "%PACK_PATH%\BUILD_TAG.txt" REM /////////////////////////////////////////////////////////////////////////// REM // Build the installer REM /////////////////////////////////////////////////////////////////////////// -"%NSIS_PATH%\makensis.exe" "/DX264_UPX_PATH=%UPX3_PATH%" "/DX264_DATE=%ISO_DATE%" "/DX264_BUILD=%BUILD_NO%" "/DX264_OUTPUT_FILE=%OUT_PATH%.sfx" "/DX264_SOURCE_PATH=%PACK_PATH%" "%~dp0\etc\setup\setup.nsi" +"%~dp0\..\Prerequisites\NSIS\makensis.exe" "/DX264_DATE=%ISO_DATE%" "/DX264_BUILD=%BUILD_NO%" "/DX264_OUTPUT_FILE=%OUT_PATH%.sfx" "/DX264_SOURCE_PATH=%PACK_PATH%" "%~dp0\etc\setup\setup.nsi" +if not "%ERRORLEVEL%"=="0" goto BuildError + +"%~dp0\..\Prerequisites\NSIS\peheader.exe" "%OUT_PATH%.sfx" +if not "%ERRORLEVEL%"=="0" goto BuildError + +call "%~dp0\..\Prerequisites\SevenZip\7zSDex.cmd" "%OUT_PATH%.sfx" "%OUT_PATH%.exe" "Simple x264/x265 Launcher" "x264-setup-r%BUILD_NO%" +if not "%ERRORLEVEL%"=="0" goto BuildError + +set "VERPATCH_PRODUCT=Simple x264/x265 Launcher (Setup)" +set "VERPATCH_FILEVER=%ISO_DATE:-=.%.%BUILD_NO%" +"%~dp0\..\Prerequisites\VerPatch\verpatch.exe" "%OUT_PATH%.exe" "%VERPATCH_FILEVER%" /pv "%VERPATCH_FILEVER%" /fn /s desc "%VERPATCH_PRODUCT%" /s product "%VERPATCH_PRODUCT%" /s title "x264 Launcher Installer SFX" /s copyright "Copyright (C) 2004-2021 LoRd_MuldeR" /s company "Free Software Foundation" if not "%ERRORLEVEL%"=="0" goto BuildError -"%NSIS_PATH%\makensis.exe" "/DX264_UPX_PATH=%UPX3_PATH%" "/DX264_DATE=%ISO_DATE%" "/DX264_BUILD=%BUILD_NO%" "/DX264_OUTPUT_FILE=%OUT_PATH%.exe" "/DX264_SOURCE_FILE=%OUT_PATH%.sfx" "%~dp0\etc\setup\wrapper.nsi" +"%~dp0\..\Prerequisites\NSIS\peheader.exe" "%OUT_PATH%.exe" if not "%ERRORLEVEL%"=="0" goto BuildError attrib +R "%OUT_PATH%.exe" @@ -183,7 +223,7 @@ REM /////////////////////////////////////////////////////////////////////////// REM // Build ZIP package REM /////////////////////////////////////////////////////////////////////////// pushd "%PACK_PATH%" -"%~dp0\etc\zip.exe" -r -9 -z "%OUT_PATH%.zip" "*.*" < "%PACK_PATH%\BUILD_TAG.txt" +"%~dp0\..\Prerequisites\InfoZip\zip.exe" -r -9 -z "%OUT_PATH%.zip" "*.*" < "%PACK_PATH%\BUILD_TAG.txt" popd if not "%ERRORLEVEL%"=="0" goto BuildError