Set version to 2.5

Signed-off-by: Simon Rozman <simon@rozman.si>
Publish MSIs to <version> and _latest folders on the download server
2020-11-19 12:43:09 +01:00 · 2020-11-19 12:30:25 +01:00 · 2020-11-19 11:21:39 +01:00 · 2020-11-19 11:10:33 +01:00 · 2020-11-19 11:00:17 +01:00 · 2020-11-19 10:59:54 +01:00
88 changed files with 243 additions and 217 deletions
--- a/LOCALIZATION.md
+++ b/LOCALIZATION.md
@@ -1,4 +1,4 @@
-# Localization of ZRCola
+# Localization of ZRCola

 In order to get ZRCola experience in your language the following resources should be translated:

--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
--- a/MSI/MSICA
+++ b/MSI/MSICA
--- a/MSI/ZRCola/Main/Makefile
+++ b/MSI/ZRCola/Main/Makefile
--- a/97
+++ b/97
@@ -18,7 +18,6 @@
 #

 OUTPUT_DIR=output
-PUBLISH_DIR_LEGACY=\\amebis.doma\Splet\WWW\Apache2\www.amebis.si-prenos\ZRCola
 PUBLISH_DIR=\\amebis.doma\Splet\WWW\IIS-ext\prenos.amebis.si\ZRCola

 !IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
@@ -41,8 +40,13 @@ MSBUILDFLAGS=/v:m /m

 All ::

-Clean ::
-	cd "MSI\MSIBuild\Version"
+Clean :: \
+	CleanSetup
+
+CleanSetup ::
+	cd "MSI\ZRCola"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
+	cd "$(MAKEDIR)\MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Clean
 	cd "$(MAKEDIR)"
 	-if exist "$(OUTPUT_DIR)\catalog.xml" del /f /q "$(OUTPUT_DIR)\catalog.xml"
@@ -61,13 +65,11 @@ Register \
 Unregister \
 Localization \
 PublishPre \
-Publish :: "MSI\MSIBuild\Version\Version.mak"
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
-
-"MSI\MSIBuild\Version\Version.mak" ::
+Publish ::
 	cd "MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Version
 	cd "$(MAKEDIR)"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@

 !ELSE

@@ -79,7 +81,6 @@ Publish :: "MSI\MSIBuild\Version\Version.mak"
 !INCLUDE "MSI\MSIBuild\Version\Version.mak"
 !INCLUDE "include\MSIBuildCfg.mak"

-PUBLISH_PACKAGE_DIR=$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)
 PUBLISH_PACKAGE_URL=http://prenos.amebis.si/ZRCola/$(MSIBUILD_VERSION_STR)

 ######################################################################
@@ -90,19 +91,29 @@ All :: \
 	Setup


+######################################################################
+# Setup
+######################################################################
+
+Setup :: \
+	Localization \
+	SetupCompile \
+	SetupPackage \
+
+SetupDebug :: \
+	Localization \
+	SetupDebugCompile \
+	SetupDebugPackage \
+
+
 ######################################################################
 # Publishing
 ######################################################################

-PublishPre :: \
-	"$(PUBLISH_PACKAGE_DIR)" \
-	"$(PUBLISH_DIR_LEGACY)" \
-	"$(PUBLISH_DIR)"
-
 Publish :: \
 	PublishPre \
-	"$(PUBLISH_DIR_LEGACY)\catalog-0000.xml" \
-	"$(PUBLISH_DIR)\catalog-0000.xml"
+	"$(PUBLISH_DIR)" \
+	"$(PUBLISH_DIR)\catalog-0001.xml"


 ######################################################################
@@ -110,6 +121,8 @@ Publish :: \
 ######################################################################

 Register :: \
+	Localization \
+	RegisterCompile \
 	RegisterSettings \
 	InstallFonts \
 	RegisterShortcuts
@@ -119,6 +132,9 @@ Unregister :: \
 	UninstallFonts \
 	UnregisterSettings

+RegisterCompile ::
+	msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Platform=$(PLAT) /p:Configuration=Debug
+
 RegisterSettings ::
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "Language"                   /t REG_SZ /d "en_US"                           $(REG_FLAGS) > NUL
 	reg.exe add "HKLM\Software\Amebis\ZRCola" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS) > NUL
@@ -176,16 +192,17 @@ UnregisterShortcuts ::
 "$(OUTPUT_DIR)" \
 "$(OUTPUT_DIR)\Keys" \
 "$(OUTPUT_DIR)\locale" \
-"$(PUBLISH_DIR_LEGACY)" \
 "$(PUBLISH_DIR)" \
