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

Adaptation to Updater changes

Browse Source
This commit is contained in:
Simon Rozman 2016-10-11 13:25:33 +02:00
parent 8d9af61d5e
commit 52689653d0
6 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Updater

@ -1 +1 @@
Subproject commit a9a04f8df31335e28aedb5f38eb2bd44ba9ceb0a Subproject commit 2ca5b4d9d185b64221134366575ed2b3ba908d45

2
ZRCola/zrcolaapp.cpp
View File

@ -57,7 +57,7 @@ bool ZRColaApp::OnInit()
// Initialize locale. // Initialize locale.
if (wxInitializeLocale(m_locale)) { if (wxInitializeLocale(m_locale)) {
wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion))); wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
wxVERIFY(m_locale.AddCatalog(wxT("Updater") wxT(wxUpdaterVersion))); wxVERIFY(m_locale.AddCatalog(wxT("UpdaterZRCola")));
wxVERIFY(m_locale.AddCatalog(wxT("libZRColaUI"))); wxVERIFY(m_locale.AddCatalog(wxT("libZRColaUI")));
wxVERIFY(m_locale.AddCatalog(wxT("ZRCola"))); wxVERIFY(m_locale.AddCatalog(wxT("ZRCola")));
wxVERIFY(m_locale.AddCatalog(wxT("ZRCola-zrcdb"))); wxVERIFY(m_locale.AddCatalog(wxT("ZRCola-zrcdb")));

BIN
include/MSIBuildCfg.mak
View File

Binary file not shown.

19
include/UpdaterCfg.h
View File

@ -15,22 +15,3 @@
// Update server catalog location // Update server catalog location
// //
#define UPDATER_HTTP_PATH "/prenos/ZRCola/catalog-0000.xml" #define UPDATER_HTTP_PATH "/prenos/ZRCola/catalog-0000.xml"
//
// The product vendor and application name for configuration keeping.
//
#define UPDATER_CFG_VENDOR "Amebis"
#define UPDATER_CFG_APPLICATION "ZRCola"
//
// Product version as a single DWORD
// Note: Used for version comparison within C/C++ code.
//
#define UPDATER_PRODUCT_VERSION PRODUCT_VERSION
//
// Human readable product version and build year for UI
//
#define UPDATER_PRODUCT_VERSION_STR PRODUCT_VERSION_STR

4
include/common.props
View File

@ -21,7 +21,9 @@
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
<Import Project="xgettext.props" /> <Import Project="xgettext.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros">
<UpdaterVersion>ZRCola</UpdaterVersion>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<_PropertySheetDisplayName>ZRCola Common</_PropertySheetDisplayName> <_PropertySheetDisplayName>ZRCola Common</_PropertySheetDisplayName>
<IntDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</IntDir> <IntDir>temp\$(MSBuildProjectName).$(Platform).$(Configuration).$(PlatformToolset)\</IntDir>

2
output/locale/.gitignore vendored
View File

@ -1,7 +1,7 @@
*/libZRColaUI.mo */libZRColaUI.mo
*/wxExtend14.mo */wxExtend14.mo
*/wxstd.mo */wxstd.mo
*/Updater10.mo */UpdaterZRCola.mo
*/ZRCola.mo */ZRCola.mo
*/ZRColaCompile.mo */ZRColaCompile.mo
*/ZRCola-zrcdb.mo */ZRCola-zrcdb.mo