Commit 045669c4 authored by Johannes Schwab's avatar Johannes Schwab

bump version

parent 4713eeb7
#! /bin/bash
VERSION=0.2.1
VERSION=0.2.2
REVISION=1
mkdir build_deb
......
......@@ -9,5 +9,5 @@ cd ..
Paraffin.exe -update paraffin.wxs
candle.exe paraffin.wxs
candle.exe client.wxs
light.exe -out openrecipes-0.2.1.msi -ext WixUIExtension client.wixobj paraffin.wixobj
light.exe -out openrecipes-0.2.2.msi -ext WixUIExtension client.wixobj paraffin.wixobj
ECHO "DON'T FORGET TO UPDATE PRODUCT AND PACKAGE guidS BEFOR RELEASEING!!!"
......@@ -63,7 +63,3 @@ QVersionNumber Globals::getMinimumQtVersion() {
QByteArray Globals::getUpdateSigningKey() {
return QByteArray::fromHex("5C86B2FD68F44CE7446CBFF5F4589B5985F39B725AE852DCF15E4CE6EB9A2E26");
}
QVersionNumber Globals::getVersion() {
return QVersionNumber(0, 2, 1);
}
......@@ -40,7 +40,6 @@ class Globals : public QObject {
static QString getDefaultServerHostName();
static quint16 getDefaultServerPort();
static QByteArray getDefaultServerKey();
static QVersionNumber getVersion();
static QByteArray getUpdateSigningKey();
};
......
......@@ -20,6 +20,8 @@
#include "InternalError.h"
#include "Globals.h"
#include <config.h>
#include <QApplication>
#include <fstream>
#include <QProcess>
......@@ -84,7 +86,7 @@ void CheckForUpdateAsync::run() {
return;
}
if (curVer > Globals::getVersion()) {
if (curVer > QVersionNumber::fromString(config::version)) {
emit updateAvailable(curVer);
} else {
emit noUpdateAvailable(true);
......@@ -96,7 +98,7 @@ UpdateAsync::UpdateAsync(QObject *parent, const QVersionNumber &version)
QThread(parent),
version(version)
{
if (version < Globals::getVersion()) throw IERROR("Won't downgrade");
if (version < QVersionNumber::fromString(config::version)) throw IERROR("Won't downgrade");
}
void UpdateAsync::run() {
......
VERSION = 0.2.1
ANDROID_VERSION_CODE = 3
VERSION = 0.2.2
ANDROID_VERSION_CODE = 4
DEFINES += QT_DEPRECATED_WARNINGS
unix: QMAKE_CXXFLAGS += -Wextra -Werror=format-security -D_FORTIFY_SECURITY=2
......
openrecipes (0.2.2-1) unstable; urgency=low
* Release
-- Johannes Schwab <openrecipes@jschwab.org> Wed, 15 Jan 2019 17:34:23 +0200
openrecipes (0.2.1-1) unstable; urgency=low
* Initial release
* Release
-- Johannes Schwab <openrecipes@jschwab.org> Wed, 09 Jan 2019 17:34:23 +0200
......
<?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='OpenRecipes' Manufacturer='Johannes Schwab'
Id='8C6A3345-3E59-46D9-9FD9-02DFB78863B2'
Id='6D69B2E8-D101-4434-8058-DCE0986C953D'
UpgradeCode='9412EF89-5DA9-4F79-9E0D-49D1C0E320F5'
Language='1033' Codepage='1252' Version='0.2.1'>
Language='1033' Codepage='1252' Version='0.2.2'>
<Package Id='*' Keywords='Installer' Description='0penRecipes Installer'
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment