[mapguide-commits] r10095 - in trunk/Installer: . Custom/apache_actions Libraries/MapGuide Server Support Support/libpq

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Aug 13 06:50:52 PDT 2024


Author: jng
Date: 2024-08-13 06:50:50 -0700 (Tue, 13 Aug 2024)
New Revision: 10095

Added:
   trunk/Installer/Support/libpq/
   trunk/Installer/Support/libpq/PROVENANCE.txt
   trunk/Installer/Support/libpq/libcrypto-3-x64.dll
   trunk/Installer/Support/libpq/libiconv-2.dll
   trunk/Installer/Support/libpq/libintl-9.dll
   trunk/Installer/Support/libpq/libpq.dll
   trunk/Installer/Support/libpq/libssl-3-x64.dll
   trunk/Installer/Support/libpq/libwinpthread-1.dll
Modified:
   trunk/Installer/Custom/apache_actions/
   trunk/Installer/Libraries/MapGuide Server/FDO.wxs
   trunk/Installer/build.bat
Log:
Bundle newer libpq binaries for packaging with Windows Installer

Fixes #2882

Index: trunk/Installer/Custom/apache_actions
===================================================================
--- trunk/Installer/Custom/apache_actions	2024-08-13 11:27:36 UTC (rev 10094)
+++ trunk/Installer/Custom/apache_actions	2024-08-13 13:50:50 UTC (rev 10095)

Property changes on: trunk/Installer/Custom/apache_actions
___________________________________________________________________
Modified: svn:ignore
## -5,3 +5,5 ##
 bin110_x64
 Release110_Win32
 Release110_x64
+bin142_x64
+Release142_x64
Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2024-08-13 11:27:36 UTC (rev 10094)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs	2024-08-13 13:50:50 UTC (rev 10095)
@@ -146,8 +146,11 @@
               <File Id="PostgreSqlOverrides" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostgreSQLOverrides.dll" />
               <File Id="PostgreSqlProvider" Checksum="yes" Source="$(var.MgSource)\Server\FDO\PostgreSQLProvider.dll" />
               <File Id="LibPq" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libpq.dll" />
-              <File Id="LibSsl" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libssl-1_1-x64.dll" />
-              <File Id="LibCrypto" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libcrypto-1_1-x64.dll" />
+              <File Id="LibSsl" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libssl-3-x64.dll" />
+              <File Id="LibCrypto" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libcrypto-3-x64.dll" />
+              <File Id="LibIconv" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libiconv-2.dll" />
+              <File Id="LibIntl" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libintl-9.dll" />
+              <File Id="LibWinPthread" Checksum="yes" Source="$(var.MgSource)\Server\FDO\libwinpthread-1.dll" />
           </Component>
           <!-- SDF Provider -->
           <Component Id="FdoSdfProviderComponent" Win64="$(var.Win64)" Guid="F0976038-9F62-42E7-AA6E-B37C33744C6F">

Added: trunk/Installer/Support/libpq/PROVENANCE.txt
===================================================================
--- trunk/Installer/Support/libpq/PROVENANCE.txt	                        (rev 0)
+++ trunk/Installer/Support/libpq/PROVENANCE.txt	2024-08-13 13:50:50 UTC (rev 10095)
@@ -0,0 +1,7 @@
+These dlls have been sourced from the x64 release of PostgreSQL 16.3
+
+https://www.enterprisedb.com/download-postgresql-binaries
+
+The list of dlls here was determined from a recursive dependency scan of libpq.dll using the dependencies tool
+
+https://github.com/lucasg/Dependencies
\ No newline at end of file

Added: trunk/Installer/Support/libpq/libcrypto-3-x64.dll
===================================================================
(Binary files differ)

Index: trunk/Installer/Support/libpq/libcrypto-3-x64.dll
===================================================================
--- trunk/Installer/Support/libpq/libcrypto-3-x64.dll	2024-08-13 11:27:36 UTC (rev 10094)
+++ trunk/Installer/Support/libpq/libcrypto-3-x64.dll	2024-08-13 13:50:50 UTC (rev 10095)

