Cleanup Windows build scripts and ensure Windows x64 builds will work. Fixes #5574

Make.bat

@@ -2,23 +2,26 @@
 SETLOCAL
 
 SET WD=%CD%
-SET "PGBUILDPATH=%WD%\win-build"
+SET "BUILDROOT=%WD%\win-build"
+SET "DISTROOT=%WD%\dist"
 
-SET CMDOPTION=""
+SET CMDOPTIONS=""
-IF "%1" == "clean"  SET CMDOPTION="VALID"
+IF "%1" == "clean" SET CMDOPTIONS="VALID"
-IF "%1" == "x86"    SET CMDOPTION="VALID"
+IF "%1" == ""      SET CMDOPTIONS="VALID"
 
-IF NOT %CMDOPTION%=="VALID" (
+IF NOT %CMDOPTIONS%=="VALID" (
     GOTO USAGE
 )
 
-SET ARCHITECTURE=%1
+IF "%1" == "clean" (
-
-IF "%ARCHITECTURE%"=="clean" (
     CALL :CLEAN
     EXIT /B %ERRORLEVEL%
 )
 
+set "ARCHITECTURE=x64"
+if "%Platform%" == "X86" (
+    set "ARCHITECTURE=x86"
+)
 
 REM Main build sequence
 CALL :SET_ENVIRONMENT
@@ -37,7 +40,7 @@ REM Main build sequence Ends
 
 :CLEAN
     ECHO Removing build directory...
-    IF EXIST "%PGBUILDPATH%" RD "%PGBUILDPATH%" /S /Q > nul || EXIT /B 1
+    IF EXIST "%BUILDROOT%" RD "%BUILDROOT%" /S /Q > nul || EXIT /B 1
 
     ECHO Removing temp build directory...
     IF EXIST "%WD%\pkg\win32\Output" rd "%WD%\pkg\win32\Output" /S /Q > nul || EXIT /B 1
@@ -50,40 +53,32 @@ REM Main build sequence Ends
 
 :SET_ENVIRONMENT
     ECHO Configuring the environment...
-    IF "%PYTHON_HOME%" == ""   SET "PYTHON_HOME=C:\Python27"
+    IF "%PGADMIN_PYTHON_DIR%" == ""   SET "PGADMIN_PYTHON_DIR=C:\Python38"
-    IF "%PYTHON_DLL%" == ""    SET "PYTHON_DLL=C:\Windows\SysWOW64\python27.dll"
+    IF "%PGADMIN_QT_DIR%" == ""       SET "PGADMIN_QT_DIR=C:\Qt\5.14.2\msvc2017_64"
-    IF "%QTDIR%" == ""         SET "QTDIR=C:\Qt\5.9.1\mingw53_32"
+    IF "%PGADMIN_POSTGRES_DIR%" == "" SET "PGADMIN_POSTGRES_DIR=C:\Program Files (x86)\PostgreSQL\12"
-    IF "%MAKE%" == ""          SET "MAKE=mingw32-make.exe"
+    IF "%PGADMIN_INNOTOOL_DIR%" == "" SET "PGADMIN_INNOTOOL_DIR=C:\Program Files (x86)\Inno Setup 6"
-    IF "%PGDIR%" == ""         SET "PGDIR=C:\Program Files (x86)\PostgreSQL\10"
+    IF "%PGADMIN_VCREDIST_DIR%" == "" SET "PGADMIN_VCREDIST_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.16.27012"
-    IF "%INNOTOOL%" == ""      SET "INNOTOOL=C:\Program Files (x86)\Inno Setup 5"
+    IF "%PGADMIN_SIGNTOOL_DIR%" == "" SET "PGADMIN_SIGNTOOL_DIR=C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64"
-    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"
 
-    REM Set VCREDISTNAME (the filename)
+    REM Set REDIST_NAME (the filename)
-    for /f "delims=" %%i in ("%VCREDIST%") do set "VCREDISTNAME=%%~nxi"
+    set "VCREDIST_FILE=vcredist_%ARCHITECTURE%.exe"
 
     REM Set additional variables we need
-    SET "QMAKE=%QTDIR%\bin\qmake.exe"
+    FOR /F "tokens=3" %%a IN ('findstr /C:"APP_RELEASE =" %WD%\web\config.py')  DO SET APP_MAJOR=%%a
-    FOR /F "tokens=4,5 delims=. " %%a IN ('%QMAKE% -v ^| findstr /B /C:"Using Qt version "') DO SET QT_VERSION=%%a.%%b
+    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
-    SET "VIRTUALENV=venv"
-    SET "TARGET_DIR=%WD%\dist"
-
-    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_VERSION_SUFFIX=%APP_VERSION_SUFFIX:'=%
     SET APP_NAME=""
-    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py')   DO SET APP_NAME=%%a
+    FOR /F "tokens=2* DELims='" %%a IN ('findstr /C:"APP_NAME =" web\config.py') DO SET APP_NAME=%%a
-    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
+    FOR /f "tokens=1 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "print('%APP_NAME%'.lower().replace(' ', ''))"') DO SET APP_SHORTNAME=%%G
     SET APP_VERSION=%APP_MAJOR%.%APP_MINOR%
     SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%APP_VERSION_SUFFIX%-%ARCHITECTURE%.exe
     IF "%APP_VERSION_SUFFIX%" == "" SET INSTALLERNAME=%APP_SHORTNAME%-%APP_MAJOR%.%APP_MINOR%-%ARCHITECTURE%.exe
 
     REM get Python version for the runtime build ex. 2.7.1 will be 27
-    FOR /f "tokens=1 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
+    FOR /f "tokens=1 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MAJOR=%%G
-    FOR /f "tokens=2 DELims=." %%G IN ('%PYTHON_HOME%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
+    FOR /f "tokens=2 DELims=." %%G IN ('%PGADMIN_PYTHON_DIR%/python.exe -c "import sys; print(sys.version.split(' ')[0])"') DO SET PYTHON_MINOR=%%G
     SET "PYTHON_VERSION=%PYTHON_MAJOR%%PYTHON_MINOR%"
 
     EXIT /B 0
@@ -91,32 +86,24 @@ REM Main build sequence Ends
 
 :VALIDATE_ENVIRONMENT
     ECHO ****************************************************************
-    ECHO                        S U M M A R Y
+    ECHO * Build summary
     ECHO ****************************************************************
-    ECHO Build path:                %PGBUILDPATH%
+    ECHO Build path:                %BUILDROOT%
-    ECHO Output directory:          %TARGET_DIR%
+    ECHO Output directory:          %DISTROOT%
     ECHO Installer name:            %INSTALLERNAME%
     ECHO.
-    ECHO Python home:               %PYTHON_HOME%
+    ECHO Python directory:          %PGADMIN_PYTHON_DIR%
-    ECHO Python DLL:                %PYTHON_DLL%
+    ECHO Python DLL:                %PGADMIN_PYTHON_DIR%\Python%PYTHON_VERSION%.dll
-    ECHO Python version:            %PYTHON_VERSION%
+    ECHO Python version:            %PYTHON_MAJOR%.%PYTHON_MINOR%
-    ECHO Python major version:      %PYTHON_MAJOR%
-    ECHO Python minor version:      %PYTHON_MINOR%
     ECHO.
-    ECHO Qt home:                   %QTDIR%
+    ECHO Qt directory:              %PGADMIN_QT_DIR%
-    ECHO qmake executable:          %QMAKE%
+    ECHO PostgreSQL directory:      %PGADMIN_POSTGRES_DIR%
-    ECHO Qt version:                %QT_VERSION%
     ECHO.
-    ECHO PostgreSQL home:           %PGDIR%
+    ECHO VC++ redist directory:     %PGADMIN_VCREDIST_DIR%
+    ECHO VC++ redist file:          %VCREDIST_FILE%
+    ECHO InnoTool directory:        %PGADMIN_INNOTOOL_DIR%
+    ECHO signtool directory:        %PGADMIN_SIGNTOOL_DIR%
     ECHO.
-    ECHO VC++ redistributable:      %VCREDIST%
-    ECHO VC++ redistributable file: %VCREDISTNAME%
-    ECHO.
-    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 App short name:            %APP_SHORTNAME%
@@ -124,88 +111,85 @@ REM Main build sequence Ends
     ECHO ****************************************************************
 
     ECHO Checking the environment...
-    IF NOT EXIST "%INNOTOOL%" (
+    IF NOT EXIST "%PGADMIN_INNOTOOL_DIR%" (
-        ECHO !INNOTOOL! does not exist
+        ECHO !PGADMIN_INNOTOOL_DIR! does not exist
-        ECHO Please install Innotool and set the INNOTOOL environment variable.
+        ECHO Please install InnoTool and set the PGADMIN_INNOTOOL_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%VCREDIST%" (
+    IF NOT EXIST "%PGADMIN_VCREDIST_DIR%" (
-        ECHO !VCREDIST! does not exist
+        ECHO !PGADMIN_VCREDIST_DIR! does not exist
-        ECHO Please install Microsoft Visual studio and set the VCREDIST environment variable.
+        ECHO Please install Microsoft Visual studio and set the PGADMIN_VCREDIST_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%QTDIR%" (
+    IF NOT EXIST "%PGADMIN_QT_DIR%" (
-        ECHO !QTDIR! does not exist.
+        ECHO !PGADMIN_QT_DIR! does not exist.
-        ECHO Please install Qt and set the QTDIR environment variable.
+        ECHO Please install Qt and set the PGADMIN_QT_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%QMAKE%" (
+    IF NOT EXIST "%PGADMIN_QT_DIR%\bin\qmake.exe" (
         ECHO !QMAKE! does not exist.
-        ECHO Please install Qt and set the QTDIR environment variable.
+        ECHO Please install Qt and set the PGADMIN_QT_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%PYTHON_HOME%" (
+    IF NOT EXIST "%PGADMIN_PYTHON_DIR%" (
-        ECHO !PYTHON_HOME! does not exist.
+        ECHO !PGADMIN_PYTHON_DIR! does not exist.
-        ECHO Please install Python and set the PYTHON_HOME environment variable.
+        ECHO Please install Python and set the PGADMIN_PYTHON_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%PYTHON_DLL%" (
+    IF NOT EXIST "%PGADMIN_PYTHON_DIR%\Python%PYTHON_VERSION%.dll" (
-        ECHO !PYTHON_DLL! does not exist.
+        ECHO !PGADMIN_PYTHON_DIR!\Python!PYTHON_VERSION!.dll does not exist.
-        ECHO Please install Python and set the PYTHON_DLL environment variable.
+        ECHO Please check your Python installation is complete.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%PGDIR%" (
+    IF NOT EXIST "%PGADMIN_POSTGRES_DIR%" (
-        ECHO !PGDIR! does not exist.
+        ECHO !PGADMIN_POSTGRES_DIR! does not exist.
-        ECHO Please install PostgreSQL and set the PGDIR environment variable.
+        ECHO Please install PostgreSQL and set the PGADMIN_POSTGRES_DIR environment variable.
         EXIT /B 1
     )
 
-    IF NOT EXIST "%PYTHON_HOME%\Scripts\virtualenv.exe" (
+    IF NOT EXIST "%PGADMIN_PYTHON_DIR%\Scripts\virtualenv.exe" (
-        ECHO !PYTHON_HOME!\Scripts\virtualenv.exe does not exist.
+        ECHO !PGADMIN_PYTHON_DIR!\Scripts\virtualenv.exe does not exist.
         ECHO Please install the virtualenv package in Python.
         EXIT /B 1
     )
 
-    SET "PATH=%PGDIR%\bin;%PATH%"
+    SET "PATH=%PGADMIN_POSTGRES_DIR%\bin;%PATH%"
 
     EXIT /B 0
 
 
 :CREATE_VIRTUAL_ENV
     ECHO Creating virtual environment...
-    IF NOT EXIST "%PGBUILDPATH%"  MKDIR "%PGBUILDPATH%"
+    IF NOT EXIST "%BUILDROOT%"  MKDIR "%BUILDROOT%"
     
-    CD "%PGBUILDPATH%"
+    CD "%BUILDROOT%"
-    "%PYTHON_HOME%\Scripts\virtualenv.exe" "%VIRTUALENV%"
+    "%PGADMIN_PYTHON_DIR%\Scripts\virtualenv.exe" venv
 
-    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\DLLs" "%PGBUILDPATH%\%VIRTUALENV%\DLLs" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%PGADMIN_PYTHON_DIR%\DLLs" "%BUILDROOT%\venv\DLLs" > nul || EXIT /B 1
-    XCOPY /S /I /E /H /Y "%PYTHON_HOME%\Lib" "%PGBUILDPATH%\%VIRTUALENV%\Lib" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%PGADMIN_PYTHON_DIR%\Lib" "%BUILDROOT%\venv\Lib" > nul || EXIT /B 1
 
-    ECHO Activating virtual environment -  %PGBUILDPATH%\%VIRTUALENV%...
+    ECHO Activating virtual environment -  %BUILDROOT%\venv...
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\activate" || EXIT /B 1
+    CALL "%BUILDROOT%\venv\Scripts\activate" || EXIT /B 1
 
     ECHO Installing dependencies...
     CALL pip install -r "%WD%\requirements.txt" || EXIT /B 1
     CALL pip install sphinx || EXIT /B 1
 
-    REM If we're using VC++, and this is Python 3.6+, we need to remove the hack
+    REM If this is Python 3.6+, we need to remove the hack above or it will break qmake. Sigh.
-    REM above or it will break qmake. Sigh.
+    IF %PYTHON_VERSION% GEQ 36 SET CL=
-    IF "%MAKE%" == "nmake" (
-        IF %PYTHON_VERSION% GEQ 36 SET CL=
-    )
 
     CD %WD%
     EXIT /B 0
 
 
 :CREATE_RUNTIME_ENV
-    MKDIR "%PGBUILDPATH%\runtime"
+    MKDIR "%BUILDROOT%\runtime"
 
     CD "%WD%\web"
 
@@ -219,33 +203,33 @@ REM Main build sequence Ends
     RD /Q /S "%WD%\web\pgadmin\static\js\generated\.cache" 1> nul 2>&1
 
     ECHO Copying web directory...
-    XCOPY /S /I /E /H /Y "%WD%\web" "%PGBUILDPATH%\web" > nul || EXIT /B 1
+    XCOPY /S /I /E /H /Y "%WD%\web" "%BUILDROOT%\web" > nul || EXIT /B 1
 
     ECHO Cleaning up unnecessary .pyc and .pyo files...
-    FOR /R "%PGBUILDPATH%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
+    FOR /R "%BUILDROOT%\web" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
     ECHO Removing tests, Python caches and node modules...
-    FOR /R "%PGBUILDPATH%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f" 1> nul 2>&1
+    FOR /R "%BUILDROOT%\web" %%f in (tests feature_tests __pycache__ node_modules) do RD /Q /S "%%f" 1> nul 2>&1
     ECHO Removing the test framework...
-    RD /Q /S "%PGBUILDPATH%\web\regression" 1> nul 2>&1
+    RD /Q /S "%BUILDROOT%\web\regression" 1> nul 2>&1
     ECHO Removing tools...
-    RD /Q /S "%PGBUILDPATH%\web\tools" 1> nul 2>&1
+    RD /Q /S "%BUILDROOT%\web\tools" 1> nul 2>&1
     ECHO Removing any existing configurations...
-    DEL /q "%PGBUILDPATH%\web\pgadmin4.db" 1> nul 2>&1
+    DEL /q "%BUILDROOT%\web\pgadmin4.db" 1> nul 2>&1
-    DEL /q "%PGBUILDPATH%\web\config_local.py" 1> nul 2>&1
+    DEL /q "%BUILDROOT%\web\config_local.py" 1> nul 2>&1
     
     ECHO Creating config_distro.py
-    ECHO SERVER_MODE = False > "%PGBUILDPATH%\web\config_distro.py"
+    ECHO SERVER_MODE = False > "%BUILDROOT%\web\config_distro.py"
-    ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO HELP_PATH = '../../../docs/en_US/html/' >> "%BUILDROOT%\web\config_distro.py"
-    ECHO DEFAULT_BINARY_PATHS = { >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO DEFAULT_BINARY_PATHS = { >> "%BUILDROOT%\web\config_distro.py"
-    ECHO     'pg':   '$DIR/../runtime', >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO     'pg':   '$DIR/../runtime', >> "%BUILDROOT%\web\config_distro.py"
-    ECHO     'ppas': '' >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO     'ppas': '' >> "%BUILDROOT%\web\config_distro.py"
-    ECHO } >> "%PGBUILDPATH%\web\config_distro.py"
+    ECHO } >> "%BUILDROOT%\web\config_distro.py"
 
     ECHO Building docs...
-    MKDIR "%PGBUILDPATH%\docs\en_US\html"
+    MKDIR "%BUILDROOT%\docs\en_US\html"
     CD "%WD%\docs\en_US"
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\python.exe" build_code_snippet.py || EXIT /B 1
+    CALL "%BUILDROOT%\venv\Scripts\python.exe" build_code_snippet.py || EXIT /B 1
-    CALL "%PGBUILDPATH%\%VIRTUALENV%\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%PGBUILDPATH%\docs\en_US\html" || EXIT /B 1
+    CALL "%BUILDROOT%\venv\Scripts\sphinx-build.exe"   "%WD%\docs\en_US" "%BUILDROOT%\docs\en_US\html" || EXIT /B 1
 
     ECHO Removing Sphinx
     CALL pip uninstall -y sphinx Pygments alabaster colorama docutils imagesize requests snowballstemmer
@@ -254,56 +238,50 @@ REM Main build sequence Ends
     CD "%WD%\runtime"
 
     ECHO Running qmake...
-    CALL set "PGADMIN_PYTHON_DIR=%PYTHON_HOME%" && "%QMAKE%" || EXIT /B 1
+    CALL set "PGADMIN_PYTHON_DIR=%PGADMIN_PYTHON_DIR%" && "%PGADMIN_QT_DIR%\bin\qmake.exe" || EXIT /B 1
 
     ECHO Cleaning the build directory...
-    CALL %MAKE% clean || EXIT /B 1
+    CALL nmake clean || EXIT /B 1
 
     ECHO Running make...
-    CALL %MAKE% || EXIT /B 1
+    CALL nmake || EXIT /B 1
 
     ECHO Staging pgAdmin4.exe...
-    COPY "%WD%\runtime\release\pgAdmin4.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%WD%\runtime\release\pgAdmin4.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
 
     ECHO Staging Qt components...
-    COPY "%QTDIR%\bin\Qt5Core.dll"   "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Core.dll"   "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Gui.dll"    "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Gui.dll"    "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Widgets.dll" "%PGBUILDPATH%\runtime" > nul  || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Widgets.dll" "%BUILDROOT%\runtime" > nul  || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Network.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Network.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%QTDIR%\bin\Qt5Svg.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\bin\Qt5Svg.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    IF EXIST "%QTDIR%\bin\libgcc_s_dw2-1.dll" COPY "%QTDIR%\bin\libgcc_s_dw2-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    MKDIR "%BUILDROOT%\runtime\platforms" > nul || EXIT /B 1
-    IF EXIST "%QTDIR%\bin\libstdc++-6.dll" COPY "%QTDIR%\bin\libstdc++-6.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\plugins\platforms\qwindows.dll" "%BUILDROOT%\runtime\platforms" > nul || EXIT /B 1
-    IF EXIST "%QTDIR%\bin\libwinpthread-1.dll" COPY "%QTDIR%\bin\libwinpthread-1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    MKDIR "%BUILDROOT%\runtime\imageformats" > nul || EXIT /B 1
-    MKDIR "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
+    COPY "%PGADMIN_QT_DIR%\plugins\imageformats\qsvg.dll" "%BUILDROOT%\runtime\imageformats" > nul || EXIT /B 1
-    COPY "%QTDIR%\plugins\platforms\qwindows.dll" "%PGBUILDPATH%\runtime\platforms" > nul || EXIT /B 1
+    ECHO [Paths] > "%BUILDROOT%\runtime\qt.conf"
-    MKDIR "%PGBUILDPATH%\runtime\imageformats" > nul || EXIT /B 1
+    ECHO Plugins=plugins >> "%BUILDROOT%\runtime\qt.conf"
-    COPY "%QTDIR%\plugins\imageformats\qsvg.dll" "%PGBUILDPATH%\runtime\imageformats" > nul || EXIT /B 1
-    ECHO [Paths] > "%PGBUILDPATH%\runtime\qt.conf"
-    ECHO Plugins=plugins >> "%PGBUILDPATH%\runtime\qt.conf"
 
     ECHO Staging PostgreSQL components...
-    COPY "%PGDIR%\bin\libpq.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\libpq.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\libcrypto-1_1.dll" (
+    IF "%ARCHITECTURE%" == "x64" (
-        REM OpenSSL 1.1.1
+        COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-1_1-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-        COPY "%PGDIR%\bin\libcrypto-1_1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+        COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-1_1-x64.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-        COPY "%PGDIR%\bin\libssl-1_1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
     ) ELSE (
-        REM OpenSSL 1.0.2
+        COPY "%PGADMIN_POSTGRES_DIR%\bin\libcrypto-1_1.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-        COPY "%PGDIR%\bin\ssleay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+        COPY "%PGADMIN_POSTGRES_DIR%\bin\libssl-1_1.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-        COPY "%PGDIR%\bin\libeay32.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
     )
-    IF EXIST "%PGDIR%\bin\libintl-*.dll" COPY "%PGDIR%\bin\libintl-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libintl-*.dll" "%BUILDROOT%\runtime" > nul
-    IF EXIST "%PGDIR%\bin\libiconv-*.dll" COPY "%PGDIR%\bin\libiconv-*.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    IF EXIST "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" COPY "%PGADMIN_POSTGRES_DIR%\bin\libiconv-*.dll" "%BUILDROOT%\runtime" > nul
-    IF EXIST "%PGDIR%\bin\zlib.dll" COPY "%PGDIR%\bin\zlib.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\zlib.dll" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    IF EXIST "%PGDIR%\bin\zlib1.dll" COPY "%PGDIR%\bin\zlib1.dll" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dump.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\pg_dump.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_dumpall.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1L%
-    COPY "%PGDIR%\bin\pg_dumpall.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1L%
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\pg_restore.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\pg_restore.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY "%PGADMIN_POSTGRES_DIR%\bin\psql.exe" "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY "%PGDIR%\bin\psql.exe" "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
 
     ECHO Staging VC++ runtime...
-    MKDIR "%PGBUILDPATH%\installer" || EXIT /B 1
+    MKDIR "%BUILDROOT%\installer" || EXIT /B 1
-    COPY "%VCREDIST%" "%PGBUILDPATH%\installer" > nul || EXIT /B 1
+    COPY "%PGADMIN_VCREDIST_DIR%\%VCREDIST_FILE%" "%BUILDROOT%\installer" > nul || EXIT /B 1
 
     CD %WD%
     EXIT /B 0
@@ -311,51 +289,51 @@ REM Main build sequence Ends
 
 :CREATE_PYTHON_ENV
     ECHO Staging Python...
-    COPY %PYTHON_DLL% "%PGBUILDPATH%\runtime"  > nul || EXIT /B 1
+    COPY %PGADMIN_PYTHON_DIR%\python%PYTHON_VERSION%.dll "%BUILDROOT%\runtime"  > nul || EXIT /B 1
-    COPY %PYTHON_HOME%\python.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY %PGADMIN_PYTHON_DIR%\python.exe "%BUILDROOT%\runtime" > nul || EXIT /B 1
-    COPY %PYTHON_HOME%\pythonw.exe "%PGBUILDPATH%\runtime" > nul || EXIT /B 1
+    COPY %PGADMIN_PYTHON_DIR%\pythonw.exe "%BUILDROOT%\runtime" > nul || EXIT /B 1
 
     ECHO Cleaning up unnecessary .pyc and .pyo files...
-    FOR /R "%PGBUILDPATH%\%VIRTUALENV%" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
+    FOR /R "%BUILDROOT%\venv" %%f in (*.pyc *.pyo) do DEL /q "%%f" 1> nul 2>&1
     ECHO Removing tests...
-    FOR /R "%PGBUILDPATH%\%VIRTUALENV%\Lib" %%f in (test tests) do RD /Q /S "%%f" 1> nul 2>&1
+    FOR /R "%BUILDROOT%\venv\Lib" %%f in (test tests) do RD /Q /S "%%f" 1> nul 2>&1
     ECHO Removing TCL...
-    RD /Q /S "%PGBUILDPATH%\%VIRTUALENV%\tcl" 1> nul 2>&1
+    RD /Q /S "%BUILDROOT%\venv\tcl" 1> nul 2>&1
 
     EXIT /B 0
 
 
 :CREATE_INSTALLER
     ECHO Preparing for creation of windows installer...
-    IF NOT EXIST "%TARGET_DIR%" MKDIR "%TARGET_DIR%"
+    IF NOT EXIST "%DISTROOT%" MKDIR "%DISTROOT%"
 
     ECHO Copying icon file...
-    COPY "%WD%\pkg\win32\Resources\pgAdmin4.ico" "%PGBUILDPATH%" > nul || EXIT /B 1
+    COPY "%WD%\pkg\win32\Resources\pgAdmin4.ico" "%BUILDROOT%" > nul || EXIT /B 1
 
     CD "%WD%\pkg\win32"
 
     ECHO Processing installer configuration script...
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_NAME -r """%APP_NAME%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in" "-o" "%WD%\pkg\win32\installer.iss.in_stage1" "-s" MYAPP_NAME -r """%APP_NAME%"""
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage1" "-o" "%WD%\pkg\win32\installer.iss.in_stage2" "-s" MYAPP_FULLVERSION -r """%APP_VERSION%"""
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage2" "-o" "%WD%\pkg\win32\installer.iss.in_stage3" "-s" MYAPP_VERSION -r """v%APP_MAJOR%"""
 
     SET ARCMODE=
-    IF "%ARCHITECTURE%"=="amd64" (
+    IF "%ARCHITECTURE%" == "x64" (
         set ARCMODE="x64"
     )
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """%ARCMODE%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage3" "-o" "%WD%\pkg\win32\installer.iss.in_stage4" "-s" MYAPP_ARCHITECTURESMODE -r """%ARCMODE%"""
-    CALL "%PYTHON_HOME%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%VCREDISTNAME%"""
+    CALL "%PGADMIN_PYTHON_DIR%\python" "%WD%\pkg\win32\replace.py" "-i" "%WD%\pkg\win32\installer.iss.in_stage4" "-o" "%WD%\pkg\win32\installer.iss" "-s" MYAPP_VCDIST -r """%PGADMIN_VCREDIST_DIRNAME%\%VCREDIST_FILE%"""
 
     ECHO Cleaning up...
     DEL /s "%WD%\pkg\win32\installer.iss.in_stage*" > nul
 
     ECHO Creating windows installer using INNO tool...
-    CALL "%INNOTOOL%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1
+    CALL "%PGADMIN_INNOTOOL_DIR%\ISCC.exe" /q "%WD%\pkg\win32\installer.iss" || EXIT /B 1
 
     ECHO Renaming installer...
-    MOVE "%WD%\pkg\win32\Output\Setup.exe" "%TARGET_DIR%\%INSTALLERNAME%" > nul || EXIT /B 1
+    MOVE "%WD%\pkg\win32\Output\Setup.exe" "%DISTROOT%\%INSTALLERNAME%" > nul || EXIT /B 1
 
-    ECHO Location - %TARGET_DIR%\%INSTALLERNAME%
+    ECHO Location - %DISTROOT%\%INSTALLERNAME%
     ECHO Installer generated successfully.
 
     CD %WD%
@@ -364,7 +342,7 @@ REM Main build sequence Ends
 
 :SIGN_INSTALLER
     ECHO Attempting to sign the installer...
-    CALL "%SIGNTOOL%" sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%TARGET_DIR%\%INSTALLERNAME%"
+    CALL "%PGADMIN_SIGNTOOL_DIR%\signtool.exe" sign  /t http://timestamp.verisign.com/scripts/timstamp.dll "%DISTROOT%\%INSTALLERNAME%"
     IF %ERRORLEVEL% NEQ 0 (
         ECHO.
         ECHO ************************************************************
@@ -378,15 +356,15 @@ REM Main build sequence Ends
 
 :CLEANUP_ENV
     ECHO Cleaning the build environment...
-    RD "%PGBUILDPATH%\%VIRTUALENV%\Include" /S /Q 1> nul 2>&1
+    RD "%BUILDROOT%\venv\Include" /S /Q 1> nul 2>&1
-    DEL /s "%PGBUILDPATH%\%VIRTUALENV%\pip-selfcheck.json" 1> nul 2>&1
+    DEL /s "%BUILDROOT%\venv\pip-selfcheck.json" 1> nul 2>&1
 
     EXIT /B 0
 
 
 :USAGE
     ECHO Invalid command line options.
-    ECHO Usage: "Make.bat <x86 | clean>"
+    ECHO Usage: "Make.bat [clean]"
     ECHO.
 
     EXIT /B 1

README

@@ -185,15 +185,7 @@ server or desktop mode, and access it from a web browser using the URL shown in
 the terminal once pgAdmin has started up.
 
 Setup of an environment on Windows is somewhat more complicated unfortunately,
-largely due to the lack of a native compiler toolset. See the following wiki
+please see pkg/win32/README.txt for complete details.
-page for more information on the compiler you may need:
-
-https://wiki.python.org/moin/WindowsCompilers
-
-A blog detailing the setup of Virtual Environments on Windows can be found
-here:
-
-http://www.tylerbutler.com/2012/05/how-to-install-python-pip-and-virtualenv-on-windows-with-powershell/
 
 Once a virtual environment has been created and enabled, setup can continue
 from step 4 above.
@@ -299,30 +291,7 @@ run:
 
 To build the macOS AppBundle, please see pkg/mac/README.
 
-On Windows, the InnoSetup tool is required to create an installer. Download the
+To build the Windows installer, please see pkg/win32/README.txt.
-Unicode version from:
-
-http://www.jrsoftware.org/isdl.php
-
-A number of environment variables may need to be set to enable the build script
-to function. The defaults will usually work on a typical 64 bit system with
-Qt 5.14.2, Python 3.8 and Visual Studio 2013. The examples below are for a
-similar 32 bit system:
-
-INNOTOOL=C:\Program Files\Inno Setup 5
-PGDIR=C:\Program Files\PostgreSQL\12
-PYTHON_DLL=C:\Python38\Python38.dll
-PYTHON_HOME=C:\Python38
-PYTHON_VERSION=38
-QTDIR=C:\Qt\5.14.2\msvc2015
-VCDIR=C:\Program Files\Microsoft Visual Studio 14.0\VC
-
-To build the installer:
-
-    C:\$PGADMIN4_SRC> make x86
-
-If you have a code signing certificate, this will automatically be used if
-found in the Windows Certificate Store to sign the installer.
 
 Support
 -------

docs/en_US/release_notes_4_23.rst

@@ -13,6 +13,7 @@ New features
 Housekeeping
 ************
 
+| `Issue #5574 <https://redmine.postgresql.org/issues/5574>`_ -  Cleanup Windows build scripts and ensure Windows x64 builds will work.
 
 Bug fixes
 *********

pkg/win32/README.txt

@@ -1,46 +1,147 @@
-Building pgAdmin windows installer on windows
+These notes describe how to setup a Windows development/build environment for
-=================================
+pgAdmin. They assume a 64bit build is required; adjustments will be required for
+a 32bit build.
 
-To generate a pgAdmin 4 installer for Windows bit, the following packages must be installed:
+Installing build requirements
+=============================
 
-1. Python installation
+1) Install Qt 5.14.2: https://www.qt.io/download-qt-installer
-  - Python 3.4+ or above from https://www.python.org/
 
-2. QT installation
+Use the MSVC++ 2017 64bit option.
-  - Qt 4.6 through 5.5 from http://www.qt.io/
 
-3. PostgreSQL installation
+2) Install Visual Studio 2017 Pro: https://my.visualstudio.com/Downloads?q=Visual%20Studio%202017
-  - PostgreSQL 9.1 or above from http://www.postgresql.org/
 
-4. Inno Setup Installer (unicode)
+Choose the Desktop development with C++ option.
-   - 5.0 and above from http://www.jrsoftware.org/isdl.php
 
-5. Microsoft visual studio (2008 and above)
+3) Install Chocolatey: https://chocolatey.org/install#individual
 
-Building: Depending upon the archicture of the OS(x86|amd64) set then environment variables.
+4) Install various command line tools:
 
-1. Set the PYTHON environment variable to the Python root installation directory, e.g. for x86
+choco install -y  bzip2 cmake diffutils gzip git innosetup nodejs-lts python strawberryperl wget yarn
 
-   SET "PYTHON_HOME=C:\Python38"
+5) Upgrade pip (this may give a permissions error that can be ignored) and
-   SET "PYTHON_DLL=C:\Windows\System32\python38.dll"
+   install the virtualenv package:
 
-2. Set the QTDIR environment variable to the QT root installation directory, e.g. for x86
+pip install --upgrade pip
+pip install virtualenv
 
-   SET "QTDIR=C:\Qt\Qt5.5.1\5.5\msvc2013"
+Building dependencies
+=====================
 
-3. Set the PGDIR environment variable to the PostgreSQL installation directory, e.g. for x86
+The following steps should be run from a Visual Studio 2017 64bit command
+prompt.
 
-   SET "PGDIR=C:\Program Files\PostgreSQL\9.5"
+1) Create a directory for the dependencies:
 
-4. Set the Inno Setup Installer environment variable to the Inno root installation directory, e.g. for x86
+mkdir c:\build64
 
-   SET "INNOTOOL=C:\Program Files\Inno Setup 5"
+2) Download the zlib source code, unpack, and build it:
 
-5. Set the Miscrosoft Visual studio environment variable to the Visual studio root installation directory, e.g. for x86
+wget https://zlib.net/zlib-1.2.11.tar.gz
+tar -zxvf zlib-1.2.11.tar.gz
+cd zlib-1.2.11
+cmake -DCMAKE_INSTALL_PREFIX=C:/build64/zlib -G "Visual Studio 15 2017 Win64" .
+msbuild RUN_TESTS.vcxproj /p:Configuration=Release
+msbuild INSTALL.vcxproj /p:Configuration=Release
+copy C:\build64\zlib\lib\zlib.lib C:\build64\zlib\lib\zdll.lib
 
-   SET "VCDIR=C:\Program Files\Microsoft Visual Studio 12.0\VC"
+3) Download the OpenSSL source code, unpack and build it:
 
-6. To build, go to pgAdmin4 source root directory and execute "Make.bat x86|amd64". Based on x86|amd64, this will
+wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz
-   create the python virtual environment and install all the required python modules mentioned in the
+tar -zxvf openssl-1.1.1g.tar.gz
-   requirements file using pip, build the runtime code and finally create the windows installer x86|amd64 in ./dist directory
+cd openssl-1.1.1g
+perl Configure VC-WIN64A no-asm --prefix=C:\build64\openssl --openssldir=C:\build64\openssl\ssl no-ssl2 no-ssl3 no-comp
+nmake
+nmake test
+nmake install
 
+4) Download the PostgreSQL source code, unpack and build it:
+
+wget https://ftp.postgresql.org/pub/source/v12.3/postgresql-12.3.tar.bz2
+tar -zxvf postgresql-12.3.tar.gz
+cd postgresql-12.3\src\tools\msvc
+
+>> config.pl echo # Configuration arguments for vcbuild.
+>> config.pl echo use strict;
+>> config.pl echo use warnings;
+>> config.pl echo.
+>> config.pl echo our $config = {
+>> config.pl echo 	asserts   =^> 0,        # --enable-cassert
+>> config.pl echo 	ldap      =^> 1,        # --with-ldap
+>> config.pl echo 	extraver  =^> undef,    # --with-extra-version=^<string^>
+>> config.pl echo 	gss       =^> undef,    # --with-gssapi=^<path^>
+>> config.pl echo 	icu       =^> undef,    # --with-icu=^<path^>
+>> config.pl echo 	nls       =^> undef,    # --enable-nls=^<path^>
+>> config.pl echo 	tap_tests =^> undef,    # --enable-tap-tests
+>> config.pl echo 	tcl       =^> undef,    # --with-tcl=^<path^>
+>> config.pl echo 	perl      =^> undef,    # --with-perl
+>> config.pl echo 	python    =^> undef,    # --with-python=^<path^>
+>> config.pl echo 	openssl   =^> 'C:\build64\openssl',    # --with-openssl=^<path^>
+>> config.pl echo 	uuid      =^> undef,    # --with-ossp-uuid
+>> config.pl echo 	xml       =^> undef,    # --with-libxml=^<path^>
+>> config.pl echo 	xslt      =^> undef,    # --with-libxslt=^<path^>
+>> config.pl echo 	iconv     =^> undef,    # (not in configure, path to iconv)
+>> config.pl echo 	zlib      =^> 'C:\build64\zlib'     # --with-zlib=^<path^>
+>> config.pl echo };
+>> config.pl echo.
+>> config.pl echo 1;
+
+>> buildenv.pl echo $ENV{PATH} = "C:\\build64\\openssl\\bin;C:\\build64\\zlib\\bin;$ENV{PATH}";
+
+perl build.pl Release
+perl vcregress.pl check
+perl install.pl C:\build64\pgsql
+copy C:\build64\zlib\bin\zlib.dll C:\build64\pgsql\bin"
+copy C:\build64\openssl\bin\libssl-1_1-x64.dll C:\build64\pgsql\bin"
+copy C:\build64\openssl\bin\libcrypto-1_1-x64.dll C:\build64\pgsql\bin"
+
+Setting up a dev environment
+============================
+
+This section describes the steps to setup and run pgAdmin for the first time in
+a development environment. You do not need to complete this section if you just
+want to build an installer.
+
+1) Check out the source code:
+
+git clone https://git.postgresql.org/git/pgadmin4.git
+
+2) Install and build the JS dependencies
+
+cd pgadmin4\web
+yarn install
+yarn run bundle
+
+3) Create a virtual env
+
+cd pgadmin4
+python -m venv
+pip install -r web\regression\requirements.txt
+pip install sphinx
+
+You should now be able to run the pgAdmin Python application, or build the
+desktop runtime.
+
+Building an installer
+=====================
+
+1) Set the required environment variables, either system-wide, or in a Visual
+Studio 2017 64bit command prompt. Note that the examples shown below are the
+defaults for the build system, so if they match your requirements you don't
+need to set them:
+
+SET "PGADMIN_POSTGRES_DIR=C:\Program Files\PostgreSQL\12"
+SET "PGADMIN_PYTHON_DIR=C:\Python38"
+SET "PGADMIN_QT_DIR=C:\Qt\5.14.2\msvc2017_64"
+SET "PGADMIN_INNOTOOL_DIR=C:\Program Files (x86)\Inno Setup 6"
+SET "PGADMIN_SIGNTOOL_DIR=C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64"
+SET "PGADMIN_VCREDIST_DIR=C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Redist\MSVC\14.16.27012"
+
+2) Run:
+
+make
+
+If you have a code signing certificate, this will automatically be used if
+found in the Windows Certificate Store to sign the installer.
+
+3) Find the completed installer in the dist/ subdirectory of your source tree.