Fix windows client package script (#7623)

- Copy and package dependency DLLs
- Add gpload.bat to make gpload runnable in cmd
- Fix pygresql build script
- Replace gpload version variable

gpAux/client/install/src/windows/CopyDependencies.bat

+set GPDB_DEPENDENCY_PATH=%1
+set GPDB_INSTALL_PATH=%2
+
+copy %GPDB_DEPENDENCY_PATH%\bin\comerr64.dll %GPDB_INSTALL_PATH%\bin
+copy %GPDB_DEPENDENCY_PATH%\bin\gssapi64.dll %GPDB_INSTALL_PATH%\bin
+copy %GPDB_DEPENDENCY_PATH%\bin\k5sprt64.dll %GPDB_INSTALL_PATH%\bin
+copy %GPDB_DEPENDENCY_PATH%\bin\krb5_64.dll %GPDB_INSTALL_PATH%\bin
+copy %GPDB_DEPENDENCY_PATH%\bin\ssleay32.dll %GPDB_INSTALL_PATH%\bin
+copy %GPDB_DEPENDENCY_PATH%\bin\libeay32.dll %GPDB_INSTALL_PATH%\bin
+copy %GPDB_DEPENDENCY_PATH%\bin\zlib.dll %GPDB_INSTALL_PATH%\bin
\ No newline at end of file

gpAux/client/install/src/windows/CreatePackage.bat

@@ -5,6 +5,8 @@ copy ..\..\..\..\..\LICENSE %GPDB_INSTALL_PATH%
 copy ..\..\..\scripts\greenplum_clients_path.bat %GPDB_INSTALL_PATH%
 mkdir %GPDB_INSTALL_PATH%\lib\python\yaml
 copy ..\..\..\..\..\gpMgmt\bin\gpload.py %GPDB_INSTALL_PATH%\bin
+perl -pi.bak -e "s,\$Revision\$,%VERSION%," %GPDB_INSTALL_PATH%\bin\gpload.py
+copy ..\..\..\..\..\gpMgmt\bin\gpload.bat %GPDB_INSTALL_PATH%\bin
 copy ..\..\..\..\..\gpMgmt\bin\ext\yaml\* %GPDB_INSTALL_PATH%\lib\python\yaml
 perl -p -e "s,__VERSION_PLACEHOLDER__,%VERSION%," greenplum-clients.wxs > greenplum-clients-%VERSION%.wxs
 candle.exe -nologo greenplum-clients-%VERSION%.wxs -out greenplum-clients-%VERSION%.wixobj -dSRCDIR=%GPDB_INSTALL_PATH% -dVERSION=%VERSION%

gpAux/client/install/src/windows/greenplum-clients.wxs

@@ -1111,9 +1111,22 @@ If you want to review or change any of your installation settings, click Back. C
                 <File Id="pg_dumpall.exe" Name="pg_dumpall.exe" Source="$(var.SRCDIR)\bin\pg_dumpall.exe" />
                 <File Id="gpfdist.exe" Name="gpfdist.exe" Source="$(var.SRCDIR)\bin\gpfdist.exe" />
                 <File Id="createdb.exe" Name="createdb.exe" Source="$(var.SRCDIR)\bin\createdb.exe" />
+                <File Id="createlang.exe" Name="createlang.exe" Source="$(var.SRCDIR)\bin\createlang.exe" />
+                <File Id="createuser.exe" Name="createuser.exe" Source="$(var.SRCDIR)\bin\createuser.exe" />
+                <File Id="dropdb.exe" Name="dropdb.exe" Source="$(var.SRCDIR)\bin\dropdb.exe" />
+                <File Id="droplang.exe" Name="droplang.exe" Source="$(var.SRCDIR)\bin\droplang.exe" />
+                <File Id="dropuser.exe" Name="dropuser.exe" Source="$(var.SRCDIR)\bin\dropuser.exe" />
                 <File Id="libapr.dll" Name="libapr-1.dll" Source="$(var.SRCDIR)\bin\libapr-1.dll" />
                 <File Id="libpq.dll" Name="libpq.dll" Source="$(var.SRCDIR)\bin\libpq.dll" />
+                <File Id="comerr64.dll" Name="comerr64.dll" Source="$(var.SRCDIR)\bin\comerr64.dll" />
+                <File Id="gssapi64.dll" Name="gssapi64.dll" Source="$(var.SRCDIR)\bin\gssapi64.dll" />
+                <File Id="k5sprt64.dll" Name="k5sprt64.dll" Source="$(var.SRCDIR)\bin\k5sprt64.dll" />
+                <File Id="krb5_64.dll" Name="krb5_64.dll" Source="$(var.SRCDIR)\bin\krb5_64.dll" />
+                <File Id="ssleay32.dll" Name="ssleay32.dll" Source="$(var.SRCDIR)\bin\ssleay32.dll" />
+                <File Id="libeay32.dll" Name="libeay32.dll" Source="$(var.SRCDIR)\bin\libeay32.dll" />
+                <File Id="zlib.dll" Name="zlib.dll" Source="$(var.SRCDIR)\bin\zlib.dll" />
                 <File Id="gpload.py" Name="gpload.py" Source="$(var.SRCDIR)\bin\gpload.py" />
+                <File Id="gpload.bat" Name="gpload.bat" Source="$(var.SRCDIR)\bin\gpload.bat" />
               </Component>
             </Directory>
             <Directory Id="TOPLEVELlib" Name="lib">
@@ -1124,7 +1137,6 @@ If you want to review or change any of your installation settings, click Back. C
                     <File Id="_pg.pyd" Name="_pg.pyd" Source="$(var.SRCDIR)\lib\python\pygresql\_pg.pyd" />
                     <File Id="pg.py" Name="pg.py" Source="$(var.SRCDIR)\lib\python\pygresql\pg.py" />
                     <File Id="pgdb.py" Name="pgdb.py" Source="$(var.SRCDIR)\lib\python\pygresql\pgdb.py" />
-                    <File Id="libpq.dll.32" Name="libpq.dll" Source="$(var.SRCDIR)\lib\python\pygresql\libpq.dll" />
                   </Component>
                 </Directory>
                 <Directory Id="YAMLlib" Name="yaml">

gpAux/client/scripts/greenplum_clients_path.bat

+SET GPHOME_CLIENTS=%~dp0
+SET PATH=%GPHOME_CLIENTS%bin;%PATH%
+SET PYTHONPATH=%GPHOME_CLIENTS%lib\python
\ No newline at end of file

gpMgmt/bin/gpload.bat

+@echo off
+set FOUND=
+for %%X in (python.exe) do (set FOUND=%%~$PATH:X)
+if not defined FOUND (
+    echo "Ensure python2.7 64-bit is installed and set in PATH"
+    exit /B 1
+)
+
+python "%~dp0\gpload.py" %*
\ No newline at end of file

gpMgmt/bin/pythonSrc/PyGreSQL-4.0/CMakeLists.txt

@@ -25,15 +25,16 @@ include_directories(${GPDB_SRC_DIR}/src/include
     ${GPDB_SRC_DIR}/src/port
     ${Python2_INCLUDE_DIRS})
 link_directories(${CMAKE_PREFIX_PATH}/lib)
+find_library(LIBPQ NAMES libpq HINTS ${CMAKE_INSTALL_PREFIX}/LIB)
+find_library(LIBPGPORT NAMES libpgport HINTS ${CMAKE_INSTALL_PREFIX}/LIB)
+find_library(LIBPGCOMMON NAMES libpgcommon HINTS ${CMAKE_INSTALL_PREFIX}/LIB)
 
 add_library (pygresql SHARED pgmodule.c)
-target_link_libraries(pygresql libpq libpgport libpgcommon ws2_32 secur32 ${Python2_LIBRARIES})
+target_link_libraries(pygresql ${LIBPQ} ${LIBPGPORT} ${LIBPGCOMMON} ws2_32 secur32 ${Python2_LIBRARIES})
+
 set_target_properties(pygresql PROPERTIES OUTPUT_NAME "_pg")
 set_target_properties(pygresql PROPERTIES SUFFIX ".pyd")
 install(TARGETS pygresql DESTINATION lib/python/pygresql)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pg.py DESTINATION lib/python/pygresql)
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pgdb.py DESTINATION lib/python/pygresql)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py DESTINATION lib/python/pygresql)
-
-file(TO_CMAKE_PATH ${CMAKE_PREFIX_PATH}/lib/libpq.dll LIBPQDLL)
-install(FILES ${LIBPQDLL} DESTINATION lib/python/pygresql)
\ No newline at end of file
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py DESTINATION lib/python/pygresql)
\ No newline at end of file