From 1218beb69650ea7c9c256dde6735365ccbeb39cb Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Fri, 10 Apr 2020 13:32:42 +0200 Subject: [PATCH] Updated build script. --- doc/Changelog.html | 2 +- etc/Deployment/_copy.bat | 20 ++++++++++++++++---- etc/Deployment/_date.bat | 4 ++-- etc/Deployment/make.bat | 6 +++--- 4 files changed, 22 insertions(+), 10 deletions(-) rewrite doc/Changelog.html (75%) diff --git a/doc/Changelog.html b/doc/Changelog.html dissimilarity index 75% index 90e550c4..2e55ccb9 100644 --- a/doc/Changelog.html +++ b/doc/Changelog.html @@ -1 +1 @@ - LameXP

LameXP

Audio-Encoder Front-End – Changelog

1 LameXP v4.xx History

LameXP v4.19 [unreleased]

LameXP v4.18 [2019-12-18]

LameXP v4.17 [2018-11-10]

LameXP v4.16 [2018-04-30]

LameXP v4.15 [2017-05-31]

LameXP v4.14 [2016-11-19]

LameXP v4.13 [2015-12-12]

LameXP v4.12 [2015-10-23]

LameXP v4.11 [2015-04-05]

LameXP v4.10 [2014-06-23]

LameXP v4.09 [2014-01-26]

LameXP v4.08 [2013-09-04]

LameXP v4.07 [2013-04-28]

LameXP v4.06 [2012-11-04]

LameXP v4.05 [2012-09-03]

LameXP v4.04 [2012-04-26]

LameXP v4.03 [2011-11-12]

LameXP v4.02 [2011-06-14]

LameXP v4.01 [2011-04-04]

LameXP v4.00 [2011-02-21]

2 LameXP v3.xx History

LameXP v3.19 [2010-07-12]

LameXP v3.18 [2010-05-08]

LameXP v3.17 [2010-02-21]

LameXP v3.16 [2010-01-26]

LameXP v3.15 [2009-12-24]

LameXP v3.14 [2009-12-01]

LameXP v3.13 [2009-10-21]

LameXP v3.12 [2009-09-19]

LameXP v3.11 [2009-06-22]

LameXP v3.10 [2009-06-11]

LameXP v3.09 [2009-06-01]

LameXP v3.08 [2009-03-05]

LameXP v3.07 [2008-12-24]

LameXP v3.06 [2008-10-26]

LameXP v3.05 [2008-10-11]

LameXP v3.04 [2008-09-26]

LameXP v3.03 [2008-08-12]

LameXP v3.02 [2008-08-06]

LameXP v3.01 [2008-08-01]

LameXP v3.00 [2008-07-04]

3 LameXP v2.xx History

LameXP v2.03 [2007-08-17]

LameXP v2.00 [2007-02-19]

4 LameXP v1.xx History

LameXP v1.00 [2004-12-10]




by LoRd_MuldeR <> | http://muldersoft.com/

EOF

\ No newline at end of file + LameXP

LameXP

Audio-Encoder Front-End – Changelog

1 LameXP v4.xx History

LameXP v4.19 [unreleased]

LameXP v4.18 [2019-12-18]

LameXP v4.17 [2018-11-10]

LameXP v4.16 [2018-04-30]

LameXP v4.15 [2017-05-31]

LameXP v4.14 [2016-11-19]

LameXP v4.13 [2015-12-12]

LameXP v4.12 [2015-10-23]

LameXP v4.11 [2015-04-05]

LameXP v4.10 [2014-06-23]

LameXP v4.09 [2014-01-26]

LameXP v4.08 [2013-09-04]

LameXP v4.07 [2013-04-28]

LameXP v4.06 [2012-11-04]

LameXP v4.05 [2012-09-03]

LameXP v4.04 [2012-04-26]

LameXP v4.03 [2011-11-12]

LameXP v4.02 [2011-06-14]

LameXP v4.01 [2011-04-04]

LameXP v4.00 [2011-02-21]

2 LameXP v3.xx History

LameXP v3.19 [2010-07-12]

LameXP v3.18 [2010-05-08]

LameXP v3.17 [2010-02-21]

LameXP v3.16 [2010-01-26]

LameXP v3.15 [2009-12-24]

LameXP v3.14 [2009-12-01]

LameXP v3.13 [2009-10-21]

LameXP v3.12 [2009-09-19]

LameXP v3.11 [2009-06-22]

LameXP v3.10 [2009-06-11]

LameXP v3.09 [2009-06-01]

LameXP v3.08 [2009-03-05]

LameXP v3.07 [2008-12-24]

LameXP v3.06 [2008-10-26]

LameXP v3.05 [2008-10-11]

LameXP v3.04 [2008-09-26]

LameXP v3.03 [2008-08-12]

LameXP v3.02 [2008-08-06]

LameXP v3.01 [2008-08-01]

LameXP v3.00 [2008-07-04]

3 LameXP v2.xx History

LameXP v2.03 [2007-08-17]

LameXP v2.00 [2007-02-19]

4 LameXP v1.xx History

LameXP v1.00 [2004-12-10]




by LoRd_MuldeR <> | http://muldersoft.com/

EOF

