Upgrade to current MSIBuild

Signed-off-by: Simon Rozman <simon@rozman.si>

MSI/MSIBuild

@@ -1 +1 @@
-Subproject commit 29009bb892cd31686fa40fab56770f9467865c33
+Subproject commit e1a01465701da2f554e27a9eaccf7a2a5da0f23b

MSI/MSICA

@@ -1 +1 @@
-Subproject commit ad49c00a058ca601f9bc4a451bf78853c09f9b39
+Subproject commit 1e48c204063258c12615033e5bc66fc39c0d081a

Makefile

@@ -40,8 +40,13 @@ MSBUILDFLAGS=/v:m /m
 
 All ::
 
-Clean ::
+Clean :: \
-	cd "MSI\MSIBuild\Version"
+	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"
@@ -60,13 +65,11 @@ Register \
 Unregister \
 Localization \
 PublishPre \
-Publish :: "MSI\MSIBuild\Version\Version.mak"
+Publish ::
-	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
-
-"MSI\MSIBuild\Version\Version.mak" ::
 	cd "MSI\MSIBuild\Version"
 	$(MAKE) /f "Makefile" /$(MAKEFLAGS) Version
 	cd "$(MAKEDIR)"
+	$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
 
 !ELSE
 
@@ -89,6 +92,21 @@ All :: \
 	Setup
 
 
+######################################################################
+# Setup
+######################################################################
+
+Setup :: \
+	Localization \
+	SetupCompile \
+	SetupPackage \
+
+SetupDebug :: \
+	Localization \
+	SetupDebugCompile \
+	SetupDebugPackage \
+
+
 ######################################################################
 # Publishing
 ######################################################################
@@ -107,6 +125,8 @@ Publish :: \
 ######################################################################
 
 Register :: \
+	Localization \
+	RegisterCompile \
 	RegisterSettings \
 	InstallFonts \
 	RegisterShortcuts
@@ -116,6 +136,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
@@ -223,7 +246,6 @@ UnregisterShortcuts ::
 	"$(OUTPUT_DIR)\ZRColaRu64.msi" \
 	"$(OUTPUT_DIR)\ZRColaSl32.msi" \
 	"$(OUTPUT_DIR)\ZRColaSl64.msi"
-	-if exist $@ del /f /q $@
 	copy /y "$(PUBLISH_DIR)\catalog-0001.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"

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)\$(PLAT).$(CFG).ddf" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).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)\$(PLAT).$(CFG).cab" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).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)\$(PLAT).$(CFG).inf" del /f /q "$(OUTPUT_DIR)\$(PLAT).$(CFG).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).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).ddf" : \
-
+#	"$(OUTPUT_DIR)\de_DE.$(PLAT).$(CFG).2.msi" \
-"$(OUTPUT_DIR)\$(PLAT).$(CFG)\ZRCola.exe" ::
+	"$(OUTPUT_DIR)\en_US.$(PLAT).$(CFG).2.msi" \
-	msbuild.exe $(MSBUILDFLAGS) "ZRCola.sln" /t:Build /p:Configuration=$(CFG) /p:Platform=$(PLAT)
+	"$(OUTPUT_DIR)\ru_RU.$(PLAT).$(CFG).2.msi" \
-
+	"$(OUTPUT_DIR)\sl_SI.$(PLAT).$(CFG).2.msi"
-"$(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 $@
 	-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)\$(PLAT).$(CFG).cab" \
-"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).inf" \
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).inf" \
-"$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).rpt" : "$(OUTPUT_DIR)\ZRCola$(PLAT_SUFFIX)$(CFG_SUFFIX).ddf"
+"$(OUTPUT_DIR)\$(PLAT).$(CFG).rpt" : "$(OUTPUT_DIR)\$(PLAT).$(CFG).ddf"
 	makecab.exe /F $**
 
 !ENDIF

Updater

@@ -1 +1 @@
-Subproject commit 8baf612a6ca9eb6955912f208776929413bd5b79
+Subproject commit dc4cc1b22e46b376d273d420a50ea4d4c588ec3a

ZRCola/MSIBuild/Makefile

@@ -40,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)
@@ -59,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
@@ -85,7 +83,6 @@ 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
@@ -100,7 +97,6 @@ clZRCola.exe.$(PLAT)	{6DB513F9-BC90-4CE7-821$(MSIBUILD_PLAT_GUID)-AA50BF31F34E}
 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)
@@ -118,7 +114,6 @@ compZRCola.mo.$(LANG)	{4F59C403-D6DE-4B3F-$(MSIBUILD_LANG_GUID)-1190DB941EB3}	ZR
 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)
@@ -156,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
@@ -173,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
@@ -190,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
@@ -207,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
@@ -230,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)
@@ -258,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
@@ -278,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
@@ -296,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
@@ -311,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)

lib/libZRColaUI/MSIBuild/Makefile

@@ -34,7 +34,6 @@
 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)
@@ -51,7 +50,6 @@ complibZRColaUI.mo.$(LANG)	{1CEF160E-B56C-4636-$(MSIBUILD_LANG_GUID)-D6BAEB0A6EF
 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

lib/wxExtend

@@ -1 +1 @@
-Subproject commit f3e208572f8c3aa16d7a220f8b3671c6c4fa8e8c
+Subproject commit d5593edd0066cdad15f48370360595ff505bfbbb

output/.gitignore

@@ -5,11 +5,10 @@
 /Win32.Release
 /x64.Debug
 /x64.Release
-/PackageGUID.mak
+/*.cab
-/ZRCola*.cab
+/*.ddf
-/ZRCola*.ddf
+/*.dep
-/ZRCola*.dep
+/*.inf
-/ZRCola*.inf
+/*.msi
-/ZRCola*.msi
+/*.out
-/ZRCola*.out
+/*.rpt
-/ZRCola*.rpt