Add add an option -NoPDB to buildInstallers.ps1.

The switch option can be specified so as to exclude PDB files from the installers.

diff --git a/installer/buildInstallers.ps1 b/installer/buildInstallers.ps1
index 53bdb37b29b63666fcb583333e792ffe7c794872..ea60ea6b2e716ec66f221a575827175abce5558a 100644 (file)
--- a/installer/buildInstallers.ps1
+++ b/installer/buildInstallers.ps1
@@ -12,6 +12,8 @@
     Specify when you'd like to exclude a msvc runtime dll from the installer.
 .PARAMETER RedistUCRT
     Specify when you'd like to redistribute Visual C++ 2015(or later) Redistributable.
+.PARAMETER NoPDB
+    Specify when you'd rather not include PDB files.
 .PARAMETER BuildConfigPath
     Specify the configuration xml file name if you want to use
     the configuration file other than standard one.
@@ -34,6 +36,7 @@ Param(
 [switch]$AlongWithDrivers,
 [switch]$ExcludeRuntime,
 [switch]$RedistUCRT,
+[switch]$NoPDB,
 [string]$BuildConfigPath
 )
 
@@ -256,7 +259,7 @@ function buildInstaller([string]$CPUTYPE)
        pushd "$scriptPath"
 
        Write-Host ".`nBuilding psqlODBC/$SUBLOC merge module..."
-       candle -nologo $libpqRelArgs "-dPlatform=$CPUTYPE" "-dVERSION=$VERSION" "-dSUBLOC=$SUBLOC" "-dLIBPQBINDIR=$LIBPQBINDIR" "-dLIBPQMSVCDLL=$LIBPQMSVCDLL" "-dLIBPQMSVCSYS=$LIBPQMSVCSYS" "-dPODBCMSVCDLL=$PODBCMSVCDLL" "-dPODBCMSVPDLL=$PODBCMSVPDLL" "-dPODBCMSVCSYS=$PODBCMSVCSYS" "-dPODBCMSVPSYS=$PODBCMSVPSYS" -o $CPUTYPE\psqlodbcm.wixobj psqlodbcm_cpu.wxs
+       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" -o $CPUTYPE\psqlodbcm.wixobj psqlodbcm_cpu.wxs
        if ($LASTEXITCODE -ne 0) {
            throw "Failed to build merge module"
        }

diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs
index c702e831a7c8d0d2e16b850a8dcff6df0d9bde5a..d8f5d47d26c6c886dc8c30567b7eb8f310a91239 100644 (file)
--- a/installer/psqlodbcm_cpu.wxs
+++ b/installer/psqlodbcm_cpu.wxs
@@ -61,13 +61,21 @@
 
           <!-- PostgreSQL -->
           <File Id="psqlodbc30a.dll" Name="psqlodbc30a.dll" Source="../$(var.ANSIFOLDER)/psqlodbc30a.dll" />
+<?if $(var.NoPDB) != True ?>
           <File Id="psqlodbc30a.pdb" Name="psqlodbc30a.pdb" Source="../$(var.ANSIFOLDER)/psqlodbc30a.pdb" />
+<?endif?>
           <File Id="psqlodbc35w.dll" Name="psqlodbc35w.dll" Source="../$(var.UNICODEFOLDER)/psqlodbc35w.dll" />
+<?if $(var.NoPDB) != True ?>
           <File Id="psqlodbc35w.pdb" Name="psqlodbc35w.pdb" Source="../$(var.UNICODEFOLDER)/psqlodbc35w.pdb" />
+<?endif?>
           <File Id="pgenlist.dll" Name="pgenlist.dll" Source="../$(var.UNICODEFOLDER)/pgenlist.dll" />
+<?if $(var.NoPDB) != True ?>
           <File Id="pgenlist.pdb" Name="pgenlist.pdb" Source="../$(var.UNICODEFOLDER)/pgenlist.pdb" />
+<?endif?>
           <File Id="pgenlista.dll" Name="pgenlista.dll" Source="../$(var.ANSIFOLDER)/pgenlista.dll" />
+<?if $(var.NoPDB) != True ?>
           <File Id="pgenlista.pdb" Name="pgenlista.pdb" Source="../$(var.ANSIFOLDER)/pgenlista.pdb" />
+<?endif?>
    <!-- MSVC Runtime -->
 <?if "$(var.PODBCMSVCDLL)" != "" ?>
           <File Source="$(var.PODBCMSVCDLL)" />