From: Regina Obe <lr@pcorp.us>
Date: Mon, 14 Oct 2019 06:38:09 +0000 (+0000)
Subject: Add missing libxml and ssl libs for windows packaging
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9796ad61e18f2390622ccb4fc95c235df2c0e390;p=postgis

Add missing libxml and ssl libs for windows packaging
references #3442 for PostGIS 3.1

git-svn-id: http://svn.osgeo.org/postgis/trunk@17916 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index b11f60cba..9937a8da1 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -16,9 +16,9 @@
 #otherwise use the ones jenkins passes thru
 #!/bin/bash
 if  [[ "${OVERRIDE}" == '' ]] ; then
-	export GEOS_VER=3.8.0rc2
-	export GDAL_VER=2.2.4
-	export PROJ_VER=4.9.3
+	export GEOS_VER=3.8.0
+	export GDAL_VER=2.4.2
+	export PROJ_VER=5.2.0
 	export SFCGAL_VER=1.3.2
 	export CGAL_VER=4.11
 	export ICON_VER=1.15
@@ -26,7 +26,7 @@ if  [[ "${OVERRIDE}" == '' ]] ; then
   	export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1
 	export JSON_VER=0.12
-	export PROJSO=libproj-12.dll
+	export PROJSO=libproj-13.dll
 fi;
 
 export PROTOBUF_VER=3.2.0
@@ -48,7 +48,7 @@ fi;
 
 #set to something even if override is on but not set
 if  [[ "${LIBXML_VER}" == '' ]] ; then
-  export LIBXML_VER=2.7.8
+  export LIBXML_VER=2.9.9
 fi;
 
 #set to something even if override is on but not set
@@ -144,6 +144,8 @@ cp ${PGPATHEDB}/bin/libintl*.dll $outdir/bin/postgisgui
 
 cp ${PGPATHEDB}/bin/ssleay32.dll $outdir/bin/postgisgui
 cp ${PGPATHEDB}/bin/libeay32.dll $outdir/bin/postgisgui
+cp ${PGPATHEDB}/bin/libcrypto-1_1-x64.dll $outdir/bin/postgisgui
+cp ${PGPATHEDB}/bin/libssl-1_1-x64.dll $outdir/bin/postgisgui
 
 cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libstdc++-6.dll $outdir/bin
 cp /c/ming${OS_BUILD}${GCC_TYPE}/mingw${OS_BUILD}/bin/libgcc*.dll $outdir/bin
@@ -201,7 +203,7 @@ fi;
 
 echo "PROTOBUF VERSION: ${PROTOBUF_VER} https://github.com/google/protobuf" >> $verfile
 echo "PROTOBUF-C VERSION: ${PROTOBUFC_VER} https://github.com/protobuf-c/protobuf-c"  >> $verfile
-cp ${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}/bin/*.dll  $outdir/bin/
+cp ${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll  $outdir/bin/
 #cp ${PGPATHEDB}/bin/libxml2-2.dll   $outdir/bin/
 
 cd ${POSTGIS_SRC}