Further cleanup of the environment setup

pull/17/head
Dave Page 2018-05-16 16:31:41 +01:00
parent 76749efb12
commit 765e0d03be
1 changed files with 26 additions and 25 deletions

View File

@ -75,9 +75,9 @@ REM Main function Ends
SET "VIRTUALENV=venv" SET "VIRTUALENV=venv"
SET "TARGETINSTALLER=%WD%\dist" 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_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_REVISION_VERSION=%%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_SUFFIX_VERSION=%%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 REM remove single quote from the string
SET APP_SUFFIX_VERSION=%APP_SUFFIX_VERSION:'=% SET APP_SUFFIX_VERSION=%APP_SUFFIX_VERSION:'=%
SET APP_NAME="" SET APP_NAME=""
@ -101,34 +101,35 @@ REM Main function Ends
ECHO **************************************************************** ECHO ****************************************************************
ECHO S U M M A R Y ECHO S U M M A R Y
ECHO **************************************************************** ECHO ****************************************************************
ECHO Build path: %PGBUILDPATH% ECHO Build path: %PGBUILDPATH%
ECHO Output directory: %TARGETINSTALLER% ECHO Output directory: %TARGETINSTALLER%
ECHO Installer name: %INSTALLERNAME% ECHO Installer name: %INSTALLERNAME%
ECHO. ECHO.
ECHO Python home: %PYTHON_HOME% ECHO Python home: %PYTHON_HOME%
ECHO Python DLL: %PYTHON_DLL% ECHO Python DLL: %PYTHON_DLL%
ECHO Python version: %PYTHON_VERSION% ECHO Python version: %PYTHON_VERSION%
ECHO Python major version: %PYTHON_MAJOR% ECHO Python major version: %PYTHON_MAJOR%
ECHO Python minor version: %PYTHON_MINOR% ECHO Python minor version: %PYTHON_MINOR%
ECHO Virtual environment: %VIRTUALENV% ECHO Virtual environment: %VIRTUALENV%
ECHO. ECHO.
ECHO Qt home: %QTDIR% ECHO Qt home: %QTDIR%
ECHO qmake executable: %QMAKE% ECHO qmake executable: %QMAKE%
ECHO Qt version: %QT_VERSION% ECHO Qt version: %QT_VERSION%
ECHO. ECHO.
ECHO PostgreSQL home: %PGDIR% ECHO PostgreSQL home: %PGDIR%
ECHO. ECHO.
ECHO VC++ redistributable: %VCREDIST% ECHO VC++ redistributable: %VCREDIST%
ECHO VC++ redistributable filename: %VCREDISTNAME% ECHO VC++ redistributable file: %VCREDISTNAME%
ECHO. ECHO.
ECHO innotool executable: %INNOTOOL% ECHO innotool executable: %INNOTOOL%
ECHO signtool executable: %SIGNTOOL% ECHO signtool executable: %SIGNTOOL%
ECHO. ECHO.
ECHO App major version: %APP_MAJOR% ECHO App major version: %APP_MAJOR%
ECHO App minor version: %APP_MINOR% ECHO App minor version: %APP_MINOR%
ECHO App version: %APP_VERSION% ECHO App version: %APP_VERSION%
ECHO App version suffix: %APP_VERSION_SUFFIX% ECHO App version suffix: %APP_VERSION_SUFFIX%
ECHO Application name: %APP_NAME% ECHO App short name: %APP_SHORTNAME%
ECHO App name: %APP_NAME%
ECHO **************************************************************** ECHO ****************************************************************
REM Check IF path SET in environment really exist or not ? REM Check IF path SET in environment really exist or not ?