Rename Windows output folders, for clarity.

diff --git a/.gitignore b/.gitignore
index f863c63e7cfd36f88554b991519f02c0a57b6d82..aebe4cb0c1fe799de76651f5c784ee89220366ce 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -46,10 +46,14 @@ windows-local.mak
 /stamp-h1
 
 # Folders generated by Windows build
-/AMD64
-/AMD64ANSI
-/MultibyteRelease
-/Release
+/x86_ANSI_Release
+/x86_ANSI_Debug
+/x86_Unicode_Release
+/x86_Unicode_Debug
+/x64_ANSI_Release
+/x64_ANSI_Debug
+/x64_Unicode_Release
+/x64_Unicode_Debug
 
 # VC build tools (nmake, cl, link,lib etc) generate
 *.obj

diff --git a/installer/psqlodbcm.wxs b/installer/psqlodbcm.wxs
index c7040197b2c239195479e030ee9cde48a9e3393a..fbf83447d368284969354047dfc3806fd33ef6e7 100644 (file)
--- a/installer/psqlodbcm.wxs
+++ b/installer/psqlodbcm.wxs
@@ -19,11 +19,11 @@
       <Directory Id="BINDIR" Name=".">
         <Component Id="psqlodbc.files" Guid="00A1ACE3-B7C2-41b8-A1F1-DB565990DA4E">
           <!-- PostgreSQL -->
-          <File Id="psqlodbc30a.dll" Name="psqlodbc30a.dll" Source="../MultibyteRelease/psqlodbc30a.dll" />
-          <File Id="psqlodbc35w.dll" Name="psqlodbc35w.dll" Source="../Release/psqlodbc35w.dll" />
-          <File Id="pgxalib.dll" Name="pgxalib.dll" Source="../Release/pgxalib.dll" />
-          <File Id="pgenlist.dll" Name="pgenlist.dll" Source="../Release/pgenlist.dll" />
-          <File Id="pgenlista.dll" Name="pgenlista.dll" Source="../MultibyteRelease/pgenlista.dll" />
+          <File Id="psqlodbc30a.dll" Name="psqlodbc30a.dll" Source="../x86_ANSI_Release/psqlodbc30a.dll" />
+          <File Id="psqlodbc35w.dll" Name="psqlodbc35w.dll" Source="../x86_Unicode_Release/psqlodbc35w.dll" />
+          <File Id="pgxalib.dll" Name="pgxalib.dll" Source="../x86_Unicode_Release/pgxalib.dll" />
+          <File Id="pgenlist.dll" Name="pgenlist.dll" Source="../x86_Unicode_Release/pgenlist.dll" />
+          <File Id="pgenlista.dll" Name="pgenlista.dll" Source="../x86_ANSI_Release/pgenlista.dll" />
 <?if "$(var.LINKFILES)" != ""?>
           <File Id="libpq.dll" Name="libpq.dll" Source="$(var.LINKFILES)\libpq.dll" KeyPath="yes" />
 

diff --git a/installer/psqlodbcm_cpu.wxs b/installer/psqlodbcm_cpu.wxs
index fc7d1df893e36fcc6deed2e4823bffa0d4099282..7dd147887a378305371467b146945bee553f78ae 100644 (file)
--- a/installer/psqlodbcm_cpu.wxs
+++ b/installer/psqlodbcm_cpu.wxs
@@ -4,14 +4,14 @@
 <?define ModuleName = "psqlODBC_$(var.Platform)" ?>
 <?if $(var.Platform) = x64 ?>
 <?define BIT64 = "yes" ?>
-<?define ANSIFOLDER = "AMD64ANSI" ?>
-<?define UNICODEFOLDER = "AMD64" ?>
+<?define ANSIFOLDER = "x64_ANSI_Release" ?>
+<?define UNICODEFOLDER = "x64_Unicode_Release" ?>
 <?define Module_PackageId = "970B6E07-7105-4d66-80FA-9E208952FB96" ?>
 <?define CIDPFILES = "5C9A19B5-D7C6-4bb4-BBBC-88C2A67A59B0" ?>
 <?else?>
 <?define BIT64 = "no" ?>
