From b9b6cb7c25cb3bcd4d34d1a52a7915c9ba46df06 Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Wed, 5 Oct 2005 14:32:29 +0000
Subject: [PATCH] windows-wix-product-id-20051005

As the file name of the OpenAFS installer changes with each release,
so must the Product ID (but not the Upgrade ID).  Therefore, do not
hard code the Product ID in the Makefile, instead auto-generate it
as part of the installer.
---
 src/WINNT/install/wix/NTMakefile  | 1 -
 src/WINNT/install/wix/openafs.wxs | 8 +++++++-
 src/config/NTMakefile.amd64_w2k   | 4 ----
 src/config/NTMakefile.i386_nt40   | 4 ----
 src/config/NTMakefile.i386_w2k    | 4 ----
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/WINNT/install/wix/NTMakefile b/src/WINNT/install/wix/NTMakefile
index d8868af20..d1b75a20d 100644
--- a/src/WINNT/install/wix/NTMakefile
+++ b/src/WINNT/install/wix/NTMakefile
@@ -65,7 +65,6 @@ $(WIXOBJ): openafs.wxs $(WIXINCLUDES)
 		-dVersionMajor=$(AFSPRODUCT_VER_MAJOR)	\
 		-dVersionMinor=$(AFSPRODUCT_VER_MINOR)	\
 		-dVersionPatch=$(AFSPRODUCT_VER_PATCH)	\
-		-dProductCode=$(AFSPRODUCT_VER_GUID)	\
 		"-dDestDir=$(DESTDIR)\\" \
 		-dCellDbFile=CellServDB \
 		-v0 \
diff --git a/src/WINNT/install/wix/openafs.wxs b/src/WINNT/install/wix/openafs.wxs
index d0c493b29..fb01ee615 100644
--- a/src/WINNT/install/wix/openafs.wxs
+++ b/src/WINNT/install/wix/openafs.wxs
@@ -7,8 +7,14 @@
     <!-- See language_config for localization options. -->
     <?include language_config.wxi?>
 
+    <!--
+      We autogenerate a new product code for each build.  According to MSDN we have
+      to change the product code whenever we change the name of the MSI file.  Each
+      version of OpenAFS has a different MSI name.  Thus, each version needs a
+      unique product code.
+      -->
     <Product 
-        Id="$(var.ProductCode)"
+        Id="????????-????-????-????-????????????"
         Codepage="$(var.Codepage)"
         Language="$(var.LanguageCode)"
         Manufacturer="$(var.Manufacturer)"
diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 87314b921..a0d1c61d8 100644
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -83,10 +83,6 @@ AFSPRODUCT_VER_MINOR=5
 AFSPRODUCT_VER_PATCH=0000
 AFSPRODUCT_VER_BUILD=0
 
-# For MSI installer, each major release should have a different GUID
-# http://msdn.microsoft.com/library/en-us/msi/setup/changing_the_product_code.asp
-AFSPRODUCT_VER_GUID=A0A7B986-CF35-499C-9400-9A987F218127
-
 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
 AFSPRODUCT_FILE_VERSION=$(AFSPRODUCT_VER_MAJOR),$(AFSPRODUCT_VER_MINOR),$(AFSPRODUCT_VER_PATCH),$(AFSPRODUCT_VER_BUILD)
 # Set CELLNAME_DEFAULT to "your cell name"
diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index bd5c9bc4e..d75fcb960 100644
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -83,10 +83,6 @@ AFSPRODUCT_VER_MINOR=5
 AFSPRODUCT_VER_PATCH=0000
 AFSPRODUCT_VER_BUILD=0
 
-# For MSI installer, each major release should have a different GUID
-# http://msdn.microsoft.com/library/en-us/msi/setup/changing_the_product_code.asp
-AFSPRODUCT_VER_GUID=93AFD8F0-C150-47BC-B318-A029222D8993
-
 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
 AFSPRODUCT_FILE_VERSION=$(AFSPRODUCT_VER_MAJOR),$(AFSPRODUCT_VER_MINOR),$(AFSPRODUCT_VER_PATCH),$(AFSPRODUCT_VER_BUILD)
 # Set CELLNAME_DEFAULT to "your cell name"
diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 327b7d494..c26bd85c8 100644
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -83,10 +83,6 @@ AFSPRODUCT_VER_MINOR=5
 AFSPRODUCT_VER_PATCH=0000
 AFSPRODUCT_VER_BUILD=0
 
-# For MSI installer, each major release should have a different GUID
-# http://msdn.microsoft.com/library/en-us/msi/setup/changing_the_product_code.asp
-AFSPRODUCT_VER_GUID=E832F832-C937-46CB-8C1D-BC7EF6F3F62F
-
 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
 AFSPRODUCT_FILE_VERSION=$(AFSPRODUCT_VER_MAJOR),$(AFSPRODUCT_VER_MINOR),$(AFSPRODUCT_VER_PATCH),$(AFSPRODUCT_VER_BUILD)
 # Set CELLNAME_DEFAULT to "your cell name"
-- 
2.39.5