From 9ebdafa2726a012bd7bd838d328f5fed716fbe5c Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 25 Feb 2020 09:24:33 +0100
Subject: [PATCH] Reapply "Unify component GUIDs across platforms"

This reverts commit f0f3ce75d00942bc89d7a3f0e9d7d5485f261401.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 MSI/ZRCola/Main/Makefile | Bin 294732 -> 294910 bytes
 Updater                  |   2 +-
 ZRCola/MSIBuild/Makefile |  18 ++++++------------
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index e597cd3ccabc6c53dada3098fb93d332ac685a2b..e518c34e56b61d1628f0a2c07da0aa71435302a6 100644
GIT binary patch
delta 64
zcmX@}Pw?M=!3`d4ya5b842}#T4Dk%^455?#*=*UNB9rae?I)jM(`pW2YY$*!1Y#y2
MX5Jpa#`32E0B!UVAOHXW

delta 39
scmezOU+~O7!3`d4lNYdaOfPU{VQFS#Z)am?1Y#y2X5P-m&hn!I03xpp2mk;8

diff --git a/Updater b/Updater
index 5c06968..e761794 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit 5c06968d76b5b04302fc1aee01c700c5ff79d82a
+Subproject commit e7617949b35b875292e5333cf11dfe024bf8212d
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index 59345d2..6f643f1 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -19,6 +19,10 @@
 
 !INCLUDE "..\..\include\MSIBuildCfg.mak"
 
+!IFNDEF MSIBUILD_PLAT_GUID
+!ERROR Parameter MSIBUILD_PLAT_GUID is undefined.
+!ENDIF
+
 !IFNDEF MSIBUILD_LANGID
 !ERROR Parameter MSIBUILD_LANGID is undefined.
 !ENDIF
@@ -86,12 +90,7 @@ All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt"
 Signature_	ComponentId	Type
 s$(MSIBUILD_LENGTH_ID)	s38	I2
 CompLocator	Signature_
-!IF "$(PLAT)" == "Win32"
-clZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	1
-!ENDIF
-!IF "$(PLAT)" == "x64"
-clZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	1
-!ENDIF
+clZRCola.exe.$(PLAT)	{6DB513F9-BC90-4CE7-821$(MSIBUILD_PLAT_GUID)-AA50BF31F34E}	1
 <<NOKEEP
 
 
@@ -106,12 +105,7 @@ All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
 Component	ComponentId	Directory_	Attributes	Condition	KeyPath
 s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
 Component	Component
-!IF "$(PLAT)" == "Win32"
-compZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	ZRCOLABINDIR	0		fileZRCola.exe.Win32
-!ENDIF
-!IF "$(PLAT)" == "x64"
-compZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	ZRCOLABINDIR	256		fileZRCola.exe.x64
-!ENDIF
+compZRCola.exe.$(PLAT)	{6DB513F9-BC90-4CE7-821$(MSIBUILD_PLAT_GUID)-AA50BF31F34E}	ZRCOLABINDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.exe.$(PLAT)
 !IF "$(LANG)" != "en_US"
 compZRCola.mo.$(LANG)	{4F59C403-D6DE-4B3F-$(MSIBUILD_LANG_GUID)-1190DB941EB3}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.$(LANG)
 !ENDIF