From 2c475919da96cbdea40e4dc9708f4eff0e72d3cd Mon Sep 17 00:00:00 2001 From: lordmulder Date: Fri, 10 Apr 2020 15:17:45 +0200 Subject: [PATCH] Updated build script. --- src/version.h | 2 +- z_build.bat | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/version.h b/src/version.h index a291913..983abe4 100644 --- a/src/version.h +++ b/src/version.h @@ -26,7 +26,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 9 #define VER_X264_PATCH 5 -#define VER_X264_BUILD 1196 +#define VER_X264_BUILD 1197 #define VER_X264_PORTABLE_EDITION (0) diff --git a/z_build.bat b/z_build.bat index 962d79c..55d8f27 100644 --- a/z_build.bat +++ b/z_build.bat @@ -50,11 +50,11 @@ REM // Get current date and time (in ISO format) REM /////////////////////////////////////////////////////////////////////////// set "ISO_DATE=" set "ISO_TIME=" -if not exist "%~dp0\..\Prerequisites\GnuWin32\date.exe" BuildError -for /F "tokens=1,2 delims=:" %%a in ('"%~dp0\..\Prerequisites\GnuWin32\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\..\Prerequisites\GnuWin32\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 @@ -194,7 +194,7 @@ 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\..\Prerequisites\GnuWin32\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 @@ -223,7 +223,7 @@ REM /////////////////////////////////////////////////////////////////////////// REM // Build ZIP package REM /////////////////////////////////////////////////////////////////////////// pushd "%PACK_PATH%" -"%~dp0\..\Prerequisites\GnuWin32\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