Amebis/ZRCola
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Reapply "Unify component GUIDs across platforms"

Browse Source 
This reverts commit f0f3ce75d0.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman
2020-02-25 09:24:33 +01:00
parent ea76dc27b4
commit 9ebdafa272
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
MSI/ZRCola/Main/Makefile
View File

Binary file not shown.

2
Updater

Submodule Updater updated: 5c06968d76...e7617949b3

18
ZRCola/MSIBuild/Makefile
View File

@@ -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