Skip to content

Fix duplicate component codes #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davecramer merged 1 commit into from
Jan 20, 2025
Merged

Fix duplicate component codes #75

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion installer/psqlodbcm_cpu.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<?define UNICODEFOLDER = "x64_Unicode_Release" ?>
<?define Module_PackageId = "970B6E07-7105-4d66-80FA-9E208952FB96" ?>
<?define InstallerVersion = "300" ?>
<?define GUIDSEED = "400790AA-1377-4E65-B004-AB66FAD634B2" ?>
<?if $(env.PROCESSOR_ARCHITECTURE) = "AMD64" ?>
<?define SysFolder = "$(env.SystemRoot)\system32" ?>
<?else?>
Expand All @@ -26,6 +27,7 @@
<?define UNICODEFOLDER = "x86_Unicode_Release" ?>
<?define Module_PackageId = "ACF10866-5C01-46f0-90F0-D5618638CA48" ?>
<?define InstallerVersion = "150" ?>
<?define GUIDSEED = "1B43106C-C8D7-4F21-84CF-44DBF1C1D934" ?>
<?if $(env.PROCESSOR_ARCHITECTURE) = "AMD64" ?>
<?define SysFolder = "$(env.SystemRoot)\syswow64" ?>
<?else?>
Expand All @@ -49,7 +51,7 @@
Codepage="1252" />

<!-- Avoid WIX0267 with naked files in a merge module -->
<Directory Id="INSTALLFOLDER" />
<Directory Id="INSTALLFOLDER" ComponentGuidGenerationSeed="$(GUIDSEED)"/>

<!-- PostgreSQL -->
<File Name="psqlodbc30a.dll" Source="$(BINBASE)\$(ANSIFOLDER)\psqlodbc30a.dll">
Expand Down