Reapply "Unify component GUIDs across platforms"

This reverts commit fbbf89ba55004c6b94b5f5b3d149d0176ca83477.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2020-02-25 09:24:08 +01:00
parent 5c06968d76
commit e7617949b3

View File

@ -19,6 +19,10 @@
!INCLUDE "..\..\..\include\MSIBuildCfg.mak" !INCLUDE "..\..\..\include\MSIBuildCfg.mak"
!IFNDEF MSIBUILD_PLAT_GUID
!ERROR Parameter MSIBUILD_PLAT_GUID is undefined.
!ENDIF
!IFNDEF UPDATER_BIN_DIR !IFNDEF UPDATER_BIN_DIR
!ERROR Parameter UPDATER_BIN_DIR is undefined. !ERROR Parameter UPDATER_BIN_DIR is undefined.
!ENDIF !ENDIF
@ -37,12 +41,7 @@ All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"
Component ComponentId Directory_ Attributes Condition KeyPath Component ComponentId Directory_ Attributes Condition KeyPath
s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID)
Component Component Component Component
!IF "$(PLAT)" == "Win32" compUpdCheck.exe.$(PLAT) {263A3D1A-AC7E-4866-929$(MSIBUILD_PLAT_GUID)-B7C1E6FFF93B} $(UPDATER_BIN_DIR) $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileUpdCheck.exe.$(PLAT)
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
<<NOKEEP <<NOKEEP