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.

diff --git a/src/WINNT/install/wix/NTMakefile b/src/WINNT/install/wix/NTMakefile
index d8868af20b7813d016c18b422abffdfd521fc3c9..d1b75a20db3306605629b4f51858d5beb6d302f7 100644 (file)
--- 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 d0c493b296a039d224113c967ded20f5fbf12492..fb01ee615adb42631e84943ffa8e03d2c925e56c 100644 (file)
--- 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 87314b9218f7d5de868e6ae6568babadb1e1d3cb..a0d1c61d8f63aea3132c2200871f8fd9fc95eb3e 100644 (file)
--- 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 bd5c9bc4ee37a4f534126b3d9c9866badf60f77f..d75fcb960d84ed72ca81446193d65e7589c45938 100644 (file)
--- 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 327b7d4948a302943731d5e5b5b8092bfb5dc9f0..c26bd85c8fdcea3a2e38b42e6b2281f04f553e7d 100644 (file)
--- 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"