From f36a60fd8c3f3fea387c758882de7c86a4bac067 Mon Sep 17 00:00:00 2001
From: Hiroshi Inoue <h-inoue@dream.email.ne.jp>
Date: Thu, 23 Nov 2017 09:55:09 +0900
Subject: [PATCH] Add add an option -NoPDB to buildInstallers.ps1. The switch
 option can be specified so as to exclude PDB files from the installers.

---
 installer/buildInstallers.ps1 | 5 ++++-
 installer/psqlodbcm_cpu.wxs   | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/installer/buildInstallers.ps1 b/installer/buildInstallers.ps1
index 53bdb37..ea60ea6 100644
--- 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 c702e83..d8f5d47 100644
--- 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)" />
-- 
2.39.5