From c9966434e3a45fb8048899f26ce12db7a824f499 Mon Sep 17 00:00:00 2001
From: Hiroshi Inoue <inoue@tpf.co.p>
Date: Sun, 14 Jul 2013 20:51:17 +0900
Subject: [PATCH] The first cut of psqlodbc setup project. It builds a setup
 program which can't be done by a single MSI. It would install VC++
 redistributable, 32 bit psqlodbc driver and 64 bit psqlodbc driver (on 64 bit
 windows).

---
 .gitignore                                    |  1 +
 installer/psqlodbc-setup/Bundle.wxs           | 14 ++++++
 installer/psqlodbc-setup/Make.bat             | 32 +++++++++++++
 .../psqlodbc-setup/psqlodbc-setup.wixproj     | 46 +++++++++++++++++++
 installer/psqlodbc-setup/vcredist.wxs         | 38 +++++++++++++++
 5 files changed, 131 insertions(+)
 create mode 100755 installer/psqlodbc-setup/Bundle.wxs
 create mode 100755 installer/psqlodbc-setup/Make.bat
 create mode 100755 installer/psqlodbc-setup/psqlodbc-setup.wixproj
 create mode 100755 installer/psqlodbc-setup/vcredist.wxs

diff --git a/.gitignore b/.gitignore
index 621fab8..05422ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,5 +49,6 @@ lib*.pc
 
 # WIX tools (candle, light) generate
 *.wix*
+!*.wixproj
 *.msm
 *.msi
diff --git a/installer/psqlodbc-setup/Bundle.wxs b/installer/psqlodbc-setup/Bundle.wxs
new file mode 100755
index 0000000..1b63cdd
--- /dev/null
+++ b/installer/psqlodbc-setup/Bundle.wxs
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Bundle Name="psqlodbc" Version="09.02.01.00" Manufacturer="PostgreSQL Global Development Group" UpgradeCode="7f9f14ee-2f3a-4120-a300-ee3fbd585627">
+		<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense" />
+
+    <WixVariable Id="WixStdbaLicenseRtf" Value="..\lgpl.rtf" />
+    <Chain>
+			<!-- TODO: Define the list of chained packages. -->
+      <PackageGroupRef Id="vcredist"/>
+      <MsiPackage SourceFile="..\psqlodbc.msi" DisplayInternalUI="yes" />
+      <MsiPackage SourceFile="..\x64\psqlodbc_x64.msi" DisplayInternalUI="yes" InstallCondition="VersionNT64" />
+    </Chain>
+	</Bundle>
+</Wix>
diff --git a/installer/psqlodbc-setup/Make.bat b/installer/psqlodbc-setup/Make.bat
new file mode 100755
index 0000000..616698b
--- /dev/null
+++ b/installer/psqlodbc-setup/Make.bat
@@ -0,0 +1,32 @@
+setlocal
+set wix_dir=%WIX%bin
+set pgmname=psqlodbc
+set build_config=Release
+set objdir=obj\%build_config%
+set bindir=bin\%build_config%
+
+"%wix_dir%\candle.exe" -v ^
+-dConfiguration=%build_config% ^
+-dOutDir=%bindir%\ -dPlatform=x86 ^
+-d"ProjectDir=\\" -dProjectExt=.wixproj ^
+-dProjectFileName=%pgmname%.wixproj -dProjectName=%pgmname% ^
+-d"ProjectPath=%pgmname%.wixproj" ^
+-d"TargetDir=%bindir%\\" -dTargetExt=.exe ^
+-dTargetFileName=%pgmname%.exe -dTargetName=%pgmname% ^
+-d"TargetPath=%bindir%\%pgmname%.exe" ^
+-out %objdir%\ -arch x86 ^
+-ext "%wix_dir%\WixUtilExtension.dll" ^
+-ext "%wix_dir%\WixBalExtension.dll" ^
+Bundle.wxs vcredist.wxs
+
+"%wix_dir%\Light.exe" -out %bindir%\%pgmname%.exe ^
+-pdbout %bindir%\%pgmname%.wixpdb ^
+-ext "%wix_dir%\\WixUtilExtension.dll" ^
+-ext "%wix_dir%\\WixBalExtension.dll" ^
+-contentsfile %objdir%\%pgmname%.wixproj.BindContentsFileList.txt ^
+-outputsfile %objdir%\%pgmname%.wixproj.BindOutputsFileList.txt ^
+-builtoutputsfile %objdir%\%pgmname%.wixproj.BindBuiltOutputsFileList.txt ^
+-wixprojectfile %pgmname%.wixproj ^
+%objdir%\Bundle.wixobj %objdir%\vcredist.wixobj
+
+endlocal
diff --git a/installer/psqlodbc-setup/psqlodbc-setup.wixproj b/installer/psqlodbc-setup/psqlodbc-setup.wixproj
new file mode 100755
index 0000000..38d2899
--- /dev/null
+++ b/installer/psqlodbc-setup/psqlodbc-setup.wixproj
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.6</ProductVersion>
+    <ProjectGuid>{748caa18-f40d-4308-bc52-2605d09c38b1}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>psqlodbc-setup</OutputName>
+    <OutputType>Bundle</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Bundle.wxs" />
+    <Compile Include="vcredist.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixBalExtension">
+      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
+      <Name>WixBalExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
diff --git a/installer/psqlodbc-setup/vcredist.wxs b/installer/psqlodbc-setup/vcredist.wxs
new file mode 100755
index 0000000..7342729
--- /dev/null
+++ b/installer/psqlodbc-setup/vcredist.wxs
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ?define vcredist_x86 =  http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x86.exe ?>
+<?define vcredist_x64 =  http://download.microsoft.com/download/d/d/9/dd9a82d0-52ef-40db-8dab-795376989c03/vcredist_x64.exe ? -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <Fragment>
+		<!-- TODO: Put your code here. -->
+    <util:RegistrySearch Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86" Value="Installed" Variable="vc100_redist_x86" />
+    <util:RegistrySearch Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x64" Value="Installed" Variable="vc100_redist_x64" Win64="yes"/>
+    <PackageGroup Id="vcredist">
+      <ExePackage Id="vc100_redist_x86"
+        Cache="no"
+        Compressed="yes"
+        PerMachine="yes"
+        Permanent="yes"
+        Vital="yes"
+        Name="Redist\vc100_redist_x86.exe"
+        SourceFile="vc100_redist_x86.exe"
+        InstallCommand="/q"
+        DetectCondition="vc100_redist_x86 AND (vc100_redist_x86 &gt;= 1)">
+        <ExitCode Value ="3010" Behavior="forceReboot" />
+      </ExePackage>
+      <ExePackage Id="vc100_redist_x64"
+        Cache="no"
+        Compressed="yes"
+        PerMachine="yes"
+        Permanent="yes"
+        Vital="yes"
+        Name="Redist\vc100_redist_x64.exe"
+        SourceFile="vc100_redist_x64.exe"
+        InstallCommand="/q"
+        InstallCondition="VersionNT64"
+        DetectCondition="vc100_redist_x64 AND (vc100_redist_x64 &gt;= 1)">
+        <ExitCode Value ="3010" Behavior="forceReboot" />
+      </ExePackage>
+    </PackageGroup>
+  </Fragment>
+</Wix>
-- 
2.39.5