From 5c06968d76b5b04302fc1aee01c700c5ff79d82a Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 25 Feb 2020 09:20:30 +0100 Subject: [PATCH] Reapply "Unify component GUIDs across languages" This reverts commit 278cce1b4c17c8da9e615bae986bc9fe6eb670b3. Signed-off-by: Simon Rozman --- Updater/MSIBuild/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Updater/MSIBuild/Makefile b/Updater/MSIBuild/Makefile index cd76efc..22ba49b 100644 --- a/Updater/MSIBuild/Makefile +++ b/Updater/MSIBuild/Makefile @@ -43,11 +43,8 @@ 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 "$(LANG)" == "ru_RU" -compUpdater.mo.ru_RU {486A9DDF-A43B-4920-BEF9-2907DD8660AD} UPDATERLOC$(MSIBUILD_LANG_GUID)DIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileUpdater.mo.ru_RU -!ENDIF -!IF "$(LANG)" == "sl_SI" -compUpdater.mo.sl_SI {2A56FA39-F4E6-492F-A863-AFE9E53FA988} UPDATERLOC$(MSIBUILD_LANG_GUID)DIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileUpdater.mo.sl_SI +!IF "$(LANG)" != "en_US" +compUpdater.mo.$(LANG) {5F141A03-07EE-4AC4-$(MSIBUILD_LANG_GUID)-CFB1833C1A04} UPDATERLOC$(MSIBUILD_LANG_GUID)DIR $(MSIBUILD_COMPONENT_ATTRIB_FILE) fileUpdater.mo.$(LANG) !ENDIF <