From 5f2575c4aaaee687d49239a48152bea20a3fc773 Mon Sep 17 00:00:00 2001
From: alemuntoni <muntoni.alessandro@gmail.com>
Date: Fri, 27 Mar 2020 16:16:57 +0100
Subject: [PATCH] fix meshlab version

---
 .github/workflows/CompileAndRelease.yml |  6 +++---
 .github/workflows/CompileMacOS.yml      |  2 +-
 .github/workflows/CompileUbuntu.yml     |  5 ++---
 .github/workflows/CompileWindows.yml    |  4 ++--
 VERSION                                 |  1 +
 distrib/VERSION                         |  1 -
 src/common/mlapplication.cpp            | 17 ++++++-----------
 7 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 VERSION
 delete mode 100644 distrib/VERSION

diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml
index e9d576593..b275cd2ce 100755
--- a/.github/workflows/CompileAndRelease.yml
+++ b/.github/workflows/CompileAndRelease.yml
@@ -27,7 +27,7 @@ jobs:
         echo  ::set-output name=date::"$(date +%Y.%m)"
     - name: Update MeshLab version
       run : |
-        echo ${{steps.envs.outputs.date}} > distrib/VERSION
+        echo ${{steps.envs.outputs.date}} > VERSION
     - name: Build MeshLab
       run: |
         sh install/linux/linux_build.sh
@@ -83,7 +83,7 @@ jobs:
         echo  ::set-output name=date::"$(date +%Y.%m)"
     - name: Update MeshLab version
       run : |
-        echo ${{steps.envs.outputs.date}} > distrib/VERSION
+        echo ${{steps.envs.outputs.date}} > VERSION
     - name: Build MeshLab
       run: |
         sh install/macos/macos_build.sh
@@ -125,7 +125,7 @@ jobs:
         echo "::set-output name=date::$(Get-Date -Format "yyyy.MM")"
     - name: Update MeshLab version
       run : |
-        Set-Content -Path distrib\VERSION -Value ${{steps.envs.outputs.date}} -Force
+        Set-Content -Path VERSION -Value ${{steps.envs.outputs.date}} -Force
     - name: Setup MSVC
       uses: ilammy/msvc-dev-cmd@v1
     - name: Install Qt
diff --git a/.github/workflows/CompileMacOS.yml b/.github/workflows/CompileMacOS.yml
index 7e32ec813..8910f5e39 100755
--- a/.github/workflows/CompileMacOS.yml
+++ b/.github/workflows/CompileMacOS.yml
@@ -33,7 +33,7 @@ jobs:
         echo  ::set-output name=date::"$(date +%Y.%m)"
     - name: Update MeshLab version
       run : |
-        echo ${{steps.envs.outputs.date}} > distrib/VERSION
+        echo ${{steps.envs.outputs.date}} > VERSION
     - name: Build MeshLab
       run: |
         sh install/macos/macos_build.sh
diff --git a/.github/workflows/CompileUbuntu.yml b/.github/workflows/CompileUbuntu.yml
index 1a11c16d5..8168d3ac6 100755
--- a/.github/workflows/CompileUbuntu.yml
+++ b/.github/workflows/CompileUbuntu.yml
@@ -25,10 +25,9 @@ jobs:
         echo  ::set-output name=date::"$(date +%Y.%m)"
     - name: Update MeshLab version
       run : |
-        echo ${{steps.envs.outputs.date}} > distrib/VERSION
+        echo ${{steps.envs.outputs.date}} > VERSION
     - name: Build MeshLab
       run: |
-        cat distrib/VERSION
         sh install/linux/linux_build.sh
     - name: Deploy MeshLabServer
       run : |
@@ -76,7 +75,7 @@ jobs:
         echo  ::set-output name=date::"$(date +%Y.%m)"
     - name: Update MeshLab version
       run : |
-        echo ${{steps.envs.outputs.date}} > distrib/VERSION
+        echo ${{steps.envs.outputs.date}} > VERSION
     - name: Configure
       run: |
         cmake src/ -G Ninja
diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml
index f81c6c67c..fff980001 100644
--- a/.github/workflows/CompileWindows.yml
+++ b/.github/workflows/CompileWindows.yml
@@ -28,7 +28,7 @@ jobs:
         echo "::set-output name=date::$(Get-Date -Format "yyyy.MM")"
     - name: Update MeshLab version
       run : |
-        Set-Content -Path distrib\VERSION -Value ${{steps.envs.outputs.date}} -Force
+        Set-Content -Path VERSION -Value ${{steps.envs.outputs.date}} -Force
     - name: Setup MSVC
       uses: ilammy/msvc-dev-cmd@v1
     - name: Install Qt
@@ -90,7 +90,7 @@ jobs:
         echo "::set-output name=date::$(Get-Date -Format "yyyy.MM")"
     - name: Update MeshLab version
       run : |
-        Set-Content -Path distrib\VERSION -Value ${{steps.envs.outputs.date}} -Force
+        Set-Content -Path VERSION -Value ${{steps.envs.outputs.date}} -Force
     - name: Configure
       run: |
         cmake -S ./src -B ./build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=install -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
diff --git a/VERSION b/VERSION
new file mode 100644
index 000000000..65369160d
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+"2020.02"
diff --git a/distrib/VERSION b/distrib/VERSION
deleted file mode 100644
index 5983e7a29..000000000
--- a/distrib/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2020.02
diff --git a/src/common/mlapplication.cpp b/src/common/mlapplication.cpp
index 4828d5a23..5d525a23b 100644
--- a/src/common/mlapplication.cpp
+++ b/src/common/mlapplication.cpp
@@ -30,16 +30,11 @@ bool MeshLabApplication::notify( QObject * rec, QEvent * ev )
 
 const QString MeshLabApplication::appVer()
 {
-	static QString version = "";
-	if (version == ""){
-		QFile f("VERSION");
-		if (!f.open(QFile::ReadOnly | QFile::Text)) version = "2020.02";
-		else {
-			QTextStream in(&f);
-			version = in.readAll();
-			version.chop(1);
-		}
-	}
-	return version;
+	// very very very bad shortcut.
+	// need a better solution...
+	const char* version =
+		#include "../../VERSION"
+			;
+	return QString(version);
 }