IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-08 23:23:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use VCINSTALLDIR instead of VCDIR, as that is set by Visual Studio

Browse Source
This commit is contained in:
Dave Page 2018-05-16 11:56:30 +01:00
parent ccf58570b1
commit 7a1d9c750a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Make.bat
View File

@ -66,7 +66,7 @@ REM Main function Ends
IF "%INNOTOOL%" == "" SET "INNOTOOL=C:\Program Files (x86)\Inno Setup 5" IF "%INNOTOOL%" == "" SET "INNOTOOL=C:\Program Files (x86)\Inno Setup 5"
IF "%YARNDIR%" == "" SET "YARNDIR=C:\Program Files\Yarn" IF "%YARNDIR%" == "" SET "YARNDIR=C:\Program Files\Yarn"
IF "%NODEJSDIR%" == "" SET "NODEJSDIR=C:\Program Files\nodejs" IF "%NODEJSDIR%" == "" SET "NODEJSDIR=C:\Program Files\nodejs"
IF "%VCDIR%" == "" SET "VCDIR=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC" IF "%VCINSTALLDIR%" == "" SET "VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC"
IF "%VCREDIST%" == "" SET "VCREDIST=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\vcredist_x86.exe" IF "%VCREDIST%" == "" SET "VCREDIST=C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\vcredist_x86.exe"
IF "%SIGNTOOL%" == "" SET "SIGNTOOL=C:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe" IF "%SIGNTOOL%" == "" SET "SIGNTOOL=C:\Program Files\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe"
SET "VCREDISTNAME=vcredist_x86.exe" SET "VCREDISTNAME=vcredist_x86.exe"
@ -78,7 +78,7 @@ REM Main function Ends
SET "QMAKE=%QTDIR%\bin\qmake.exe" SET "QMAKE=%QTDIR%\bin\qmake.exe"
SET "VIRTUALENV=venv" SET "VIRTUALENV=venv"
SET "TARGETINSTALLER=%WD%\dist" SET "TARGETINSTALLER=%WD%\dist"
SET "VCREDIST=%VCDIR%\redist\1033\%VCREDISTNAME%" SET "VCREDIST=%VCINSTALLDIR%\redist\1033\%VCREDISTNAME%"
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_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_REVISION =" %WD%\web\config.py') DO SET APP_REVISION_VERSION=%%a
@ -102,7 +102,7 @@ REM Main function Ends
ECHO Target mode = x86 ECHO Target mode = x86
ECHO INNOTOOL = %INNOTOOL% ECHO INNOTOOL = %INNOTOOL%
ECHO MAKE = %MAKE% ECHO MAKE = %MAKE%
ECHO VCDIR = %VCDIR% ECHO VCINSTALLDIR= %VCINSTALLDIR%
ECHO VCDIST = %VCREDIST% ECHO VCDIST = %VCREDIST%
ECHO SIGNTOOL = %SIGNTOOL% ECHO SIGNTOOL = %SIGNTOOL%
ECHO QTDIR = %QTDIR% ECHO QTDIR = %QTDIR%
@ -117,7 +117,7 @@ REM Main function Ends
REM Check IF path SET in enviroments really exist or not ? REM Check IF path SET in enviroments really exist or not ?
IF NOT EXIST "%INNOTOOL%" GOTO err_handle_inno IF NOT EXIST "%INNOTOOL%" GOTO err_handle_inno
IF NOT EXIST "%VCDIR%" GOTO err_handle_visualstudio IF NOT EXIST "%VCINSTALLDIR%" GOTO err_handle_visualstudio
IF NOT EXIST "%VCREDIST%" GOTO err_handle_visualstudio_dist IF NOT EXIST "%VCREDIST%" GOTO err_handle_visualstudio_dist
IF NOT EXIST "%QTDIR%" GOTO err_handle_qt IF NOT EXIST "%QTDIR%" GOTO err_handle_qt
IF NOT EXIST "%QMAKE%" GOTO err_handle_qt IF NOT EXIST "%QMAKE%" GOTO err_handle_qt
@ -383,9 +383,9 @@ REM Main function Ends
GOTO EXIT GOTO EXIT
:err_handle_visualstudio :err_handle_visualstudio
ECHO %VCDIR% does not exist ECHO %INSTALL% does not exist
ECHO Please Install Microsoft Visual studio and SET the VCDIR enviroment Variable. ECHO Please Install Microsoft Visual studio and SET the VCINSTALLDIR enviroment Variable.
ECHO SET "VCDIR=<PATH>" ECHO SET "VCINSTALLDIR=<PATH>"
exit /B 1 exit /B 1
GOTO EXIT GOTO EXIT