From 45fa74ae467024a175aa479c0263720b2af60b52 Mon Sep 17 00:00:00 2001 From: Khushboo Vashi Date: Thu, 21 Jan 2021 16:29:03 +0530 Subject: [PATCH] Updated Windows installer script for Kerberos support. --- Make.bat | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Make.bat b/Make.bat index b5d2901c1..d6b13fff8 100644 --- a/Make.bat +++ b/Make.bat @@ -55,6 +55,7 @@ REM Main build sequence Ends ECHO Configuring the environment... IF "%PGADMIN_PYTHON_DIR%" == "" SET "PGADMIN_PYTHON_DIR=C:\Python38" IF "%PGADMIN_QT_DIR%" == "" SET "PGADMIN_QT_DIR=C:\Qt\5.14.2\msvc2017_64" + IF "%PGADMIN_KRB5_DIR%" == "" SET "PGADMIN_KRB5_DIR=C:\Program Files\MIT\Kerberos" IF "%PGADMIN_POSTGRES_DIR%" == "" SET "PGADMIN_POSTGRES_DIR=C:\Program Files (x86)\PostgreSQL\12" IF "%PGADMIN_INNOTOOL_DIR%" == "" SET "PGADMIN_INNOTOOL_DIR=C:\Program Files (x86)\Inno Setup 6" IF "%PGADMIN_VCREDIST_DIR%" == "" SET "PGADMIN_VCREDIST_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.16.27012" @@ -97,6 +98,7 @@ REM Main build sequence Ends ECHO Python version: %PYTHON_MAJOR%.%PYTHON_MINOR% ECHO. ECHO Qt directory: %PGADMIN_QT_DIR% + ECHO KRB5 directory: %PGADMIN_KRB5_DIR% ECHO PostgreSQL directory: %PGADMIN_POSTGRES_DIR% ECHO. ECHO VC++ redist directory: %PGADMIN_VCREDIST_DIR% @@ -129,6 +131,12 @@ REM Main build sequence Ends EXIT /B 1 ) + IF NOT EXIST "%PGADMIN_KRB5_DIR%" ( + ECHO !PGADMIN_KRB5_DIR! does not exist. + ECHO Please install Kfw (Kerberos) and set the PGADMIN_KRB5_DIR environment variable. + EXIT /B 1 + ) + IF NOT EXIST "%PGADMIN_QT_DIR%\bin\qmake.exe" ( ECHO !QMAKE! does not exist. ECHO Please install Qt and set the PGADMIN_QT_DIR environment variable. @@ -268,6 +276,15 @@ REM Main build sequence Ends ECHO [Paths] > "%BUILDROOT%\runtime\qt.conf" ECHO Plugins=plugins >> "%BUILDROOT%\runtime\qt.conf" + ECHO Staging Kerberos components... + IF "%ARCHITECTURE%" == "x64" ( + COPY "%PGADMIN_KRB5_DIR%\bin\kinit.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1 + COPY "%PGADMIN_KRB5_DIR%\bin\krb5_64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1 + COPY "%PGADMIN_KRB5_DIR%\bin\comerr64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1 + COPY "%PGADMIN_KRB5_DIR%\bin\k5sprt64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1 + COPY "%PGADMIN_KRB5_DIR%\bin\gssapi64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1 + ) + ECHO Staging PostgreSQL components... COPY "%PGADMIN_POSTGRES_DIR%\bin\libpq.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1 IF "%ARCHITECTURE%" == "x64" (