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

UpdCheck added to MSI package

Browse Source
This commit is contained in:
Simon Rozman 2016-03-30 11:44:07 +02:00
parent fd36ffdc1f
commit b863abd319
11 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MSI/MSM/Microsoft_VC100_CRT_x64.msmcfg
View File

@ -19,6 +19,6 @@
[splosno] [splosno]
jezik=0 jezik=0
deli=featZRCola deli=featZRCola featUpdCheck
[parametri] [parametri]

2
MSI/MSM/Microsoft_VC100_CRT_x86.msmcfg
View File

@ -19,6 +19,6 @@
[splosno] [splosno]
jezik=0 jezik=0
deli=featZRCola deli=featZRCola featUpdCheck
[parametri] [parametri]

2
MSI/MSM/Microsoft_VC100_DebugCRT_x64.msmcfg
View File

@ -19,6 +19,6 @@
[splosno] [splosno]
jezik=0 jezik=0
deli=featZRCola deli=featZRCola featUpdCheck
[parametri] [parametri]

2
MSI/MSM/Microsoft_VC100_DebugCRT_x86.msmcfg
View File

@ -19,6 +19,6 @@
[splosno] [splosno]
jezik=0 jezik=0
deli=featZRCola deli=featZRCola featUpdCheck
[parametri] [parametri]

2
MSI/MSM/wxMSW_wxbase30u_vc100.msmcfg
View File

@ -19,6 +19,6 @@
[splosno] [splosno]
jezik=0 jezik=0
deli=featZRCola deli=featZRCola featUpdCheck
[parametri] [parametri]

2
MSI/MSM/wxMSW_wxbase30u_vc100_x64.msmcfg
View File

@ -19,6 +19,6 @@
[splosno] [splosno]
jezik=0 jezik=0
deli=featZRCola deli=featZRCola featUpdCheck
[parametri] [parametri]

2
MSI/MSM/wxMSW_wxbase30ud_vc100.msmcfg
View File

@ -19,6 +19,6 @@
[splosno] [splosno]
jezik=0 jezik=0
deli=featZRCola deli=featZRCola featUpdCheck
[parametri] [parametri]

2
MSI/MSM/wxMSW_wxbase30ud_vc100_x64.msmcfg
View File

@ -19,6 +19,6 @@
[splosno] [splosno]
jezik=0 jezik=0
deli=featZRCola deli=featZRCola featUpdCheck
[parametri] [parametri]

BIN
MSI/include/MSIBuildCfg.mak
View File

Binary file not shown.

8
Makefile
View File

@ -55,6 +55,10 @@ Clean ::
devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|Win32" devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|Win32"
devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|x64" devenv.com "MSI\MSICA\MSICA.sln" /clean "Release|x64"
devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|x64" devenv.com "MSI\MSICA\MSICA.sln" /clean "Debug|x64"
devenv.com "Updater\Updater.sln" /clean "Release|Win32"
devenv.com "Updater\Updater.sln" /clean "Debug|Win32"
devenv.com "Updater\Updater.sln" /clean "Release|x64"
devenv.com "Updater\Updater.sln" /clean "Debug|x64"
-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" -if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32.msi"
-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" -if exist "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn32D.msi"
-if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" -if exist "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi" del /f /q "$(OUTPUT_DIR)\Setup\ZRColaEn64.msi"
@ -284,18 +288,22 @@ $(REDIST_SL_X64) : "$(OUTPUT_DIR)\ZRColaSl64D.3.msi"
"$(OUTPUT_DIR)\ZRColaEn32.3.msi" \ "$(OUTPUT_DIR)\ZRColaEn32.3.msi" \
"$(OUTPUT_DIR)\ZRColaSl32.3.msi" :: "$(OUTPUT_DIR)\ZRColaSl32.3.msi" ::
devenv.com "MSI\MSICA\MSICA.sln" /build "Release|Win32" devenv.com "MSI\MSICA\MSICA.sln" /build "Release|Win32"
devenv.com "Updater\Updater.sln" /build "Release|Win32"
"$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \ "$(OUTPUT_DIR)\ZRColaEn32D.3.msi" \
"$(OUTPUT_DIR)\ZRColaSl32D.3.msi" :: "$(OUTPUT_DIR)\ZRColaSl32D.3.msi" ::
devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|Win32" devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|Win32"
devenv.com "Updater\Updater.sln" /build "Debug|Win32"
"$(OUTPUT_DIR)\ZRColaEn64.3.msi" \ "$(OUTPUT_DIR)\ZRColaEn64.3.msi" \
"$(OUTPUT_DIR)\ZRColaSl64.3.msi" :: "$(OUTPUT_DIR)\ZRColaSl64.3.msi" ::
devenv.com "MSI\MSICA\MSICA.sln" /build "Release|x64" devenv.com "MSI\MSICA\MSICA.sln" /build "Release|x64"
devenv.com "Updater\Updater.sln" /build "Release|x64"
"$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \ "$(OUTPUT_DIR)\ZRColaEn64D.3.msi" \
"$(OUTPUT_DIR)\ZRColaSl64D.3.msi" :: "$(OUTPUT_DIR)\ZRColaSl64D.3.msi" ::
devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|x64" devenv.com "MSI\MSICA\MSICA.sln" /build "Debug|x64"
devenv.com "Updater\Updater.sln" /build "Debug|x64"
"$(OUTPUT_DIR)\ZRColaEn32.3.msi" :: "$(OUTPUT_DIR)\ZRColaEn32.3.msi" ::
cd "MSI\ZRCola" cd "MSI\ZRCola"

2
Updater

@ -1 +1 @@
Subproject commit a5f71f696570d85cfa0910d43295dcfbbf85aaf3 Subproject commit 840f1bce06ef85d2f7f63a6d43c37aa9dc814ba1