diff --git a/installer/buildInstallers.ps1 b/installer/buildInstallers.ps1
index 6373db61..db79f20b 100644
--- a/installer/buildInstallers.ps1
+++ b/installer/buildInstallers.ps1
@@ -263,16 +263,13 @@ function buildInstaller([string]$CPUTYPE)
New-Item -ItemType directory -Path $CPUTYPE | Out-Null
}
- $PRODUCTCODE = [GUID]::NewGuid()
- Write-Host "PRODUCTCODE: $PRODUCTCODE"
-
try {
pushd "$scriptPath"
Write-Host ".`nBuilding psqlODBC/$SUBLOC merge module..."
$BINBASE = GetObjbase ".."
$INSTBASE = GetObjbase ".\$CPUTYPE" "installer\$CPUTYPE"
- candle -nologo $libpqRelArgs "-dPlatform=$CPUTYPE" "-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
+ 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
if ($LASTEXITCODE -ne 0) {
throw "Failed to build merge module"
}
@@ -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 -arch $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/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
diff --git a/installer/psqlodbc_cpu.wxs b/installer/psqlodbc_cpu.wxs
index b49b92c1..2038ddd6 100644
--- a/installer/psqlodbc_cpu.wxs
+++ b/installer/psqlodbc_cpu.wxs
@@ -1,39 +1,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
-
-
+
+
+
+
+
+
@@ -42,7 +33,7 @@
@@ -67,21 +57,21 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -91,7 +81,7 @@
diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs
index 1edbf1e4..8fa3350f 100644
--- a/installer/psqlodbcm_cpu.wxs
+++ b/installer/psqlodbcm_cpu.wxs
@@ -1,47 +1,38 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
-
-
+
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+