fix meshlab version

This commit is contained in:
alemuntoni 2020-03-27 16:16:57 +01:00
parent 33a6c80fa3
commit 5f2575c4aa
7 changed files with 15 additions and 21 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

1
VERSION Normal file
View File

@ -0,0 +1 @@
"2020.02"

View File

@ -1 +0,0 @@
2020.02

View File

@ -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);
}