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

Allow "make" to be overridden in the environment.

Browse Source
This commit is contained in:
Dave Page 2018-05-14 17:08:40 +01:00
parent fe81ae3285
commit 8d9e9eab13
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Make.bat
View File

@ -61,6 +61,7 @@ REM Main function Ends
IF "%PYTHON_HOME%" == "" SET "PYTHON_HOME=C:\Python27" IF "%PYTHON_HOME%" == "" SET "PYTHON_HOME=C:\Python27"
IF "%PYTHON_DLL%" == "" SET "PYTHON_DLL=C:\Windows\SysWOW64\python27.dll" IF "%PYTHON_DLL%" == "" SET "PYTHON_DLL=C:\Windows\SysWOW64\python27.dll"
IF "%QTDIR%" == "" SET "QTDIR=C:\Qt\5.9.1\mingw53_32" IF "%QTDIR%" == "" SET "QTDIR=C:\Qt\5.9.1\mingw53_32"
IF "%MAKE%" == "" SET "MAKE=mingw32-make.exe"
IF "%PGDIR%" == "" SET "PGDIR=C:\Program Files (x86)\PostgreSQL\10" IF "%PGDIR%" == "" SET "PGDIR=C:\Program Files (x86)\PostgreSQL\10"
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"
@ -100,6 +101,7 @@ REM Main function Ends
ECHO **************************************************************** ECHO ****************************************************************
ECHO Target mode = x86 ECHO Target mode = x86
ECHO INNOTOOL = %INNOTOOL% ECHO INNOTOOL = %INNOTOOL%
ECHO MAKE = %MAKE%
ECHO VCDIR = %VCDIR% ECHO VCDIR = %VCDIR%
ECHO VCDIST = %VCREDIST% ECHO VCDIST = %VCREDIST%
ECHO SIGNTOOL = %SIGNTOOL% ECHO SIGNTOOL = %SIGNTOOL%
@ -224,7 +226,7 @@ REM Main function Ends
CALL "%QMAKE%" "DEFINES+=PGADMIN4_USE_WEBKIT" CALL "%QMAKE%" "DEFINES+=PGADMIN4_USE_WEBKIT"
IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
CALL mingw32-make.exe clean CALL %MAKE% clean
IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL% IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
CALL mingw32-make.exe CALL mingw32-make.exe