Property changes on: trunk/Installer/Support/libpq/libcrypto-3-x64.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Installer/Support/libpq/libiconv-2.dll
===================================================================
(Binary files differ)

Index: trunk/Installer/Support/libpq/libiconv-2.dll
===================================================================
--- trunk/Installer/Support/libpq/libiconv-2.dll	2024-08-13 11:27:36 UTC (rev 10094)
+++ trunk/Installer/Support/libpq/libiconv-2.dll	2024-08-13 13:50:50 UTC (rev 10095)

Property changes on: trunk/Installer/Support/libpq/libiconv-2.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Installer/Support/libpq/libintl-9.dll
===================================================================
(Binary files differ)

Index: trunk/Installer/Support/libpq/libintl-9.dll
===================================================================
--- trunk/Installer/Support/libpq/libintl-9.dll	2024-08-13 11:27:36 UTC (rev 10094)
+++ trunk/Installer/Support/libpq/libintl-9.dll	2024-08-13 13:50:50 UTC (rev 10095)

Property changes on: trunk/Installer/Support/libpq/libintl-9.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Installer/Support/libpq/libpq.dll
===================================================================
(Binary files differ)

Index: trunk/Installer/Support/libpq/libpq.dll
===================================================================
--- trunk/Installer/Support/libpq/libpq.dll	2024-08-13 11:27:36 UTC (rev 10094)
+++ trunk/Installer/Support/libpq/libpq.dll	2024-08-13 13:50:50 UTC (rev 10095)

Property changes on: trunk/Installer/Support/libpq/libpq.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Installer/Support/libpq/libssl-3-x64.dll
===================================================================
(Binary files differ)

Index: trunk/Installer/Support/libpq/libssl-3-x64.dll
===================================================================
--- trunk/Installer/Support/libpq/libssl-3-x64.dll	2024-08-13 11:27:36 UTC (rev 10094)
+++ trunk/Installer/Support/libpq/libssl-3-x64.dll	2024-08-13 13:50:50 UTC (rev 10095)

Property changes on: trunk/Installer/Support/libpq/libssl-3-x64.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/Installer/Support/libpq/libwinpthread-1.dll
===================================================================
(Binary files differ)

Index: trunk/Installer/Support/libpq/libwinpthread-1.dll
===================================================================
--- trunk/Installer/Support/libpq/libwinpthread-1.dll	2024-08-13 11:27:36 UTC (rev 10094)
+++ trunk/Installer/Support/libpq/libwinpthread-1.dll	2024-08-13 13:50:50 UTC (rev 10095)

Property changes on: trunk/Installer/Support/libpq/libwinpthread-1.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat	2024-08-13 11:27:36 UTC (rev 10094)
+++ trunk/Installer/build.bat	2024-08-13 13:50:50 UTC (rev 10095)
@@ -209,9 +209,7 @@
 7z x %PHP_TS_PACKAGE% -y -o"%MG_SOURCE%\Web\Php"
 popd
 echo [prepare] Copy support dlls for PostgreSQL provider
-copy /Y "%MG_SOURCE%\Web\Php\libpq.dll" "%MG_SOURCE%\Server\FDO"
-copy /Y "%MG_SOURCE%\Web\Php\libssl-1_1-x64.dll" "%MG_SOURCE%\Server\FDO"
-copy /Y "%MG_SOURCE%\Web\Php\libcrypto-1_1-x64.dll" "%MG_SOURCE%\Server\FDO"
+copy /Y "%INSTALLER_DEV%\Support\libpq\*.dll" "%MG_SOURCE%\Server\FDO"
 rem copy template configs on top
 echo [prepare] Tomcat config
 %XCOPY% "%INSTALLER_DEV%\Support\Web\%PLATFORM_CLR%\configs\Tomcat" "%MG_SOURCE%\Web\Tomcat"



More information about the mapguide-commits mailing list