From 414001956f3e584edc3a19231648eed6a6de78b4 Mon Sep 17 00:00:00 2001 From: manongjohn <19245851+manongjohn@users.noreply.github.com> Date: Thu, 26 Oct 2023 09:08:13 -0400 Subject: [PATCH] v1.4 (beta) --- appveyor.yml | 2 +- ci-scripts/osx/tahoma-buildpkg.sh | 2 +- toonz/cmake/BundleInfo.plist.in | 4 ++-- toonz/installer/windows/setup.iss | 2 +- toonz/sources/include/tversion.h | 6 +++--- toonz/sources/toonz/CMakeLists.txt | 2 +- toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 420d83bb..2d73d5cd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.3.1{build} +version: 1.4.0{build} pull_requests: do_not_increment_build_number: true skip_tags: true diff --git a/ci-scripts/osx/tahoma-buildpkg.sh b/ci-scripts/osx/tahoma-buildpkg.sh index a8418082..4dd054ad 100644 --- a/ci-scripts/osx/tahoma-buildpkg.sh +++ b/ci-scripts/osx/tahoma-buildpkg.sh @@ -1,5 +1,5 @@ #!/bin/bash -export TAHOMA2DVERSION=1.3 +export TAHOMA2DVERSION=1.4 if [ -d /usr/local/Cellar/qt@5 ] then diff --git a/toonz/cmake/BundleInfo.plist.in b/toonz/cmake/BundleInfo.plist.in index 326eca21..63a7af45 100644 --- a/toonz/cmake/BundleInfo.plist.in +++ b/toonz/cmake/BundleInfo.plist.in @@ -23,11 +23,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.3.1 + 1.4.0 CFBundleSignature ???? CFBundleVersion - 1.3.1 + 1.4.0 CSResourcesFileMapped LSRequiresCarbon diff --git a/toonz/installer/windows/setup.iss b/toonz/installer/windows/setup.iss index 1af6299f..8f752edd 100644 --- a/toonz/installer/windows/setup.iss +++ b/toonz/installer/windows/setup.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Tahoma2D" -#define MyAppVersion "1.3" +#define MyAppVersion "1.4" #define MyAppPublisher "Tahoma2D" #define MyAppURL "https://tahoma2d.org/" #define MyAppExeName "Tahoma2D.exe" diff --git a/toonz/sources/include/tversion.h b/toonz/sources/include/tversion.h index 60e79dba..707c438f 100644 --- a/toonz/sources/include/tversion.h +++ b/toonz/sources/include/tversion.h @@ -18,9 +18,9 @@ public: private: const char *applicationName = "Tahoma2D"; - const float applicationVersion = 1.3f; - const float applicationRevision = 1; - const char *applicationNote = ""; + const float applicationVersion = 1.4f; + const float applicationRevision = 0; + const char *applicationNote = "(beta)"; }; std::string ToonzVersion::getAppName(void) { diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index 8fd59d95..7c4c4636 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -1,4 +1,4 @@ -set(VERSION 1.3.1) +set(VERSION 1.4.0) set(MOC_HEADERS aboutpopup.h diff --git a/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml b/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml index b4950f71..07bfafcf 100644 --- a/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml +++ b/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml @@ -26,7 +26,7 @@ - +