STABLE14-windows-wix-product-id-20051005

Remove Product ID from Makefiles.  They will be auto-generated in the
Wix installer.

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================

Auto-generate Product IDs at build time since each installer has a
unique name.   This will allow upgrades to be performed automatically.

(cherry picked from commit b9b6cb7c25cb3bcd4d34d1a52a7915c9ba46df06)

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 bff040eefbe64bfbc02215c208708d6216ad117b..6f425fcc4f6c0f35bb076221a6d4aaf57e5feb15 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -83,10 +83,6 @@ AFSPRODUCT_VER_MINOR=4
 AFSPRODUCT_VER_PATCH=0005
 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=CC59770C-4690-4531-BAEB-55A5A6D2EEB9
-
 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 5ad03a17f08282e36d1c5348798ff33074bee7f5..6637e304364123bf463cb0d758e999e443510863 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -83,10 +83,6 @@ AFSPRODUCT_VER_MINOR=4
 AFSPRODUCT_VER_PATCH=0005
 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=B7F03C11-E7E7-41F5-BEFD-C738EB5B075F
-
 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 9eb0818d473b09e6a0650ca7a6f5e2eb2a749649..72d3dfc6bd38118deb89aa05fc975945ba7c89be 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -82,10 +82,6 @@ AFSPRODUCT_VER_MINOR=4
 AFSPRODUCT_VER_PATCH=0005
 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=B2220B3E-B61D-4CC7-9D4B-17BA918D049C
-
 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"