-<?define ANSIFOLDER = "MultibyteRelease" ?>
-<?define UNICODEFOLDER = "Release" ?>
+<?define ANSIFOLDER = "x86_ANSI_Release" ?>
+<?define UNICODEFOLDER = "x86_Unicode_Release" ?>
 <?define Module_PackageId = "ACF10866-5C01-46f0-90F0-D5618638CA4A" ?>
 <?define CIDPFILES = "00A1ACE3-B7C2-41b8-A1F1-DB565990DA50" ?>
 <?endif?>
@@ -19,8 +19,8 @@
 <?define BIT64 = "no" ?>
 <?define Platform = "x86" ?>
 <?define ModuleName = "psqlODBC" ?>
-<?define ANSIFOLDER = "MultibyteRelease" ?>
-<?define UNICODEFOLDER = "Release" ?>
+<?define ANSIFOLDER = "x86_ANSI_Release" ?>
+<?define UNICODEFOLDER = "x86_Unicode_Release" ?>
 <?define Module_PackageId = "ACF10866-5C01-46f0-90F0-D5618638CA48" ?>
 <?define CIDPFILES = "00A1ACE3-B7C2-41b8-A1F1-DB565990DA4E" ?>
 <?endif?>

diff --git a/win64.mak b/win64.mak
index 60655bab5e726075d6bc163a1ff95ca244dcaf13..d7d83e0e096e7a9eccabab3a86a7f9bdc9532873 100755 (executable)
--- a/win64.mak
+++ b/win64.mak
@@ -149,20 +149,22 @@ MAINDLL = $(MAINLIB).dll
 XALIB = pgxalib
 XADLL = $(XALIB).dll
 
-# Construct output directory name. The base name is the target architecture,
-# i.e. ".\x86" or ".\x64". For the ANSI version, "ANSI" is appended to the
-# base name. Finally, for Debug-enabled version, "Debug" is appended.
+# Construct output directory name. The name consists of three parts,
+# target CPU, ANSI/Unicode, and Debug/Release. For example,the output
+# directory debug-enabled 32-bit ANSI-version is:
 #
-# For example,the output directory debug-enabled 32-bit ANSI-version is:
-#
-# .\X86ANSIDebug
+# .\x86_ANSI_Debug
 #
 OUTDIR=.\$(TARGET_CPU)
 !IF  "$(ANSI_VERSION)" == "yes"
-OUTDIR=$(OUTDIR)ANSI
+OUTDIR=$(OUTDIR)_ANSI
+!ELSE
+OUTDIR=$(OUTDIR)_Unicode
 !ENDIF
 !IF  "$(CFG)" == "Debug"
-OUTDIR=$(OUTDIR)Debug
+OUTDIR=$(OUTDIR)_Debug
+!ELSE
+OUTDIR=$(OUTDIR)_Release
 !ENDIF
 
 # Location for intermediary build targets (e.g. *.obj files).

diff --git a/winbuild/BuildAll.ps1 b/winbuild/BuildAll.ps1
index 12a7a7a96a6f13355f5d8d3ff41a287ba7729a05..6b68e04eb14d49c6bd9e97bae0a8d0e627878642 100755 (executable)
--- a/winbuild/BuildAll.ps1
+++ b/winbuild/BuildAll.ps1
@@ -11,7 +11,7 @@
     Visual Studio version is determined automatically unless this
     option is specified.
 .PARAMETER Platform
-    Specify build platforms, "both"(default), "Wind32" or "x64" is
+    Specify build platforms, "both"(default), "Win32" or "x64" is
     available.
 .PARAMETER Toolset
     MSBuild PlatformToolset is determined automatically unless this

