diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2019-07-02 15:08:11 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2019-07-02 15:19:56 +0300 |
| commit | b463b0c35bfeabc6a07aaf984e52321819ea3a4e (patch) | |
| tree | ad85c8c4729c5c05a4f9d060e9fc1ed1187f770a | |
| parent | 43baca1545af9d1f242438378bec1f5c44df0207 (diff) | |
Fix CuraVerison.py configuration
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cura/ApplicationMetadata.py | 6 | ||||
| -rw-r--r-- | cura/CuraVersion.py.in | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4406fd4856..d5109f0f7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,8 @@ set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root") set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version") configure_file(${CMAKE_SOURCE_DIR}/cura.desktop.in ${CMAKE_BINARY_DIR}/cura.desktop @ONLY) + + configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY) diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index aea68c0af5..73eb9bb288 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -9,6 +9,7 @@ DEFAULT_CURA_DISPLAY_NAME = "Ultimaker Cura" DEFAULT_CURA_VERSION = "master" DEFAULT_CURA_BUILD_TYPE = "" DEFAULT_CURA_DEBUG_MODE = False +DEFAULT_CURA_SDK_VERSION = "6.1.0" try: from cura.CuraVersion import CuraAppName # type: ignore @@ -41,4 +42,7 @@ try: except ImportError: CuraDebugMode = DEFAULT_CURA_DEBUG_MODE -from cura.CuraVersion import CuraSDKVersion # type: ignore +# Each release has a fixed SDK version coupled with it. It doesn't make sense to make it configurable because, for +# example Cura 3.2 with SDK version 6.1 will not work. So the SDK version is hard-coded here and left out of the +# CuraVersion.py.in template. +CuraSDKVersion = "6.1.0" diff --git a/cura/CuraVersion.py.in b/cura/CuraVersion.py.in index abbc3a0a0d..4583e76f67 100644 --- a/cura/CuraVersion.py.in +++ b/cura/CuraVersion.py.in @@ -6,9 +6,6 @@ CuraAppDisplayName = "@CURA_APP_DISPLAY_NAME@" CuraVersion = "@CURA_VERSION@" CuraBuildType = "@CURA_BUILDTYPE@" CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False - -CuraSDKVersion = "6.1.0" - CuraCloudAPIRoot = "@CURA_CLOUD_API_ROOT@" CuraCloudAPIVersion = "@CURA_CLOUD_API_VERSION@" CuraCloudAccountAPIRoot = "@CURA_CLOUD_ACCOUNT_API_ROOT@" |