[chronojump] Send log now uses version from BuildInfo
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Send log now uses version from BuildInfo
- Date: Mon, 28 Nov 2016 18:16:53 +0000 (UTC)
commit bfd3871487dbe0a4d20ccaf549f676cf7315ad92
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Nov 28 19:16:17 2016 +0100
Send log now uses version from BuildInfo
src/Mini/Makefile.am | 1 +
src/gui/chronojump.cs | 2 +-
src/json.cs | 4 ++--
src/utilAll.cs | 9 ++++++++-
4 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/src/Mini/Makefile.am b/src/Mini/Makefile.am
index b228c81..5ed0871 100644
--- a/src/Mini/Makefile.am
+++ b/src/Mini/Makefile.am
@@ -4,6 +4,7 @@ LINK = $(REF_DEP_CHRONOJUMP)
SOURCES= \
chronojump_mini.cs \
+ ../buildInfo.cs \
../chronopic.cs \
../utilAll.cs \
../utilDate.cs \
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index f8b8fba..0c5c2aa 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -626,7 +626,7 @@ public partial class ChronoJumpWindow
//leave empty on new releases
//string buildDate = " (2016-07-27)";
- string buildVersion = BuildInfo.chronojumpVersion;
+ string buildVersion = UtilAll.ReadVersionFromBuildInfo();
label_version.Text = buildVersion;
LogB.Information("Build version:" + buildVersion);
diff --git a/src/json.cs b/src/json.cs
index 1d16a35..01361e6 100644
--- a/src/json.cs
+++ b/src/json.cs
@@ -53,7 +53,7 @@ public class Json
"----------\nUser comments:\n" + comments + "\n----------\n",
filePath);
// Create a request using a URL that can receive a post.
- WebRequest request = WebRequest.Create (serverUrl + "/backtrace/" + UtilAll.ReadVersion() +
"-" + email);
+ WebRequest request = WebRequest.Create (serverUrl + "/backtrace/" +
UtilAll.ReadVersionFromBuildInfo() + "-" + email);
// Set the Method property of the request to POST.
request.Method = "POST";
@@ -258,4 +258,4 @@ class JsonUtils
return defaultValue;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/utilAll.cs b/src/utilAll.cs
index 65924d2..6e58b04 100644
--- a/src/utilAll.cs
+++ b/src/utilAll.cs
@@ -30,10 +30,17 @@ public class UtilAll
{
static bool printedOS = false;
- public static string ReadVersion() {
+ //Eg. 1.6.2.0
+ public static string ReadVersion()
+ {
Version version = Assembly.GetExecutingAssembly().GetName().Version;
return version.ToString();
}
+ //Eg. 1.6.2-398-gfc1bb50
+ public static string ReadVersionFromBuildInfo()
+ {
+ return BuildInfo.chronojumpVersion;
+ }
//Adapted from Mono. A developer's notebook. p 244
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]