From 777bb9ff25c43285b7c8280bde3265517ec47ce8 Mon Sep 17 00:00:00 2001 From: Gres Date: Fri, 6 Nov 2015 22:46:56 +0300 Subject: [PATCH 1/4] Proper numeric fields extract from version.json. --- Updater.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Updater.cpp b/Updater.cpp index 102fdd1..f8904f9 100644 --- a/Updater.cpp +++ b/Updater.cpp @@ -32,8 +32,8 @@ namespace { QString versionField (const QJsonObject &component, const QString &field) { return component.contains (field + _platform) - ? component[field + _platform].toString () - : component[field].toString (); + ? component[field + _platform].toVariant ().toString () + : component[field].toVariant ().toString (); } QFileInfo fileDir (const QString &fileName) { From 8c15289f8af7f27bbc8223502e491b7bfab11ef3 Mon Sep 17 00:00:00 2001 From: Gres Date: Fri, 6 Nov 2015 22:47:40 +0300 Subject: [PATCH 2/4] Application updates disabled in linux (only notify). --- Updater.cpp | 2 +- version.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Updater.cpp b/Updater.cpp index f8904f9..c4fa829 100644 --- a/Updater.cpp +++ b/Updater.cpp @@ -155,7 +155,7 @@ void Updater::parseAvailableVersion () { if (!installDir.isWritable ()) { // check dir because install = remove + make new inaccessible << installDir.absoluteFilePath (); } - if (current[_version].toInt () < available[_compatibleVersion].toInt ()) { + if (current[_version].toInt () < versionField (available, _compatibleVersion).toInt ()) { incompatible << component; } if (!QFile::exists (path) || current[_version].toInt () < available[_version].toInt ()) { diff --git a/version.json b/version.json index 8d78aa1..d57f8cf 100644 --- a/version.json +++ b/version.json @@ -4,12 +4,13 @@ "Application": { "version": 1, "compatibleVersion": 1, + "compatibleVersion_linux": 999, "built_in": true, "versionString": "2.0.0", "permissions": "0x7755", "url_win": "https://raw.githubusercontent.com/OneMoreGres/ScreenTranslator/releases/2.0.0/ScreenTranslator.exe", "path_win": "ScreenTranslator.exe", - "url_linux": "https://raw.githubusercontent.com/OneMoreGres/ScreenTranslator/releases/2.0.0/ScreenTranslator", + "url_linux": "disabled", "path_linux": "ScreenTranslator" }, "Bing translator": { From eca5d1ed397729fead2d0ff9b2d16b472d67095b Mon Sep 17 00:00:00 2001 From: Gres Date: Fri, 6 Nov 2015 22:53:56 +0300 Subject: [PATCH 3/4] Added travis build for release branch. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8acd8f5..e981e6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ branches: only: - master - develop + - /release.*/ - /.*travis/ os: - linux From e0177de97e92de45d8d2eed5fed9003a7094b04f Mon Sep 17 00:00:00 2001 From: Gres Date: Fri, 6 Nov 2015 22:58:16 +0300 Subject: [PATCH 4/4] Do not cleanup work dir by default. --- scripts/make_all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/make_all.sh b/scripts/make_all.sh index 2412a56..f325033 100755 --- a/scripts/make_all.sh +++ b/scripts/make_all.sh @@ -1,7 +1,7 @@ #!/bin/bash source ./options.sh $@ -cleanupDirInNeeded $WORK_DIR +#cleanupDirInNeeded $WORK_DIR echo "Running all scripts for $PLATFORM" #./install_deps $@