diff --git a/winbuild/pgenlist.vcxproj b/winbuild/pgenlist.vcxproj
index 750300a1b1df0365d5dc090dcbe6904d8de6d696..b7653655bf0af01623dc7fe599416dd9ad8a94de 100755 (executable)
--- a/winbuild/pgenlist.vcxproj
+++ b/winbuild/pgenlist.vcxproj
@@ -72,44 +72,28 @@
   <PropertyGroup Label="UserMacros" >\r
    <ANSI_VERSION>no</ANSI_VERSION>\r
   </PropertyGroup>\r
-  <!-- ANSI_VERSION -->\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='yes|Win32'">\r
-   <TargetName>pgenlista</TargetName>\r
-   <DriverName>psqlodbc30a</DriverName>\r
-   <!-- OutDir>$(OutDir)ANSI\</OutDir>\r
-   <IntDir>$(IntDir)ANSI\pgenlist\</IntDir -->\r
-   <OutDir>$(srcPath)Multibyte$(Configuration)\</OutDir>\r
-   <IntDir>$(srcPath)Multibyte$(Configuration)\pgenlist\</IntDir>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='no|Win32'">\r
-   <TargetName>pgenlist</TargetName>\r
-   <DriverName>psqlodbc35w</DriverName>\r
-   <!-- IntDir>$(IntDir)pgenlist\</IntDir -->\r
-   <OutDir>$(srcPath)$(Configuration)\</OutDir>\r
-   <IntDir>$(srcPath)$(Configuration)\pgenlist\</IntDir>\r
+\r
+  <PropertyGroup Condition="'$(ANSI_VERSION)'=='yes'">\r
+    <TargetName>pgenlista</TargetName>\r
+    <TargetType>ANSI</TargetType>\r
+    <DriverName>psqlodbc30a</DriverName>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='yes|x64'">\r
-   <TargetName>pgenlista</TargetName>\r
-   <DriverName>psqlodbc30a</DriverName>\r
-   <!-- OutDir>$(OutDir)ANSI\</OutDir>\r
-   <IntDir>$(IntDir)ANSI\pgenlist\</IntDir -->\r
-   <OutDir>$(srcPath)AMD64ANSI\</OutDir>\r
-   <IntDir>$(srcPath)AMD64ANSI\pgenlist\</IntDir>\r
+  <PropertyGroup Condition="'$(ANSI_VERSION)'!='yes'">\r
+    <TargetName>pgenlist</TargetName>\r
+    <TargetType>Unicode</TargetType>\r
+    <DriverName>psqlodbc35w</DriverName>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)|$(Configuration)'=='yes|x64|Debug'">\r
-   <OutDir>$(srcPath)AMD64ANSI$(Configuration)\</OutDir>\r
-   <IntDir>$(srcPath)AMD64ANSI$(Configuration)\pgenlist\</IntDir>\r
+\r
+  <PropertyGroup Condition="'$(Platform)'=='Win32'">\r
+    <TARGET_CPU>x86</TARGET_CPU>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='no|x64'">\r
-   <TargetName>pgenlist</TargetName>\r
-   <DriverName>psqlodbc35w</DriverName>\r
-   <!-- IntDir>$(IntDir)pgenlist\</IntDir -->\r
-   <OutDir>$(srcPath)AMD64\</OutDir>\r
-   <IntDir>$(srcPath)AMD64\pgenlist\</IntDir>\r
+  <PropertyGroup Condition="'$(Platform)'!='Win32'">\r
+    <TARGET_CPU>x64</TARGET_CPU>\r
   </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)|$(Configuration)'=='no|x64|Debug'">\r
-   <OutDir>$(srcPath)AMD64$(Configuration)\</OutDir>\r
-   <IntDir>$(srcPath)AMD64$(Configuration)\pgenlist\</IntDir>\r
+\r
+  <PropertyGroup>\r
+    <IntDir>$(srcPath)$(TARGET_CPU)_$(TargetType)_$(Configuration)\pgenlist\</IntDir>\r
+    <OutDir>$(srcPath)$(TARGET_CPU)_$(TargetType)_$(Configuration)\</OutDir>\r
   </PropertyGroup>\r
 \r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r

