From 765e0d03be71da07f504a3b41fb845d59a555f5c Mon Sep 17 00:00:00 2001 From: Dave Page Date: Wed, 16 May 2018 16:31:41 +0100 Subject: [PATCH] Further cleanup of the environment setup --- Make.bat | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/Make.bat b/Make.bat index 88dc1d462..4dbb66dc0 100644 --- a/Make.bat +++ b/Make.bat @@ -75,9 +75,9 @@ REM Main function Ends SET "VIRTUALENV=venv" SET "TARGETINSTALLER=%WD%\dist" - FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py') DO SET APP_RELEASE=%%a - FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py') DO SET APP_REVISION_VERSION=%%a - FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py') DO SET APP_SUFFIX_VERSION=%%a + FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py') DO SET APP_MAJOR=%%a + FOR /F "tokens=3" %%a IN ('findstr /C:"APP_REVISION =" %WD%\web\config.py') DO SET APP_MINOR=%%a + FOR /F "tokens=3" %%a IN ('findstr /C:"APP_SUFFIX =" %WD%\web\config.py') DO SET APP_VERSION_SUFFIX=%%a REM remove single quote from the string SET APP_SUFFIX_VERSION=%APP_SUFFIX_VERSION:'=% SET APP_NAME="" @@ -101,34 +101,35 @@ REM Main function Ends ECHO **************************************************************** ECHO S U M M A R Y ECHO **************************************************************** - ECHO Build path: %PGBUILDPATH% - ECHO Output directory: %TARGETINSTALLER% - ECHO Installer name: %INSTALLERNAME% + ECHO Build path: %PGBUILDPATH% + ECHO Output directory: %TARGETINSTALLER% + ECHO Installer name: %INSTALLERNAME% ECHO. - ECHO Python home: %PYTHON_HOME% - ECHO Python DLL: %PYTHON_DLL% - ECHO Python version: %PYTHON_VERSION% - ECHO Python major version: %PYTHON_MAJOR% - ECHO Python minor version: %PYTHON_MINOR% - ECHO Virtual environment: %VIRTUALENV% + ECHO Python home: %PYTHON_HOME% + ECHO Python DLL: %PYTHON_DLL% + ECHO Python version: %PYTHON_VERSION% + ECHO Python major version: %PYTHON_MAJOR% + ECHO Python minor version: %PYTHON_MINOR% + ECHO Virtual environment: %VIRTUALENV% ECHO. - ECHO Qt home: %QTDIR% - ECHO qmake executable: %QMAKE% - ECHO Qt version: %QT_VERSION% + ECHO Qt home: %QTDIR% + ECHO qmake executable: %QMAKE% + ECHO Qt version: %QT_VERSION% ECHO. - ECHO PostgreSQL home: %PGDIR% + ECHO PostgreSQL home: %PGDIR% ECHO. - ECHO VC++ redistributable: %VCREDIST% - ECHO VC++ redistributable filename: %VCREDISTNAME% + ECHO VC++ redistributable: %VCREDIST% + ECHO VC++ redistributable file: %VCREDISTNAME% ECHO. - ECHO innotool executable: %INNOTOOL% - ECHO signtool executable: %SIGNTOOL% + ECHO innotool executable: %INNOTOOL% + ECHO signtool executable: %SIGNTOOL% ECHO. - ECHO App major version: %APP_MAJOR% - ECHO App minor version: %APP_MINOR% - ECHO App version: %APP_VERSION% - ECHO App version suffix: %APP_VERSION_SUFFIX% - ECHO Application name: %APP_NAME% + ECHO App major version: %APP_MAJOR% + ECHO App minor version: %APP_MINOR% + ECHO App version: %APP_VERSION% + ECHO App version suffix: %APP_VERSION_SUFFIX% + ECHO App short name: %APP_SHORTNAME% + ECHO App name: %APP_NAME% ECHO **************************************************************** REM Check IF path SET in environment really exist or not ?