-"$(PUBLISH_PACKAGE_DIR)" \
+"$(PUBLISH_DIR)\_latest" \
+"$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)" \
 "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\ZRCola" :
 	if not exist $@ md $@

 "$(OUTPUT_DIR)\Keys" \
 "$(OUTPUT_DIR)\locale" : "$(OUTPUT_DIR)"

-"$(PUBLISH_PACKAGE_DIR)" : "$(PUBLISH_DIR)"
+"$(PUBLISH_DIR)\_latest" \
+"$(PUBLISH_DIR)\$(MSIBUILD_VERSION_STR)" : "$(PUBLISH_DIR)"


 ######################################################################
@@ -217,25 +234,29 @@ UnregisterShortcuts ::
 # Building
 ######################################################################

-"$(PUBLISH_DIR_LEGACY)\catalog-0000.xml" \
-"$(PUBLISH_DIR)\catalog-0000.xml" : "$(OUTPUT_DIR)\catalog.xml"
+"$(PUBLISH_DIR)\catalog-0001.xml" : "$(OUTPUT_DIR)\catalog.xml"
 	copy /y $** $@ > NUL

 "$(OUTPUT_DIR)\catalog.xml" : \
-	"$(OUTPUT_DIR)\ZRColaEn32.msi" \
-	"$(OUTPUT_DIR)\ZRColaEn64.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu32.msi" \
-	"$(OUTPUT_DIR)\ZRColaRu64.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl32.msi" \
-	"$(OUTPUT_DIR)\ZRColaSl64.msi"
-	-if exist $@ del /f /q $@
-	copy /y "$(PUBLISH_DIR)\catalog-0000.xml" "$(@:"=).tmp" > NUL
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn32.msi" -f "$(OUTPUT_DIR)\ZRColaEn32.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn64.msi" -f "$(OUTPUT_DIR)\ZRColaEn64.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu32.msi" -f "$(OUTPUT_DIR)\ZRColaRu32.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu64.msi" -f "$(OUTPUT_DIR)\ZRColaRu64.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl32.msi" -f "$(OUTPUT_DIR)\ZRColaSl32.msi"
-	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl64.msi" -f "$(OUTPUT_DIR)\ZRColaSl64.msi"
+	"$(OUTPUT_DIR)\ZRColaEn-x86.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn-amd64.msi" \
+	"$(OUTPUT_DIR)\ZRColaEn-arm64.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu-x86.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu-amd64.msi" \
+	"$(OUTPUT_DIR)\ZRColaRu-arm64.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl-x86.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl-amd64.msi" \
+	"$(OUTPUT_DIR)\ZRColaSl-arm64.msi"
+	copy /y "$(PUBLISH_DIR)\catalog-0001.xml" "$(@:"=).tmp" > NUL
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn-x86.msi"   -f "$(OUTPUT_DIR)\ZRColaEn-x86.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn-amd64.msi" -f "$(OUTPUT_DIR)\ZRColaEn-amd64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-arm64 en_US "$(PUBLISH_PACKAGE_URL)/ZRColaEn-arm64.msi" -f "$(OUTPUT_DIR)\ZRColaEn-arm64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu-x86.msi"   -f "$(OUTPUT_DIR)\ZRColaRu-x86.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu-amd64.msi" -f "$(OUTPUT_DIR)\ZRColaRu-amd64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-arm64 ru_RU "$(PUBLISH_PACKAGE_URL)/ZRColaRu-arm64.msi" -f "$(OUTPUT_DIR)\ZRColaRu-arm64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-x86   sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl-x86.msi"   -f "$(OUTPUT_DIR)\ZRColaSl-x86.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-amd64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl-amd64.msi" -f "$(OUTPUT_DIR)\ZRColaSl-amd64.msi"
+	"$(OUTPUT_DIR)\$(PLAT).Release\UpdPublish.exe" "$(@:"=).tmp" "$(@:"=).tmp" win-arm64 sl_SI "$(PUBLISH_PACKAGE_URL)/ZRColaSl-arm64.msi" -f "$(OUTPUT_DIR)\ZRColaSl-arm64.msi"
 	"$(OUTPUT_DIR)\$(PLAT).Release\UpdSignXML.exe" "$(@:"=).tmp" $@
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"

@@ -246,11 +267,15 @@ UnregisterShortcuts ::
 ######################################################################

 PLAT=Win32
-PLAT_SUFFIX=32
+PLAT_SUFFIX=-x86
 !INCLUDE "MakefilePlat.mak"

 PLAT=x64
-PLAT_SUFFIX=64
+PLAT_SUFFIX=-amd64
+!INCLUDE "MakefilePlat.mak"
+
+PLAT=ARM64
+PLAT_SUFFIX=-arm64
 !INCLUDE "MakefilePlat.mak"