diff --git a/winbuild/pgxalib.vcxproj b/winbuild/pgxalib.vcxproj
index 43e34d198f8041c9bb36ff37874aa195b8bba34d..c6f824ec06290ffb01a98d189047266f3b09f05d 100755 (executable)
--- a/winbuild/pgxalib.vcxproj
+++ b/winbuild/pgxalib.vcxproj
@@ -66,20 +66,26 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup>
-   <TargetName>pgxalib</TargetName>
-   <!-- IntDir>$(IntDir)pgxalib\</IntDir -->
+    <TargetName>pgxalib</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-   <IntDir>$(srcPath)AMD64\$(TargetName)\</IntDir>
-   <OutDir>$(srcPath)AMD64\</OutDir>
+
+  <PropertyGroup Condition="'$(ANSI_VERSION)'=='yes'">
+    <TargetType>ANSI</TargetType>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-   <IntDir>$(srcPath)AMD64$(Configuration)\$(TargetName)\</IntDir>
-   <OutDir>$(srcPath)AMD64$(Configuration)\</OutDir>
+  <PropertyGroup Condition="'$(ANSI_VERSION)'!='yes'">
+    <TargetType>Unicode</TargetType>
   </PropertyGroup>
+
   <PropertyGroup Condition="'$(Platform)'=='Win32'">
-   <IntDir>$(srcPath)$(Configuration)\$(TargetName)\</IntDir>
-   <OutDir>$(srcPath)$(Configuration)\</OutDir>
+    <TARGET_CPU>x86</TARGET_CPU>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)'!='Win32'">
+    <TARGET_CPU>x64</TARGET_CPU>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IntDir>$(srcPath)$(TARGET_CPU)_$(TargetType)_$(Configuration)\</IntDir>
+    <OutDir>$(srcPath)$(TARGET_CPU)_$(TargetType)_$(Configuration)\</OutDir>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

diff --git a/winbuild/psqlodbc.vcxproj b/winbuild/psqlodbc.vcxproj
index 174fb6e335f35e0a96496edba2df0c7bab27cd2a..c227baa0cfcecd41181e75d2c9f0df84d271f6ae 100755 (executable)
--- a/winbuild/psqlodbc.vcxproj
+++ b/winbuild/psqlodbc.vcxproj
@@ -114,58 +114,51 @@
     <ADD_DEFINES>$(ADD_DEFINES);USE_SSPI</ADD_DEFINES>\r
     <DELAY_LOAD_DLLS>$(DELAY_LOAD_DLLS);secur32.dll;crypt32.dll</DELAY_LOAD_DLLS>\r
   </PropertyGroup>\r
-  <!-- ANSI_VERSION -->\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='yes|Win32'" >\r
+\r
+  <PropertyGroup Condition="'$(ANSI_VERSION)'=='yes'">\r
     <TargetName>psqlodbc30a</TargetName>\r
+    <TargetType>ANSI</TargetType>\r
     <MAINDEF>$(srcPath)psqlodbca.def</MAINDEF>\r
     <DTCDLL>pgenlista</DTCDLL>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(ANSI_VERSION)'!='yes'">\r
+    <TargetName>psqlodbc35w</TargetName>\r
+    <TargetType>Unicode</TargetType>\r
+    <MAINDEF>$(srcPath)psqlodbc.def</MAINDEF>\r
+    <DTCDLL>pgenlist</DTCDLL>\r
+  </PropertyGroup>\r
+\r
+  <PropertyGroup Condition="'$(Platform)'=='Win32'">\r
+    <TARGET_CPU>x86</TARGET_CPU>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Platform)'!='Win32'">\r
+    <TARGET_CPU>x64</TARGET_CPU>\r
+  </PropertyGroup>\r
+\r
+  <PropertyGroup>\r
+    <IntDir>$(srcPath)$(TARGET_CPU)_$(TargetType)_$(Configuration)\</IntDir>\r
+    <OutDir>$(srcPath)$(TARGET_CPU)_$(TargetType)_$(Configuration)\</OutDir>\r
+  </PropertyGroup>\r
+\r
+  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='yes|Win32'" >\r
     <ADD_DEFINES>$(ADD_DEFINES);ODBCVER=0x0350;DBMS_NAME="PostgreSQL ANSI"</ADD_DEFINES>\r
