From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Wed, 5 Oct 2005 16:32:34 +0000 (+0000)
Subject: STABLE14-windows-wix-product-id-20051005
X-Git-Tag: openafs-stable-1_4_1-rc1~68
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=af644a3e83dc07f49024e1957a434004af9e9e20;p=packages%2Fo%2Fopenafs.git

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 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 bff040eef..6f425fcc4 100644
--- 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 5ad03a17f..6637e3043 100644
--- 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 9eb0818d4..72d3dfc6b 100644
--- 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"