--- a/MakefileLang.mak
+++ b/MakefileLang.mak
--- a/MakefileLangPlat.mak
+++ b/MakefileLangPlat.mak
--- a/MakefileLangPlatCfg.mak
+++ b/MakefileLangPlatCfg.mak
--- a/MakefilePlat.mak
+++ b/MakefilePlat.mak
--- a/MakefilePlatCfg.mak
+++ b/MakefilePlatCfg.mak
@@ -17,8 +17,6 @@
 #    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
 #

-All ::
-
 Clean ::
 	msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln"          /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
 !IF "$(PLAT)" == "Win32"
@@ -26,10 +24,10 @@ Clean ::
 !ENDIF
 	msbuild.exe $(MSBUILDFLAGS) "MSI\MSICA\MSICA.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
 	msbuild.exe $(MSBUILDFLAGS) "Updater\Updater.sln" /t:Clean /p:Configuration=$(CFG) /p:Platform=$(PLAT)
-	-if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf"
-	-if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).cab" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).cab"
-	-if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf"
-	-if exist "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt" del /f /q "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt"
+	-if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf"
+	-if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).cab" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).cab"
+	-if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).inf" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).inf"
+	-if exist "$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt"


 !IFDEF HAS_VERSION
@@ -43,24 +41,18 @@ Clean ::
 # Building
 ######################################################################

-"$(OUTPUT_DIR)\$(PLAT).$(CFG)\ZRCola.exe" :: Localization
-
-"$(OUTPUT_DIR)\$(PLAT).$(CFG)\ZRCola.exe" ::
-	msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Configuration=$(CFG) /p:Platform=$(PLAT)
-
-"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf" : \
-#	"$(OUTPUT_DIR)\ZRCola.de_DE.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.en_US.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.ru_RU.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi" \
-	"$(OUTPUT_DIR)\ZRCola.sl_SI.$(PLAT_SUFFIX)$(CFG_SUFFIX).2.msi"
-	-if exist $@ del /f /q $@
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf" : \
+#	"$(OUTPUT_DIR)\de_DE.$(PLAT).$(CFG).2.msi" \
+	"$(OUTPUT_DIR)\en_US.$(PLAT).$(CFG).2.msi" \
+	"$(OUTPUT_DIR)\ru_RU.$(PLAT).$(CFG).2.msi" \
+	"$(OUTPUT_DIR)\sl_SI.$(PLAT).$(CFG).2.msi"
 	-if exist "$(@:"=).tmp" del /f /q "$(@:"=).tmp"
-	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX)" /C:LZX
+	cscript.exe "MSI\MSIBuild\MSI.wsf" //Job:MakeDDF //Nologo "$(@:"=).tmp" $** /O:"$(OUTPUT_DIR)\$(PLAT).$(CFG)" /C:LZX
 	move /y "$(@:"=).tmp" $@ > NUL

-"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).cab" \
-"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf" \
-"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt" : "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf"
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).cab" \
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).inf" \
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt" : "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf"
 	makecab.exe /F $**

 !ENDIF
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ZRCola
+# ZRCola

 A Microsoft Windows application for composing texts using a wide range of Slavic (and general) letters from or beyond Unicode.

--- a/2
+++ b/2
--- 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
@@ -36,7 +40,6 @@ MSIBUILD_IS_LOCALIZEABLE=1
 All :: "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt"

 "$(LANG).$(PLAT).$(CFG).AppSearch-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Property	Signature_
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
@@ -55,7 +58,6 @@ All :: \
 	"$(LANG).$(PLAT).$(CFG).Binary-1\tutorial3.bmp"

 "$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Name	Data
 s$(MSIBUILD_LENGTH_ID)	v0
@@ -81,17 +83,11 @@ bintutorial3.bmp	tutorial3.bmp
 All :: "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt"

 "$(LANG).$(PLAT).$(CFG).CompLocator-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 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


@@ -101,22 +97,13 @@ clZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	1
 All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"

 "$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 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
-!IF "$(LANG)" == "ru_RU"
-compZRCola.mo.ru_RU	{DEA5D11C-2B0E-4B85-ACE3-D76334866F50}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.ru_RU
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
-compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
+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
 <<NOKEEP