-    <!-- IntDir>$(IntDir)ANSI\</IntDir>\r
-    <OutDir>$(OutDir)ANSI\</OutDir -->\r
-    <IntDir>$(srcPath)Multibyte$(Configuration)\</IntDir>\r
-    <OutDir>$(srcPath)Multibyte$(Configuration)\</OutDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='yes|x64'" >\r
-    <TargetName>psqlodbc30a</TargetName>\r
-    <MAINDEF>$(srcPath)psqlodbca.def</MAINDEF>\r
-    <DTCDLL>pgenlista</DTCDLL>\r
     <ADD_DEFINES>$(ADD_DEFINES);ODBCVER=0x0350;DBMS_NAME="PostgreSQL ANSI(x64)"</ADD_DEFINES>\r
-    <!-- IntDir>$(IntDir)ANSI\</IntDir>\r
-    <OutDir>$(OutDir)ANSI\</OutDir -->\r
-    <IntDir>$(srcPath)AMD64ANSI\</IntDir>\r
-    <OutDir>$(srcPath)AMD64ANSI\</OutDir>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)|$(Configuration)'=='yes|x64|Debug'" >\r
-    <IntDir>$(srcPath)AMD64ANSI$(Configuration)\</IntDir>\r
-    <OutDir>$(srcPath)AMD64ANSI$(Configuration)\</OutDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='no|Win32'" >\r
-    <TargetName>psqlodbc35w</TargetName>\r
-    <MAINDEF>$(srcPath)psqlodbc.def</MAINDEF>\r
-    <DTCDLL>pgenlist</DTCDLL>\r
     <ADD_DEFINES>$(ADD_DEFINES);UNICODE_SUPPORT;ODBCVER=0x0351</ADD_DEFINES>\r
-    <RSC_DEFINES>$(RSC_DEFINES);UNICODE_SUPPORT</RSC_DEFINES>\r
-    <IntDir>$(srcPath)$(Configuration)\</IntDir>\r
-    <OutDir>$(srcPath)$(Configuration)\</OutDir>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)'=='no|x64'" >\r
-    <TargetName>psqlodbc35w</TargetName>\r
-    <MAINDEF>$(srcPath)psqlodbc.def</MAINDEF>\r
-    <DTCDLL>pgenlist</DTCDLL>\r
     <ADD_DEFINES>$(ADD_DEFINES);UNICODE_SUPPORT;ODBCVER=0x0351;DBMS_NAME="PostgreSQL Unicode(x64)"</ADD_DEFINES>\r
     <RSC_DEFINES>$(RSC_DEFINES);UNICODE_SUPPORT</RSC_DEFINES>\r
-    <IntDir>$(srcPath)AMD64\</IntDir>\r
-    <OutDir>$(srcPath)AMD64\</OutDir>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(ANSI_VERSION)|$(Platform)|$(Configuration)'=='no|x64|Debug'" >\r
-    <IntDir>$(srcPath)AMD64$(Configuration)\</IntDir>\r
-    <OutDir>$(srcPath)AMD64$(Configuration)\</OutDir>\r
   </PropertyGroup>\r
+\r
   <PropertyGroup Condition="'$(MSDTC)'=='yes'">\r
     <ADD_DEFINES>$(ADD_DEFINES);_HANDLE_ENLIST_IN_DTC_</ADD_DEFINES>\r
     <DELAY_LOAD_DLLS>$(DELAY_LOAD_DLLS);$(DTCDLL).dll</DELAY_LOAD_DLLS>\r
   </PropertyGroup>\r
-  <!-- PropertyGroup Condition="'$(MSDTC)'!='yes'" -->\r
+\r
   <PropertyGroup>\r
     <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>\r
   </PropertyGroup>\r