From 80ae599594ce23eb2d5020b60a20bc7b21396015 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sun, 18 Mar 2018 13:37:20 +0100 Subject: [PATCH] Moved path specification to a separate file. --- !_Build.bat | 20 ++++++-------------- !_Paths.bat.TEMPLATE | 5 +++++ .gitignore | 1 + 3 files changed, 12 insertions(+), 14 deletions(-) create mode 100644 !_Paths.bat.TEMPLATE diff --git a/!_Build.bat b/!_Build.bat index 46d54fb..a24b5af 100644 --- a/!_Build.bat +++ b/!_Build.bat @@ -9,20 +9,12 @@ if "%MPUI_VERSION%"=="" echo MPUI_VERSION is not defined! & pause & goto if "%CODECS_DATE%"=="" echo CODECS_DATE is not defined! & pause & goto:eof if "%BUILD_NO%"=="" echo BUILD_NO is not defined! & pause & goto:eof -REM Prerequisites base path -set "PREREQUISITES_DIR=E:\Source\Prerequisites" - -REM Path to NSIS, Unicode version highly recommended! -set "NSIS_PATH=%PREREQUISITES_DIR%\NSIS" - -REM Path to UPX executable compressor program -set "UPX_PATH=%PREREQUISITES_DIR%\UPX" - -REM Path to 7-Zip tools -set "SEVENZ_PATH=%PREREQUISITES_DIR%\SevenZip" - -REM Path to VerPatch tool -set "VPATCH_PATH=%PREREQUISITES_DIR%\VerPatch" +REM BSetup prerequisites path +call "%~dp0\!_Paths.bat" +if "%NSIS_PATH%"=="" echo NSIS_PATH is not defined! & pause & goto:eof +if "%UPX_PATH%"=="" echo UPX_PATH is not defined! & pause & goto:eof +if "%SEVENZ_PATH%"=="" echo SEVENZ_PATH is not defined! & pause & goto:eof +if "%VPATCH_PATH%"=="" echo VPATCH_PATH is not defined! & pause & goto:eof REM -------------------------------------------------------------------------- REM Do NOT modify any lines below! diff --git a/!_Paths.bat.TEMPLATE b/!_Paths.bat.TEMPLATE new file mode 100644 index 0000000..8c8adf4 --- /dev/null +++ b/!_Paths.bat.TEMPLATE @@ -0,0 +1,5 @@ +set "PREREQUISITES_DIR=E:\Source\Prerequisites" +set "NSIS_PATH=%PREREQUISITES_DIR%\NSIS" +set "UPX_PATH=%PREREQUISITES_DIR%\UPX" +set "SEVENZ_PATH=%PREREQUISITES_DIR%\SevenZip" +set "VPATCH_PATH=%PREREQUISITES_DIR%\VerPatch" diff --git a/.gitignore b/.gitignore index ad51d84..64c117d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/!_Paths.bat /!_Version.bat /.Compile /.Release -- 2.11.4.GIT