3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-14 01:26:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

[packaging] dissociate meshroom.__version__ / __version_name__

Browse source 
Introduce meshroom.__version_name__ variable in order not to modify meshroom.__version__ and use this as displayed application version. 
meshroom.__version__ is stored in scene files and used when making a package and should not contain anything other than major.minor.micro information.
This commit is contained in:
Yann Lanthony 2019-06-17 12:46:26 +02:00
parent e3d9c6cf5d
commit a85b4660ce
No known key found for this signature in database
GPG key ID: 519FAE6DF7A70642
2 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
meshroom/__init__.py
View file

@ -1,23 +1,26 @@
__version__ = "2019.1.0" __version__ = "2019.1.0"
__version_name__ = __version__
import os import os
scriptPath = os.path.dirname(os.path.abspath( __file__ )) import sys
headFilepath = os.path.join(scriptPath, "../.git/HEAD")
# If we are in a release, the git history will not exist.
# If we are in development, we declare the name of the git development branch in the version name
if os.path.exists(headFilepath):
with open (headFilepath, "r") as headFile:
data = headFile.readlines()
branchName = data[0].split('/')[-1]
# Add git branch name to the Meshroom version name
__version__ = __version__ + "-" + branchName
# Allow override from env variable
__version__ = os.environ.get("REZ_MESHROOM_VERSION", __version__)
import logging import logging
from enum import Enum from enum import Enum
# sys.frozen is initialized by cx_Freeze and identifies a release package
isFrozen = getattr(sys, "frozen", False)
if not isFrozen:
# development mode: add git branch name (if any) to __version_name__
scriptPath = os.path.dirname(os.path.abspath(__file__))
headFilepath = os.path.join(scriptPath, "../.git/HEAD")
if os.path.exists(headFilepath):
with open(headFilepath, "r") as headFile:
data = headFile.readlines()
branchName = data[0].split('/')[-1]
__version_name__ += "-" + branchName
# Allow override from env variable
__version_name__ = os.environ.get("REZ_MESHROOM_VERSION", __version_name__)
class Backend(Enum): class Backend(Enum):
STANDALONE = 1 STANDALONE = 1
@ -55,9 +58,6 @@ def setupEnvironment():
COPYING.md # Meshroom COPYING file COPYING.md # Meshroom COPYING file
""" """
import os
import sys
def addToEnvPath(var, val, index=-1): def addToEnvPath(var, val, index=-1):
""" """
Add paths to the given environment variable. Add paths to the given environment variable.
@ -75,8 +75,6 @@ def setupEnvironment():
paths[index:index] = val paths[index:index] = val
os.environ[var] = os.pathsep.join(paths) os.environ[var] = os.pathsep.join(paths)
# sys.frozen is initialized by cx_Freeze
isFrozen = getattr(sys, "frozen", False)
# setup root directory (override possible by setting "MESHROOM_INSTALL_DIR" environment variable) # setup root directory (override possible by setting "MESHROOM_INSTALL_DIR" environment variable)
rootDir = os.path.dirname(sys.executable) if isFrozen else os.environ.get("MESHROOM_INSTALL_DIR", None) rootDir = os.path.dirname(sys.executable) if isFrozen else os.environ.get("MESHROOM_INSTALL_DIR", None)

2
meshroom/ui/app.py
View file

@ -61,7 +61,7 @@ class MeshroomApp(QApplication):
self.setOrganizationName('AliceVision') self.setOrganizationName('AliceVision')
self.setApplicationName('Meshroom') self.setApplicationName('Meshroom')
self.setAttribute(Qt.AA_EnableHighDpiScaling) self.setAttribute(Qt.AA_EnableHighDpiScaling)
self.setApplicationVersion(meshroom.__version__) self.setApplicationVersion(meshroom.__version_name__)
font = self.font() font = self.font()
font.setPointSize(9) font.setPointSize(9)