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

This reverts commit fbbf89ba55004c6b94b5f5b3d149d0176ca83477.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 UpdCheck/MSIBuild/Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/UpdCheck/MSIBuild/Makefile b/UpdCheck/MSIBuild/Makefile
index 3094d0e..393dac6 100644
--- a/UpdCheck/MSIBuild/Makefile
+++ b/UpdCheck/MSIBuild/Makefile
@@ -19,6 +19,10 @@
 
 !INCLUDE "..\..\..\include\MSIBuildCfg.mak"
 
+!IFNDEF MSIBUILD_PLAT_GUID
+!ERROR Parameter MSIBUILD_PLAT_GUID is undefined.
+!ENDIF
+
 !IFNDEF UPDATER_BIN_DIR
 !ERROR Parameter UPDATER_BIN_DIR is undefined.
 !ENDIF
@@ -37,12 +41,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"
-compUpdCheck.exe.Win32	{0E56A84C-1567-4030-B5C8-2FF998E9F7E3}	$(UPDATER_BIN_DIR)	0		fileUpdCheck.exe.Win32
-!ENDIF
-!IF "$(PLAT)" == "x64"
-compUpdCheck.exe.x64	{9245E7EC-EDBD-41E1-858B-88810F3AFDD6}	$(UPDATER_BIN_DIR)	256		fileUpdCheck.exe.x64
-!ENDIF
+compUpdCheck.exe.$(PLAT)	{263A3D1A-AC7E-4866-929$(MSIBUILD_PLAT_GUID)-B7C1E6FFF93B}	$(UPDATER_BIN_DIR)	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileUpdCheck.exe.$(PLAT)
 <<NOKEEP