From 441aa49f78a7e2999b42a06415c9b74c624d0f36 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sat, 5 Oct 2024 13:18:01 +0200 Subject: [PATCH 01/15] Make product code automatically random Instead of externally generating it and using it explicitly. --- installer/buildInstallers.ps1 | 5 +---- installer/psqlodbc_cpu.wxs | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/installer/buildInstallers.ps1 b/installer/buildInstallers.ps1 index 6373db61..a1f15f09 100644 --- a/installer/buildInstallers.ps1 +++ b/installer/buildInstallers.ps1 @@ -263,9 +263,6 @@ function buildInstaller([string]$CPUTYPE) New-Item -ItemType directory -Path $CPUTYPE | Out-Null } - $PRODUCTCODE = [GUID]::NewGuid() - Write-Host "PRODUCTCODE: $PRODUCTCODE" - try { pushd "$scriptPath" @@ -285,7 +282,7 @@ function buildInstaller([string]$CPUTYPE) Write-Host ".`nBuilding psqlODBC installer database..." - candle -nologo "-dPlatform=$CPUTYPE" "-dVERSION=$VERSION" "-dSUBLOC=$SUBLOC" "-dPRODUCTCODE=$PRODUCTCODE" "-dINSTBASE=$INSTBASE" -o $INSTBASE\psqlodbc.wixobj psqlodbc_cpu.wxs + candle -nologo "-dPlatform=$CPUTYPE" "-dVERSION=$VERSION" "-dSUBLOC=$SUBLOC" "-dINSTBASE=$INSTBASE" -o $INSTBASE\psqlodbc.wixobj psqlodbc_cpu.wxs if ($LASTEXITCODE -ne 0) { throw "Failed to build installer database" } diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index b49b92c1..ddbd8541 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -42,7 +42,7 @@ Date: Sun, 6 Oct 2024 17:30:35 +0200 Subject: [PATCH 02/15] Componentize the merge module This prevents upgrades from leaving files from the previous version behind that are not in the new version. --- installer/psqlodbc_cpu.wxs | 2 +- installer/psqlodbcm_cpu.wxs | 226 ++++++++++++++++++++++-------------- 2 files changed, 141 insertions(+), 87 deletions(-) diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index ddbd8541..800e0353 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -153,7 +153,7 @@ NEWERFOUND AND NOT Installed REINSTALLMODE AND NOT Installed UPGRADEFOUND AND REINSTALLMODE - UPGRADEFOUND AND NOT Installed + UPGRADEFOUND AND NOT Installed diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs index 1edbf1e4..82ad3261 100644 --- a/installer/psqlodbcm_cpu.wxs +++ b/installer/psqlodbcm_cpu.wxs @@ -20,8 +20,6 @@ - - @@ -34,8 +32,6 @@ - - @@ -60,134 +56,192 @@ SummaryCodepage="1252" /> - - - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + - + + + + + + - + + - + + + - + + + - + + + - + + + - + + + - + + + - - - + + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + From fcb4bf898fa93833fb10c5ce67fe7bb7c638c18c Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sat, 5 Oct 2024 17:32:28 +0200 Subject: [PATCH 03/15] Configure drivers on x64 The Way It Should Be Done Use the ODBCDriver element only, without additional Registry settings. This works, although it does not solve the file name issue and therefore still requires removing the short file names from the File table. It also works for installing the x86 driver on an x64 system. Whether it works on an x86 system remains unknown. --- installer/psqlodbcm_cpu.wxs | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs index 82ad3261..952fc2cc 100644 --- a/installer/psqlodbcm_cpu.wxs +++ b/installer/psqlodbcm_cpu.wxs @@ -72,7 +72,14 @@ - + + + + + + + + @@ -86,7 +93,14 @@ - + + + + + + + + @@ -193,17 +207,9 @@ works. Nowadays, it probably would be safe to use ODBCDriver on all platforms, but no-one's gotten around to revisit this --> - - - - - - - - - - - + + + @@ -225,8 +231,9 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - @@ -24,9 +11,9 @@ - + + - @@ -34,6 +21,12 @@ + + + + + + @@ -55,7 +48,6 @@ Comments="PostgreSQL ODBC Driver" Manufacturer="PostgreSQL Global Development Group" InstallerVersion="300" - Platform="$(var.Platform)" Languages="1033" Compressed="yes" SummaryCodepage="1252" /> @@ -67,13 +59,13 @@ - + - + @@ -91,7 +83,7 @@ - + diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs index 08208493..3ef6a855 100644 --- a/installer/psqlodbcm_cpu.wxs +++ b/installer/psqlodbcm_cpu.wxs @@ -1,21 +1,13 @@ - - - - - - - - - - - + + + @@ -26,7 +18,8 @@ - + + @@ -38,6 +31,8 @@ + + @@ -71,7 +65,7 @@ --> - + @@ -81,18 +75,18 @@ - + - + - + - + @@ -102,101 +96,101 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -206,7 +200,7 @@ 32bit machines. We had better register the XA DLL on installation. --> - + From 1c2822799d48b1a357bca024d0bceaee7e964013 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sun, 6 Oct 2024 12:25:23 +0200 Subject: [PATCH 06/15] Reindent --- installer/psqlodbc_cpu.wxs | 54 ++++---- installer/psqlodbcm_cpu.wxs | 240 ++++++++++++++++++------------------ 2 files changed, 152 insertions(+), 142 deletions(-) diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index c8438b50..fb456efb 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -21,7 +21,7 @@ - + @@ -114,38 +114,48 @@ - - - - + + + + + Minimum="$(var.VERSION)" IncludeMinimum='yes' + Maximum="$(var.VERSION)" IncludeMaximum='yes' /> + Minimum="$(var.VERSION)" IncludeMinimum='no' /> + Minimum='8.3.0' IncludeMinimum='yes' + Maximum="$(var.VERSION)" IncludeMaximum='no' /> + Error="the same version of [ProductName] is already installed" /> + Error="a new version of [ProductName] is already installed" /> + Error="REINSTALL unavailable. Major upgrade is needed." /> - - - SELFFOUND AND NOT Installed - NEWERFOUND AND NOT Installed - REINSTALLMODE AND NOT Installed - UPGRADEFOUND AND REINSTALLMODE - UPGRADEFOUND AND NOT Installed - + Error="REINSTALL unavailable. Install the package first." /> + + + + SELFFOUND AND NOT Installed + + + NEWERFOUND AND NOT Installed + + + REINSTALLMODE AND NOT Installed + + + UPGRADEFOUND AND REINSTALLMODE + + + UPGRADEFOUND AND NOT Installed + + diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs index 3ef6a855..8fa3350f 100644 --- a/installer/psqlodbcm_cpu.wxs +++ b/installer/psqlodbcm_cpu.wxs @@ -31,7 +31,7 @@ - + @@ -51,165 +51,165 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - + + + + + + + + + + + From ee9c759df3b00141e767480150ddea28c26a6be7 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sun, 6 Oct 2024 12:24:29 +0200 Subject: [PATCH 07/15] Save some attributes --- installer/psqlodbc_cpu.wxs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index fb456efb..2b2aa213 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -64,16 +64,16 @@ - + - - - - - - - - + + + + + + + + From 2bc0347f72ccaf0f40787d63f00fede50c420a41 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sun, 6 Oct 2024 12:34:38 +0200 Subject: [PATCH 08/15] Replace upgrade logic with MajorUpgrade element This element compiles into approximately the same entries in the Upgrade, CustomAction, and InstallExecuteSequence tables. --- installer/psqlodbc_cpu.wxs | 40 +++----------------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index 2b2aa213..28191add 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -120,42 +120,8 @@ - - - - - - - - - - - - - - SELFFOUND AND NOT Installed - - - NEWERFOUND AND NOT Installed - - - REINSTALLMODE AND NOT Installed - - - UPGRADEFOUND AND REINSTALLMODE - - - UPGRADEFOUND AND NOT Installed - - + From 84c19406e1f610b5b54ecceb87d2eb0d2d0b2cc0 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sun, 6 Oct 2024 12:36:55 +0200 Subject: [PATCH 09/15] Remove unused GUID I think this was the product code, a long time ago. --- installer/psqlodbc_cpu.wxs | 2 -- 1 file changed, 2 deletions(-) diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index 28191add..cb6402b8 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -5,7 +5,6 @@ - @@ -15,7 +14,6 @@ - From f3541e214852beab24a44e2023fe75894d842d38 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sun, 6 Oct 2024 13:53:36 +0200 Subject: [PATCH 10/15] Make MSI file smaller By about 20 percent. --- installer/psqlodbc_cpu.wxs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index cb6402b8..2038ddd6 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -103,7 +103,7 @@ - + From 77b120508555fc084999a056ae4f04ab4f426213 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sat, 12 Oct 2024 11:42:51 +0200 Subject: [PATCH 11/15] Better select where to remove short file names Use the FileName column itself instead of the file ID. This is less susceptible to changes in file IDs (and component IDs) that may happen when relying more on default behaviors in future WiX versions. --- installer/modify_msi.vbs | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/installer/modify_msi.vbs b/installer/modify_msi.vbs index c1353fc8..9f586602 100755 --- a/installer/modify_msi.vbs +++ b/installer/modify_msi.vbs @@ -34,19 +34,16 @@ Dim record Set record = view.Fetch Dim gFile, pos Do While not record Is Nothing -gFile = record.StringData(1) -If Left(gFile, 8) = "psqlodbc" Then - gFile = record.StringData(3) - ' Check if the FileName field is ShortName|LongName - pos = InStr(record.StringData(3), "|") - If pos > 0 Then - ' Omit the ShortName part - gFile = Mid(record.StringData(3), pos + 1) - WScript.echo record.StringData(3) & " -> " & gFile - ' And update the field - record.StringData(3) = gFile - view.Modify msiViewModifyUpdate, record - End If +' Check if the FileName field is ShortName|LongName +gFile = record.StringData(3) +pos = InStr(gFile, "|psqlodbc") +If (pos > 0) Then + ' Omit the ShortName part + gFile = Mid(gFile, pos + 1) + WScript.echo record.StringData(3) & " -> " & gFile + ' And update the field + record.StringData(3) = gFile + view.Modify msiViewModifyUpdate, record End If Set record = view.Fetch Loop From b3ab9019aae9387b0657e1201694df37a1a1b5d9 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Fri, 11 Oct 2024 22:26:57 +0200 Subject: [PATCH 12/15] Build with WiX 5 This is a preview. It appears to build a working x64 installer; I have tested nothing else yet. --- installer/README.txt | 12 ++-- installer/buildInstallers.ps1 | 18 +----- installer/psqlodbc_cpu.wxs | 66 +++++++++----------- installer/psqlodbcm_cpu.wxs | 113 +++++++++++++++++----------------- 4 files changed, 96 insertions(+), 113 deletions(-) diff --git a/installer/README.txt b/installer/README.txt index 3a1b1872..ffaaee4e 100644 --- a/installer/README.txt +++ b/installer/README.txt @@ -1,11 +1,15 @@ This directory contains the psqlODBC installer for Windows. To build the -installer, you will need a copy of WiX installed somewhere in your system -path. The installer has been tested with WiX version 3.0.2420 and WiX 3.8 at -the time writing. +installer, you will need a copy of WiX installed. The installer has been +tested with WiX version 5.0.2 at the time of writing. WiX may be downloaded from: - http://wix.codeplex.com/ + http://wixtoolset.org/ + +In addition to the base package, the UI extension is required: + + dotnet tool install --global wix + wix extension add --global WixToolset.UI.wixext HOW TO BUILD diff --git a/installer/buildInstallers.ps1 b/installer/buildInstallers.ps1 index db79f20b..20e15ef0 100644 --- a/installer/buildInstallers.ps1 +++ b/installer/buildInstallers.ps1 @@ -256,7 +256,7 @@ function buildInstaller([string]$CPUTYPE) [string []]$libpqRelArgs=@() for ($i=0; $i -lt $maxmem; $i++) { - $libpqRelArgs += ("-dLIBPQMEM$i=" + $libpqmem[$i]) + $libpqRelArgs += "-d", ("LIBPQMEM$i=" + $libpqmem[$i]) } if (-not(Test-Path -Path $CPUTYPE)) { @@ -269,30 +269,18 @@ function buildInstaller([string]$CPUTYPE) Write-Host ".`nBuilding psqlODBC/$SUBLOC merge module..." $BINBASE = GetObjbase ".." $INSTBASE = GetObjbase ".\$CPUTYPE" "installer\$CPUTYPE" - candle -nologo -arch $CPUTYPE $libpqRelArgs "-dVERSION=$VERSION" "-dSUBLOC=$SUBLOC" "-dLIBPQBINDIR=$LIBPQBINDIR" "-dLIBPQMSVCDLL=$LIBPQMSVCDLL" "-dLIBPQMSVCSYS=$LIBPQMSVCSYS" "-dPODBCMSVCDLL=$PODBCMSVCDLL" "-dPODBCMSVPDLL=$PODBCMSVPDLL" "-dPODBCMSVCSYS=$PODBCMSVCSYS" "-dPODBCMSVPSYS=$PODBCMSVPSYS" "-dNoPDB=$NoPDB" "-dBINBASE=$BINBASE" -o $INSTBASE\psqlodbcm.wixobj psqlodbcm_cpu.wxs + wix build --nologo -arch $CPUTYPE $libpqRelArgs -d "VERSION=$VERSION" -d "SUBLOC=$SUBLOC" -d "LIBPQBINDIR=$LIBPQBINDIR" -d "LIBPQMSVCDLL=$LIBPQMSVCDLL" -d "LIBPQMSVCSYS=$LIBPQMSVCSYS" -d "PODBCMSVCDLL=$PODBCMSVCDLL" -d "PODBCMSVPDLL=$PODBCMSVPDLL" -d "PODBCMSVCSYS=$PODBCMSVCSYS" -d "PODBCMSVPSYS=$PODBCMSVPSYS" -d "NoPDB=$NoPDB" -d "BINBASE=$BINBASE" -o $INSTBASE\psqlodbc_$CPUTYPE.msm psqlodbcm_cpu.wxs if ($LASTEXITCODE -ne 0) { throw "Failed to build merge module" } - Write-Host ".`nLinking psqlODBC merge module..." - light -sval -nologo -o $INSTBASE\psqlodbc_$CPUTYPE.msm $INSTBASE\psqlodbcm.wixobj - if ($LASTEXITCODE -ne 0) { - throw "Failed to link merge module" - } - Write-Host ".`nBuilding psqlODBC installer database..." - candle -nologo -arch $CPUTYPE "-dVERSION=$VERSION" "-dSUBLOC=$SUBLOC" "-dINSTBASE=$INSTBASE" -o $INSTBASE\psqlodbc.wixobj psqlodbc_cpu.wxs + wix build --nologo -arch $CPUTYPE -ext WixToolset.UI.wixext -d "VERSION=$VERSION" -d "SUBLOC=$SUBLOC" -d "INSTBASE=$INSTBASE" -o $INSTBASE\psqlodbc_$CPUTYPE.msi psqlodbc_cpu.wxs if ($LASTEXITCODE -ne 0) { throw "Failed to build installer database" } - Write-Host ".`nLinking psqlODBC installer database..." - light -sval -nologo -ext WixUIExtension -cultures:en-us -o $INSTBASE\psqlodbc_$CPUTYPE.msi $INSTBASE\psqlodbc.wixobj - if ($LASTEXITCODE -ne 0) { - throw "Failed to link installer database" - } - Write-Host ".`nModifying psqlODBC installer database..." cscript modify_msi.vbs $INSTBASE\psqlodbc_$CPUTYPE.msi if ($LASTEXITCODE -ne 0) { diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index 2038ddd6..4fa54a8a 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -1,5 +1,6 @@ - + @@ -24,46 +25,43 @@ - + - + - - + Comments="PostgreSQL ODBC Driver"/> - - + - + - - + + - + - + @@ -78,20 +76,19 @@ - - - - - + + + + + - - + - + @@ -105,14 +102,9 @@ - - - $(var.ALLUSERS) - - - + @@ -121,5 +113,5 @@ - + diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs index 8fa3350f..4bc5d990 100644 --- a/installer/psqlodbcm_cpu.wxs +++ b/installer/psqlodbcm_cpu.wxs @@ -1,5 +1,5 @@ - + @@ -36,20 +36,19 @@ - + Codepage="1252" /> - + - - + + @@ -77,19 +76,19 @@ - + - + - + - + - - + + @@ -98,101 +97,101 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -201,16 +200,16 @@ installation. --> - + - + - + From 1796fa610bd11e20d012e9e47ede0bc19ad956e2 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sat, 12 Oct 2024 11:46:10 +0200 Subject: [PATCH 13/15] Clean up modify_msi.vbs Also, put blame where it belongs, which is Windows Installer. If this was a bug in WiX, then the fix would be to enforce 8.3 file names for ODBC drivers, and we wouldn't like that very much either, would we? --- installer/modify_msi.vbs | 55 ++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/installer/modify_msi.vbs b/installer/modify_msi.vbs index 9f586602..8934411c 100755 --- a/installer/modify_msi.vbs +++ b/installer/modify_msi.vbs @@ -2,7 +2,7 @@ ' When the dll name of the driver is not of 8.3-format ' the modification of the FileName is needed ' -' This is to work-around a bug in the WiX Toolset, see +' This is to work-around an oversight in Windows Installer, see ' http://wixtoolset.org/issues/1422/ ' ' We remove the short name from the filename field in the File-table @@ -10,42 +10,43 @@ ' speaking, that makes the contents of the table invalid, because a short ' name is mandatory, but Windows Installer seems nevertheless install it ' just fine. -' -option Explicit -Const msiOpenDatabaseModeTransact = 1 +Option Explicit +Const msiOpenDatabaseModeTransact = 1 Const msiViewModifyInsert = 1 Const msiViewModifyUpdate = 2 +Const query = "SELECT * FROM File" -Dim msiPath : msiPath = Wscript.Arguments(0) +Dim installer, database +Dim view, record +Dim pos, filename -Dim installer Set installer = Wscript.CreateObject("WindowsInstaller.Installer") -Dim database -Set database = installer.OpenDatabase(msiPath, msiOpenDatabaseModeTransact) - -Dim query -query = "Select * FROM File" -Dim view +Set database = installer.OpenDatabase(WScript.Arguments(0), _ + msiOpenDatabaseModeTransact) Set view = database.OpenView(query) view.Execute -Dim record -Set record = view.Fetch -Dim gFile, pos -Do While not record Is Nothing -' Check if the FileName field is ShortName|LongName -gFile = record.StringData(3) -pos = InStr(gFile, "|psqlodbc") -If (pos > 0) Then - ' Omit the ShortName part - gFile = Mid(gFile, pos + 1) - WScript.echo record.StringData(3) & " -> " & gFile - ' And update the field - record.StringData(3) = gFile - view.Modify msiViewModifyUpdate, record -End If + Set record = view.Fetch +Do While Not record Is Nothing + + filename = record.StringData(3) + pos = InStr(filename, "|psqlodbc") + + If (pos > 0) Then + + ' Remove the ShortName part + filename = Mid(filename, pos + 1) + WScript.echo record.StringData(3) & " -> " & filename + + record.StringData(3) = filename + view.Modify msiViewModifyUpdate, record + + End If + + Set record = view.Fetch + Loop database.Commit From 805c244d92850e7690e75a8921004a4587f22662 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Sat, 12 Oct 2024 13:09:16 +0200 Subject: [PATCH 14/15] Increase WiX-5-ness - Remove most Component elements in favor of naked files - Replace PGFOLDER variable with ProgramFiles6432Folder The Condition element on Component has become an attribute in WiX 5, and the combination of preprocessor and component condition (i.e. include a non-x64 condition only in a non-x64 package) to install PGXA only from a package native to the underlying OS does not work anymore. Replace it with a pure component condition that includes the package architecture. The Template summary property has this information already, but it is not available from within the installation, and I'm not about to start writing custom actions. --- installer/psqlodbc_cpu.wxs | 79 +++++++++-------- installer/psqlodbcm_cpu.wxs | 165 ++++++++++-------------------------- 2 files changed, 86 insertions(+), 158 deletions(-) diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs index 4fa54a8a..60075cfd 100644 --- a/installer/psqlodbc_cpu.wxs +++ b/installer/psqlodbc_cpu.wxs @@ -5,7 +5,6 @@ - @@ -14,7 +13,6 @@ - @@ -37,54 +35,54 @@ UpgradeCode="$(UPGCOD)" Name="$(PKGNAME)" Version="$(VERSION)" - Codepage="1252" - InstallerVersion="300" - Compressed="yes" + Codepage="1252" + InstallerVersion="300" + Compressed="yes" Language="1033"> + Comments="PostgreSQL ODBC Driver" /> - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + + + + + + + - + + + + + + + + + + @@ -104,14 +102,15 @@ - + + - + \ No newline at end of file diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs index 4bc5d990..f2cd82ea 100644 --- a/installer/psqlodbcm_cpu.wxs +++ b/installer/psqlodbcm_cpu.wxs @@ -37,9 +37,9 @@ - + + - - - - + - + - + - - - - - + + - - - - - - - - - + + + + - + - + - - - - - + + - - - - - - - + + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - - + + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - - - - + 32bit machines. Install the XA DLL only from a native package. + --> + - - - + \ No newline at end of file From 258052ccc92f02f2e5a67ff5c70379919a460aa5 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Mon, 14 Oct 2024 11:32:07 +0200 Subject: [PATCH 15/15] Update build workflow for WiX 5 --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ca452049..8d3db77b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -275,6 +275,12 @@ jobs: with: arch: x86 + - name: Install WiX + shell: cmd + run: | + dotnet tool install --global wix + wix extension add --global WixToolset.UI.wixext + - name: build psqlodbc standard shell: powershell working-directory: psqlodbc