Skip to content

Commit

Permalink
Install the drivers with short file names (#76)
Browse files Browse the repository at this point in the history
* Install the drivers with short file names

This avoids the need to post-process the MSI file to work around
http://wixtoolset.org/issues/1422/ (installing ODBC drivers with long
file names fails).

For compatibility with existing configurations the short-named DLLs are
also installed with their original long names.

* Remove modify_msi.vbs
  • Loading branch information
chrullrich authored Dec 9, 2024
1 parent f92776d commit 8d41363
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 60 deletions.
6 changes: 0 additions & 6 deletions installer/buildInstallers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -281,12 +281,6 @@ function buildInstaller([string]$CPUTYPE)
throw "Failed to build installer database"
}

Write-Host ".`nModifying psqlODBC installer database..."
cscript modify_msi.vbs $INSTBASE\psqlodbc_$CPUTYPE.msi
if ($LASTEXITCODE -ne 0) {
throw "Failed to modify installer database"
}

Write-Host ".`nDone!`n"
}
catch [Exception] {
Expand Down
52 changes: 0 additions & 52 deletions installer/modify_msi.vbs

This file was deleted.

6 changes: 4 additions & 2 deletions installer/psqlodbcm_cpu.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
<Directory Id="INSTALLFOLDER" />

<!-- PostgreSQL -->
<File Name="psqlodbc30a.dll" Source="$(BINBASE)\$(ANSIFOLDER)\psqlodbc30a.dll">
<File Name="podbc30a.dll" Source="$(BINBASE)\$(ANSIFOLDER)\psqlodbc30a.dll">
<CopyFile DestinationName="psqlodbc30a.dll" />
<ODBCDriver Id="Psqlodbc_9.0_Driver_ANSI" Name="PostgreSQL ANSI($(Platform))">
<Property Id="CPTimeout" Value="60" />
</ODBCDriver>
Expand All @@ -65,7 +66,8 @@
<File Name="psqlodbc30a.pdb" Source="$(BINBASE)\$(ANSIFOLDER)\psqlodbc30a.pdb" />
<File Name="pgenlista.pdb" Source="$(BINBASE)\$(ANSIFOLDER)\pgenlista.pdb" />
<?endif ?>
<File Name="psqlodbc35w.dll" Source="$(BINBASE)\$(UNICODEFOLDER)\psqlodbc35w.dll">
<File Name="podbc35w.dll" Source="$(BINBASE)\$(UNICODEFOLDER)\psqlodbc35w.dll">
<CopyFile DestinationName="psqlodbc35w.dll" />
<ODBCDriver Id="Psqlodbc_9.0_Driver" Name="PostgreSQL Unicode($(Platform))">
<Property Id="CPTimeout" Value="60" />
</ODBCDriver>
Expand Down

0 comments on commit 8d41363

Please sign in to comment.