\ No newline at end of file diff --git a/etc/Deployment/_copy.bat b/etc/Deployment/_copy.bat index 3de00333..f020a233 100644 --- a/etc/Deployment/_copy.bat +++ b/etc/Deployment/_copy.bat @@ -4,18 +4,30 @@ :: COPY FILE :: --------------------------------------------------------------------------- -set "CP_SRC=%~1" -set "CP_DST=%~2" +set "CP_SRC=%~f1" +set "CP_DST=%~f2" "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" white "copy \"%CP_SRC:\=\\%\" to \"%CP_DST:\=\\%\"" -if not exist "%~1" ( +if not exist "%CP_SRC%" ( "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" red "\nCopy failed: Source file \"%CP_SRC:\=\\%\" not found!\n" pause && exit ) -copy "%CP_SRC%" "%CP_DST%" +copy /B /Y /V "%CP_SRC%" "%CP_DST%" + if not "%ERRORLEVEL%" == "0" ( "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" red "\nCopy failed: Operation faild with error code %ERRORLEVEL%!\n" pause && exit ) + +if exist "%CP_DST%\*" ( + fc /B "%CP_SRC%" "%CP_DST%\%~nx1" +) else ( + fc /B "%CP_SRC%" "%CP_DST%" +) + +if not "%ERRORLEVEL%" == "0" ( + "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" red "\nCopy failed: File content does not match!\n" + pause && exit +) diff --git a/etc/Deployment/_date.bat b/etc/Deployment/_date.bat index 32c2a0a1..89b2838b 100644 --- a/etc/Deployment/_date.bat +++ b/etc/Deployment/_date.bat @@ -7,8 +7,8 @@ set "ISO_DATE=" set "ISO_TIME=" -if exist "%~dp0\..\..\..\Prerequisites\GnuWin32\date.exe" ( - for /F "usebackq tokens=1,2" %%a in (`start /B "date" "%~dp0\..\..\..\Prerequisites\GnuWin32\date.exe" +"%%Y-%%m-%%d %%H:%%M:%%S"`) do ( +if exist "%~dp0\..\..\..\Prerequisites\MSYS\1.0\bin\date.exe" ( + for /F "usebackq tokens=1,2" %%a in (`start /B "date" "%~dp0\..\..\..\Prerequisites\MSYS\1.0\bin\date.exe" +"%%Y-%%m-%%d %%H:%%M:%%S"`) do ( set "ISO_DATE=%%a" set "ISO_TIME=%%b" ) diff --git a/etc/Deployment/make.bat b/etc/Deployment/make.bat index a6d0cc43..0367c191 100644 --- a/etc/Deployment/make.bat +++ b/etc/Deployment/make.bat @@ -187,14 +187,14 @@ echo --------------------------------------------------------------------------- echo README.TXT>> "%OUT_FILE%.txt" echo ------------------------------------------------------------------------------>> "%OUT_FILE%.txt" echo.>> "%OUT_FILE%.txt" -"%~dp0\..\..\..\Prerequisites\GnuWin32\cat.exe" "%~dp0\..\..\ReadMe.txt" >> "%OUT_FILE%.txt" +"%~dp0\..\..\..\Prerequisites\MSYS\1.0\bin\cat.exe" "%~dp0\..\..\ReadMe.txt" >> "%OUT_FILE%.txt" echo.>> "%OUT_FILE%.txt" echo ------------------------------------------------------------------------------>> "%OUT_FILE%.txt" echo LICENSE.TXT>> "%OUT_FILE%.txt" echo ------------------------------------------------------------------------------>> "%OUT_FILE%.txt" echo.>> "%OUT_FILE%.txt" -"%~dp0\..\..\..\Prerequisites\GnuWin32\cat.exe" "%~dp0\..\..\License.txt" >> "%OUT_FILE%.txt" +"%~dp0\..\..\..\Prerequisites\MSYS\1.0\bin\cat.exe" "%~dp0\..\..\License.txt" >> "%OUT_FILE%.txt" echo.>> "%OUT_FILE%.txt" :: --------------------------------------------------------------------------- @@ -206,7 +206,7 @@ echo.>> "%OUT_FILE%.txt" "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" cyan "===========================================================================\n" pushd "%TMP_PATH%" -"%~dp0\..\..\..\Prerequisites\GnuWin32\zip.exe" -r -9 -z "%OUT_FILE%.zip" "*.*" < "%OUT_FILE%.txt" +"%~dp0\..\..\..\Prerequisites\InfoZip\zip.exe" -r -9 -z "%OUT_FILE%.zip" "*.*" < "%OUT_FILE%.txt" popd "%~dp0\..\..\..\Prerequisites\NSIS\makensis.exe" "/DLAMEXP_DATE=%ISO_DATE%" "/DLAMEXP_VERSION=%VER_LAMEXP_MAJOR%.%VER_LAMEXP_MINOR_HI%%VER_LAMEXP_MINOR_LO%" "/DLAMEXP_BUILD=%VER_LAMEXP_BUILD%" "/DLAMEXP_INSTTYPE=%VER_LAMEXP_TYPE%" "/DLAMEXP_PATCH=%VER_LAMEXP_PATCH%" "/DLAMEXP_OUTPUT_FILE=%OUT_FILE%.sfx" "/DLAMEXP_SOURCE_PATH=%TMP_PATH%" "%~dp0\..\NSIS\setup.nsi" -- 2.11.4.GIT