@@ -127,7 +114,6 @@ compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOC$(MSIBUILD_L
 All :: "$(LANG).$(PLAT).$(CFG).Control-2.idt"

 "en_US.$(PLAT).$(CFG).Control-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control	Type	X	Y	Width	Height	Attributes	Property	Text	Control_Next	Help
 s$(MSIBUILD_LENGTH_ID)	s50	s20	i2	i2	i2	i2	I4	S50	L0	S50	L$(MSIBUILD_LENGTH_HELP)
@@ -165,7 +151,6 @@ dlgTutorial3	ctlContinue	PushButton	325	265	60	20	3		&Continue	ctlBannerBitmap
 All :: "$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt"

 "$(LANG).$(PLAT).$(CFG).ControlEvent-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog_	Control_	Event	Argument	Condition	Ordering
 s$(MSIBUILD_LENGTH_ID)	s50	s50	s255	S255	I2
@@ -182,7 +167,6 @@ dlgTutorial3	ctlContinue	EndDialog	Return	1	1000
 All :: "$(LANG).$(PLAT).$(CFG).Dialog-1.idt"

 "$(LANG).$(PLAT).$(CFG).Dialog-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Dialog	HCentering	VCentering	Width	Height	Attributes	Title	Control_First	Control_Default	Control_Cancel
 s$(MSIBUILD_LENGTH_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
@@ -199,7 +183,6 @@ dlgTutorial3	50	50	400	300	3	[Setup] [SimpleProductName] [DisplayVersion]	ctlTit
 All :: "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt"

 "$(LANG).$(PLAT).$(CFG).InstallUISequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Condition	Sequence
 s$(MSIBUILD_LENGTH_ID)	S255	I2
@@ -216,7 +199,6 @@ dlgTutorial3	NOT Installed AND &featZRCola>=3	1402
 All :: "$(LANG).$(PLAT).$(CFG).Feature-2.idt"

 "en_US.$(PLAT).$(CFG).Feature-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Feature	Feature_Parent	Title	Description	Display	Level	Directory_	Attributes
 s$(MSIBUILD_LENGTH_ID)	S$(MSIBUILD_LENGTH_ID)	L64	L255	I2	i2	S$(MSIBUILD_LENGTH_ID)	i2
@@ -239,7 +221,6 @@ featZRCola		ZRCola	Input system for linguistic use	1	1	ZRCOLADIR	8
 All :: "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt"

 "$(LANG).$(PLAT).$(CFG).FeatureComponents-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Feature_	Component_
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)
@@ -267,7 +248,6 @@ featZRCola	compwxstd.mo.$(LANG)
 All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"

 "$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
@@ -287,7 +267,6 @@ All :: \
 	"$(LANG).$(PLAT).$(CFG).Icon-1\ZRCola.ico"

 "$(LANG).$(PLAT).$(CFG).Icon-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Icon-1"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Name	Data
 s$(MSIBUILD_LENGTH_ID)	v0
@@ -305,7 +284,6 @@ iconZRCola.ico	ZRCola.ico
 All :: "$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt"

 "$(LANG).$(PLAT).$(CFG).RemoveFile-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 FileKey	Component_	FileName	DirProperty	InstallMode
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	L255	s$(MSIBUILD_LENGTH_ID)	i2
@@ -320,7 +298,6 @@ rmfiZRCola	compZRCola.exe.$(PLAT)		ZRColaShortcutDir	2
 All :: "$(LANG).$(PLAT).$(CFG).Shortcut-2.idt"

 "en_US.$(PLAT).$(CFG).Shortcut-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Shortcut	Directory_	Name	Component_	Target	Arguments	Description	Hotkey	Icon_	IconIndex	ShowCmd	WkDir
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l128	s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	S255	L255	I2	S$(MSIBUILD_LENGTH_ID)	I2	I2	S$(MSIBUILD_LENGTH_ID)
--- a/ZRCola/ZRCola.rc
+++ b/ZRCola/ZRCola.rc
--- a/ZRCola/pch.cpp
+++ b/ZRCola/pch.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/pch.h
+++ b/ZRCola/pch.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/res/zrcolagui.cpp
+++ b/ZRCola/res/zrcolagui.cpp
@@ -1,4 +1,4 @@
-///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 // C++ code generated with wxFormBuilder (version Aug  8 2018)
 // http://www.wxformbuilder.org/
 //
--- a/ZRCola/res/zrcolagui.h
+++ b/ZRCola/res/zrcolagui.h
@@ -1,4 +1,4 @@
-///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 // C++ code generated with wxFormBuilder (version Aug  8 2018)
 // http://www.wxformbuilder.org/
 //
--- a/ZRCola/zrcolaabout.cpp
+++ b/ZRCola/zrcolaabout.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolaabout.h
+++ b/ZRCola/zrcolaabout.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolaapp.cpp
+++ b/ZRCola/zrcolaapp.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolaapp.h
+++ b/ZRCola/zrcolaapp.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolachrcatpnl.cpp
+++ b/ZRCola/zrcolachrcatpnl.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolachrcatpnl.h
+++ b/ZRCola/zrcolachrcatpnl.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolachrgrid.cpp
+++ b/ZRCola/zrcolachrgrid.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolachrgrid.h
+++ b/ZRCola/zrcolachrgrid.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolachrreq.cpp
+++ b/ZRCola/zrcolachrreq.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolachrreq.h
+++ b/ZRCola/zrcolachrreq.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolachrslct.cpp
+++ b/ZRCola/zrcolachrslct.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolachrslct.h
+++ b/ZRCola/zrcolachrslct.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolacomppnl.cpp
+++ b/ZRCola/zrcolacomppnl.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolacomppnl.h
+++ b/ZRCola/zrcolacomppnl.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolafrm.h
+++ b/ZRCola/zrcolafrm.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolagui.cpp
+++ b/ZRCola/zrcolagui.cpp
@@ -1,4 +1,4 @@
-///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 // C++ code generated with wxFormBuilder (version Aug  8 2018)
 // http://www.wxformbuilder.org/
 //
--- a/ZRCola/zrcolagui.h
+++ b/ZRCola/zrcolagui.h
@@ -1,4 +1,4 @@
-///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 // C++ code generated with wxFormBuilder (version Aug  8 2018)
 // http://www.wxformbuilder.org/
 //
--- a/ZRCola/zrcolakeyhndlr.cpp
+++ b/ZRCola/zrcolakeyhndlr.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolakeyhndlr.h
+++ b/ZRCola/zrcolakeyhndlr.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolasettings.cpp
+++ b/ZRCola/zrcolasettings.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolasettings.h
+++ b/ZRCola/zrcolasettings.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolatranseq.cpp
+++ b/ZRCola/zrcolatranseq.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolatranseq.h
+++ b/ZRCola/zrcolatranseq.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolaupdater.cpp
+++ b/ZRCola/zrcolaupdater.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRCola/zrcolaupdater.h
+++ b/ZRCola/zrcolaupdater.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRColaCompile/ZRColaCompile.rc
+++ b/ZRColaCompile/ZRColaCompile.rc
--- a/ZRColaCompile/dbsource.cpp
+++ b/ZRColaCompile/dbsource.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRColaCompile/dbsource.h
+++ b/ZRColaCompile/dbsource.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRColaCompile/parse.cpp
+++ b/ZRColaCompile/parse.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2018-2020 Amebis

    This file is part of ZRCola.
--- a/ZRColaCompile/parse.h
+++ b/ZRColaCompile/parse.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2018-2020 Amebis

    This file is part of ZRCola.
--- a/ZRColaCompile/pch.cpp
+++ b/ZRColaCompile/pch.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRColaCompile/pch.h
+++ b/ZRColaCompile/pch.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRColaInstall/ZRColaInstall.props
+++ b/ZRColaInstall/ZRColaInstall.props
@@ -7,19 +7,7 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <CompileAsManaged>false</CompileAsManaged>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <SmallerTypeCheck>false</SmallerTypeCheck>
-    </ClCompile>
-    <Link>
-      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
    <ClCompile>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
--- a/ZRColaInstall/ZRColaInstall.rc
+++ b/ZRColaInstall/ZRColaInstall.rc
--- a/ZRColaInstall/main.cpp
+++ b/ZRColaInstall/main.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
@@ -23,35 +23,47 @@
 ///
 /// Main function
 ///
-extern "C" void WinMainCRTStartup()
+int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nCmdShow)
 {
-    // Load "KERNEL32.DLL".
-    HMODULE hKernel32 = LoadLibrary(TEXT("KERNEL32.DLL"));
-    if (!hKernel32)
-        ExitProcess(1);
+    UNREFERENCED_PARAMETER(hInstance);
+    UNREFERENCED_PARAMETER(hPrevInstance);
+    UNREFERENCED_PARAMETER(lpCmdLine);
+    UNREFERENCED_PARAMETER(nCmdShow);

-    // Get IsWow64Process() address.
-    BOOL (WINAPI *_IsWow64Process)(__in HANDLE hProcess, __out PBOOL Wow64Process) = (BOOL(WINAPI*)(__in HANDLE, __out PBOOL))::GetProcAddress(hKernel32, "IsWow64Process");
+    TCHAR szArchProc[MAX_PATH];
+    if (!GetEnvironmentVariable(TEXT("PROCESSOR_ARCHITECTURE"), szArchProc, _countof(szArchProc)))
+        szArchProc[0] = 0;
+    szArchProc[_countof(szArchProc) - 1] = 0;

-    BOOL bIs64Bit;
-#ifndef _WIN64
-    // Determine if this is a 32-bit process under Windows-over-Windows64.
-    if (_IsWow64Process) {
-        // See what IsWow64Process() says.
-        if (!_IsWow64Process(::GetCurrentProcess(), &bIs64Bit)) {
-            // IsWow64Process() returned an error. Assume not 64-bit Windows.
-            bIs64Bit = FALSE;
-        }
-    } else {
-        // This platform does not have IsWow64Process(). Therefore, this is definitely not 64-bit Windows.
-        bIs64Bit = FALSE;
+    TCHAR szArchWin[MAX_PATH];
+    if (!GetEnvironmentVariable(TEXT("PROCESSOR_ARCHITEW6432"), szArchWin, _countof(szArchWin)))
+        szArchWin[0] = 0;
+    szArchWin[_countof(szArchWin) - 1] = 0;
+
+    // If PROCESSOR_ARCHITEW6432 is defined, this is a Windows-on-Windows
+    // guest of some kind. szArchWin is the host's architecture and szArchProc
+    // is the current process' architecture.
+
+    // If PROCESSOR_ARCHITEW6432 is not defined, then PROCESSOR_ARCHITECTURE
+    // is both the process and OS architecture.
+    if (szArchWin[0] == 0)
+        memcpy_s(szArchWin, sizeof(szArchWin), szArchProc, sizeof(szArchProc));
+
+    // If PROCESSOR_ARCHITECTURE is not defined, then either we're running on
+    // Windows 9x or something is messing with the environment. Make the
+    // Windows 9x assumption.
+    if (szArchProc[0] == 0) {
+        memcpy_s(szArchProc, sizeof(szArchProc), TEXT("x86"), sizeof(TEXT("x86")));
+        memcpy_s(szArchWin , sizeof(szArchWin ), TEXT("x86"), sizeof(TEXT("x86")));
    }
-#else
-    // This is a running 64-bit process. The Windows must be 64 bit then.
-    bIs64Bit = TRUE;
-#endif

-    FreeLibrary(hKernel32);
+    LPCTSTR pszPlatSuffix;
+    if (_tcsicmp(szArchWin, TEXT("amd64")) == 0)
+        pszPlatSuffix = TEXT("-amd64");
+    else if (_tcsicmp(szArchWin, TEXT("arm64")) == 0)
+        pszPlatSuffix = TEXT("-arm64");
+    else
+        pszPlatSuffix = TEXT("-x86");

    // Get temporary folder path.
    static const LPTSTR pszTempFolderDefault = TEXT("");
@@ -74,7 +86,7 @@ extern "C" void WinMainCRTStartup()
    LPTSTR pszParams;
    DWORD_PTR aArgs[] = {
        (DWORD_PTR)TEXT(ZRCOLA_INSTALL_LANG),
-        (DWORD_PTR)(bIs64Bit ? TEXT("64") : TEXT("32")),
+        (DWORD_PTR)pszPlatSuffix,
        (DWORD_PTR)pszTempFolder,
    };
    FormatMessage(
--- a/ZRColaInstall/pch.cpp
+++ b/ZRColaInstall/pch.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/ZRColaInstall/pch.h
+++ b/ZRColaInstall/pch.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
@@ -20,3 +20,4 @@
 #pragma once

 #include <Windows.h>
+#include <tchar.h>
--- a/bin/CanoPerm.wsf
+++ b/bin/CanoPerm.wsf
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright 2017-2020 Amebis

--- a/bin/InstFont.wsf
+++ b/bin/InstFont.wsf
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright 2016-2020 Amebis

--- a/bin/MkLnk.wsf
+++ b/bin/MkLnk.wsf
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright 1991-2015-2020 Amebis

--- a/bin/ZRCUpdate.wsf
+++ b/bin/ZRCUpdate.wsf
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
    Copyright 2016-2020 Amebis

--- a/include/MSIBuildCfg.mak
+++ b/include/MSIBuildCfg.mak
--- a/include/UpdaterCfg.h
+++ b/include/UpdaterCfg.h
@@ -1,3 +1,22 @@
+/*
+    Copyright 2015-2020 Amebis
+
+    This file is part of ZRCola.
+
+    ZRCola is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    ZRCola is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ZRCola. If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include "version.h"

 //
@@ -15,3 +34,21 @@
 // Update server catalog location
 //
 #define UPDATER_HTTP_PATH           "/ZRCola/catalog-0001.xml"
+
+//
+// Hash for publishing packages and signing catalog
+//
+#define wxUpdaterHashGen            wxCryptoHashSHA256
+
+//
+// Hash for verifying catalog signature and packages
+//
+#define wxUpdaterHashChk            wxCryptoHashSHA256
+
+//
+// When changing the hash algorithm:
+//
+// 1. Bump UPDATER_HTTP_PATH and set wxUpdaterHashChk to new hash class.
+// 2. Publish the updated product using the old catalog and old wxUpdaterHashGen hash.
+// 3. Set wxUpdaterHashGen to new hash class, update Makefile to publish future updates to the new catalog.
+//
--- a/include/version.h
+++ b/include/version.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x02040000
+#define PRODUCT_VERSION          0x02040100

 //
 // Product version by components
@@ -32,27 +32,27 @@
 // separately.
 //
 #define PRODUCT_VERSION_MAJ      2
-#define PRODUCT_VERSION_MIN      4
+#define PRODUCT_VERSION_MIN      5
 #define PRODUCT_VERSION_REV      0
 #define PRODUCT_VERSION_BUILD    0

 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "2.4"
+#define PRODUCT_VERSION_STR      "2.5"
 #define PRODUCT_BUILD_YEAR_STR   "2020"

 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "2.4"
+#define PRODUCT_VERSION_INST     "2.5"

 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{F2D70359-CF7A-4396-8DE2-0910F3BE7672}"
+#define PRODUCT_VERSION_GUID     "{5AF185D8-163C-434A-8ED2-D310484027D8}"

 //
 // The product vendor and application name for configuration keeping.
--- a/lib/WinStd
+++ b/lib/WinStd
--- a/lib/libZRCola/include/zrcola/character.h
+++ b/lib/libZRCola/include/zrcola/character.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/include/zrcola/common.h
+++ b/lib/libZRCola/include/zrcola/common.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/include/zrcola/language.h
+++ b/lib/libZRCola/include/zrcola/language.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/include/zrcola/tag.h
+++ b/lib/libZRCola/include/zrcola/tag.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/include/zrcola/translate.h
+++ b/lib/libZRCola/include/zrcola/translate.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/src/character.cpp
+++ b/lib/libZRCola/src/character.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/src/common.cpp
+++ b/lib/libZRCola/src/common.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/src/language.cpp
+++ b/lib/libZRCola/src/language.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/src/mapping.cpp
+++ b/lib/libZRCola/src/mapping.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/src/pch.cpp
+++ b/lib/libZRCola/src/pch.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/src/pch.h
+++ b/lib/libZRCola/src/pch.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/src/tag.cpp
+++ b/lib/libZRCola/src/tag.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRCola/src/translate.cpp
+++ b/lib/libZRCola/src/translate.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRColaUI/MSIBuild/Makefile
+++ b/lib/libZRColaUI/MSIBuild/Makefile
@@ -34,16 +34,12 @@
 All :: "$(LANG).$(PLAT).$(CFG).Component-1.idt"

 "$(LANG).$(PLAT).$(CFG).Component-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 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"
-complibZRColaUI.mo.ru_RU	{2099A205-5D5E-4AD9-BD31-EECC87FEAB47}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.ru_RU
-!ENDIF
-!IF "$(LANG)" == "sl_SI"
-complibZRColaUI.mo.sl_SI	{EAE1C699-8415-4FC6-9EC7-FE74AFC432A9}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.sl_SI
+!IF "$(LANG)" != "en_US"
+complibZRColaUI.mo.$(LANG)	{1CEF160E-B56C-4636-$(MSIBUILD_LANG_GUID)-D6BAEB0A6EFD}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.$(LANG)
 !ENDIF
 <<NOKEEP

@@ -54,7 +50,6 @@ complibZRColaUI.mo.sl_SI	{EAE1C699-8415-4FC6-9EC7-FE74AFC432A9}	ZRCOLALOC$(MSIBU
 All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"

 "$(LANG).$(PLAT).$(CFG).File-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
-	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 File	Component_	FileName	FileSize	Version	Language	Attributes	Sequence
 s$(MSIBUILD_LENGTH_ID)	s$(MSIBUILD_LENGTH_ID)	l255	i4	S$(MSIBUILD_LENGTH_ID)	S20	I2	i2
--- a/lib/libZRColaUI/include/zrcolaui/chargroup.h
+++ b/lib/libZRColaUI/include/zrcolaui/chargroup.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRColaUI/include/zrcolaui/common.h
+++ b/lib/libZRColaUI/include/zrcolaui/common.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRColaUI/include/zrcolaui/keyboard.h
+++ b/lib/libZRColaUI/include/zrcolaui/keyboard.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRColaUI/src/keyboard.cpp
+++ b/lib/libZRColaUI/src/keyboard.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRColaUI/src/pch.cpp
+++ b/lib/libZRColaUI/src/pch.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/libZRColaUI/src/pch.h
+++ b/lib/libZRColaUI/src/pch.h
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright 2015-2020 Amebis

    This file is part of ZRCola.
--- a/lib/stdex
+++ b/lib/stdex
--- a/lib/wxExtend
+++ b/lib/wxExtend
--- a/output/.gitignore
+++ b/output/.gitignore
@@ -5,11 +5,10 @@
 /Win32.Release
 /x64.Debug
 /x64.Release
-/PackageGUID.mak
-/ZRCola*.cab
-/ZRCola*.ddf
-/ZRCola*.dep
-/ZRCola*.inf
-/ZRCola*.msi
-/ZRCola*.out
-/ZRCola*.rpt
+/*.cab
+/*.ddf
+/*.dep
+/*.inf
+/*.msi
+/*.out
+/*.rpt
Author	SHA1	Message	Date
Simon Rozman	2fce6f06bc	Set version to 2.5 Signed-off-by: Simon Rozman <simon@rozman.si>	2020-11-19 12:43:09 +01:00
Simon Rozman	89a33bc0ea	Publish MSIs to <version> and _latest folders on the download server Signed-off-by: Simon Rozman <simon@rozman.si>	2020-11-19 12:30:25 +01:00
Simon Rozman	445e0663e1	Add copyright colophon to .h files Resource Compiler has an issue with the first line of an UTF-8 .h file. The workaround is not to begin UTF-8 .h files with anything important. A blank line would do or a comment. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-11-19 11:21:39 +01:00
Simon Rozman	b837c5204c	Add copyright colophon to .rc files Signed-off-by: Simon Rozman <simon@rozman.si>	2020-11-19 11:10:33 +01:00
Simon Rozman	4dd9461c48	Add UTF-8 BOM markers to documentation Signed-off-by: Simon Rozman <simon@rozman.si>	2020-11-19 11:00:17 +01:00
Simon Rozman	c7e29b1862	Add UTF-8 BOM markers MSVC needs them to use correct charset when Language for non-Unicode programs is set to Windows-1252 or anything different than UTF-8. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-11-19 10:59:54 +01:00
Simon Rozman	42daea5b5e	Bump WinStd Signed-off-by: Simon Rozman <simon@rozman.si>	2020-11-19 10:00:46 +01:00
Simon Rozman	41ad9cd134	Specify .wsf files encoding Signed-off-by: Simon Rozman <simon@rozman.si>	2020-11-19 09:58:04 +01:00
Simon Rozman	435316eb79	Bump sub-modules Signed-off-by: Simon Rozman <simon@rozman.si>	2020-08-20 12:18:29 +02:00
Simon Rozman	aa7a8fa484	Re-add UTF-8 BOM markers where required C files containing non-ASCII characters in strings require UTF-8 BOM for the MSVC to encode them correctly to the UTF-16 string. (Or switch the computer we are building on to use UTF-8 for non-Unicode programs.) Signed-off-by: Simon Rozman <simon@rozman.si>	2020-03-15 00:13:28 +01:00
Simon Rozman	59493b998e	Enable Windows 10 ARM64 support Signed-off-by: Simon Rozman <simon@rozman.si>	2020-03-14 23:57:41 +01:00
Simon Rozman	0b586aa141	Upgrade to current MSIBuild Signed-off-by: Simon Rozman <simon@rozman.si>	2020-03-03 14:44:32 +01:00
Simon Rozman	04ffd649ec	Clean-up Signed-off-by: Simon Rozman <simon@rozman.si>	2020-03-03 13:49:51 +01:00
Simon Rozman	0970997ab7	Publish updates to the new catalog file and switch to SHA-256 (phase 2) Version 2.4 switched to the catalog-0001.xml file. The new catalog file is using SHA-256 hashes and signatures. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 13:48:10 +01:00
Simon Rozman	1434c9a2d3	Change UpgradeCode and mark to perform major update from 2.4 Changing the component GUIDs and keeping the same file paths rendered minor updating broken. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 13:32:48 +01:00
Simon Rozman	9ebdafa272	Reapply "Unify component GUIDs across platforms" This reverts commit `f0f3ce75d0`. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 13:32:48 +01:00
Simon Rozman	ea76dc27b4	Reapply "Unify component GUIDs across languages" This reverts commit `41c8cc01ed`. Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 13:32:48 +01:00
Simon Rozman	7d39d4756c	Preset version to 2.4.1 Signed-off-by: Simon Rozman <simon@rozman.si>	2020-02-25 13:32:48 +01:00