diff --git a/README.md b/README.md index 4e118e7ea..7d47dc724 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ such as VATSIM, supporting the following simulators and operating systems: Downloads ========= -[![Beta version](https://img.shields.io/endpoint?url=https%3A%2F%2Frunkit.io%2Foktal3700%2Flatest-swift%2Fbranches%2Fmaster)][1] -[![Alpha version](https://img.shields.io/endpoint?url=https%3A%2F%2Frunkit.io%2Foktal3700%2Flatest-swift%2Fbranches%2Fmaster%2F%3Fprerelease%3Dtrue)][2] +[![Beta version](https://img.shields.io/github/v/release/swift-project/pilotclient?sort=semver)][1] +[![Alpha version](https://img.shields.io/github/v/release/swift-project/pilotclient?include_prereleases&sort=semver)][2] [1]: https://github.com/swift-project/pilotclient/releases/latest [2]: https://github.com/swift-project/pilotclient/releases @@ -34,13 +34,13 @@ Contributing _swift_ is written in modern C++17 using the Qt framework. -[![Development version](https://img.shields.io/badge/version-0.9.9-blue)](.) -[![Build status](https://img.shields.io/github/workflow/status/swift-project/pilotclient/Build%20swift/develop/0.9.9)][3] +[![Development version](https://img.shields.io/badge/version-0.10-blue)](.) +[![Build status](https://img.shields.io/github/workflow/status/swift-project/pilotclient/Build%20swift/develop/0.10)][3] [3]: https://github.com/swift-project/pilotclient/actions Pull requests should be made against the current active development branch, -which is `develop/0.9.9`. +which is `develop/0.10`. [:blue_book: Developer guide](https://docs.swift-project.org/doku.php?id=developer_documentation) diff --git a/default.json b/default.json index f9bb2e2c8..b1f61a55f 100644 --- a/default.json +++ b/default.json @@ -1,8 +1,7 @@ { "version": { "major": 0, - "minor": 9, - "micro": 9 + "minor": 10 }, "libs": { "blackcore": true, diff --git a/installer/installbuilder/project.xml b/installer/installbuilder/project.xml index 1cb92e397..ea9ec9c3a 100644 --- a/installer/installbuilder/project.xml +++ b/installer/installbuilder/project.xml @@ -304,10 +304,10 @@ https://swift-project.org/ ../images/swiftinstaller.icns . ${installdir}/share/icons/swiftinstaller.ico - ${product_fullname} ${project.version} ${architecture}bit + ${product_fullname} ${project.version} (${architecture}bit) highestAvailable 1 - swift ${project.version} ${architecture}bit + swift ${project.version} (${architecture}bit) swift Project ../images/swiftinstaller.ico diff --git a/installer/installbuilder/swift-pilotclient.xml b/installer/installbuilder/swift-pilotclient.xml index 3e5f5c462..ee4a5f05a 100644 --- a/installer/installbuilder/swift-pilotclient.xml +++ b/installer/installbuilder/swift-pilotclient.xml @@ -209,7 +209,7 @@ This installs the binaries to run all swift applications. Run swiftgui - swiftgui ${project.version} ${architecture}bit + swiftgui ${project.version} (${architecture}bit) 0 0 ${installdir}/bin/swiftguistd.exe @@ -219,7 +219,7 @@ This installs the binaries to run all swift applications. Run swiftcore - swiftcore ${project.version} ${architecture}bit + swiftcore ${project.version} (${architecture}bit) 0 0 ${installdir}/bin/swiftcore.exe @@ -229,7 +229,7 @@ This installs the binaries to run all swift applications. Run swiftdata - swiftdata ${project.version} ${architecture}bit + swiftdata ${project.version} (${architecture}bit) 0 0 ${installdir}/bin/swiftdata.exe @@ -239,7 +239,7 @@ This installs the binaries to run all swift applications. Run swiftlauncher - swiftlauncher ${project.version} ${architecture}bit + swiftlauncher ${project.version} (${architecture}bit) 0 0 ${installdir}/bin/swiftlauncher.exe @@ -249,7 +249,7 @@ This installs the binaries to run all swift applications. Uninstall swift - Uninstall swift ${project.version} ${architecture}bit + Uninstall swift ${project.version} (${architecture}bit) 0 0 ${installdir}/uninstall.exe diff --git a/mkspecs/features/version.pri b/mkspecs/features/version.pri index fbb222323..871f94e27 100644 --- a/mkspecs/features/version.pri +++ b/mkspecs/features/version.pri @@ -8,18 +8,17 @@ defineReplace(gitRevCount) { for(sha, CONFIG_LOG) { jsonBlob = $$system(git show $${sha}:../../default.json) parseJson(jsonBlob, jsonData) - v = $${jsonData.version.major}.$${jsonData.version.minor}.$${jsonData.version.micro} + v = $${jsonData.version.major}.$${jsonData.version.minor} equals(v, $$swiftConfig(version.full)): BASE_COMMIT = $$sha } isEmpty(BASE_COMMIT): warning(Failed to find commit that changed version number to '$$swiftConfig(version.full)') return($$system(git rev-list --count HEAD $$system_quote(^$$BASE_COMMIT))) } -setSwiftConfig(version.full, $$swiftConfig(version.major).$$swiftConfig(version.minor).$$swiftConfig(version.micro)) +setSwiftConfig(version.full, $$swiftConfig(version.major).$$swiftConfig(version.minor)) VER_MAJ = $$swiftConfig(version.major) VER_MIN = $$swiftConfig(version.minor) -VER_PAT = $$swiftConfig(version.micro) VERSION = $$swiftConfig(version.full) !qtc_run: !isEmpty(GIT_BIN) { diff --git a/scripts/build.py b/scripts/build.py index abb4bc757..e6304f07f 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -228,8 +228,7 @@ class Builder: f.close() version_major = config_json['version']['major'] version_minor = config_json['version']['minor'] - version_micro = config_json['version']['micro'] - return '.'.join([str(version_major), str(version_minor), str(version_micro)]) + return '.'.join([str(version_major), str(version_minor)]) def __get_rev_count(self): this_version = self.__get_swift_version_base() @@ -239,8 +238,7 @@ class Builder: config_json = json.loads(json_data.decode("utf-8")) version_major = config_json['version']['major'] version_minor = config_json['version']['minor'] - version_micro = config_json['version']['micro'] - if this_version == '.'.join([str(version_major), str(version_minor), str(version_micro)]): + if this_version == '.'.join([str(version_major), str(version_minor)]): base_commit = sha else: break diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp index c523e5a53..7f0fdd63b 100644 --- a/src/blackconfig/buildconfig.cpp +++ b/src/blackconfig/buildconfig.cpp @@ -170,7 +170,7 @@ namespace BlackConfig const QVersionNumber &CBuildConfig::getVersion() { - static const QVersionNumber v { versionMajor(), versionMinor(), versionMicro(), versionRevision() }; + static const QVersionNumber v { versionMajor(), versionMinor(), versionRevision() }; return v; } @@ -182,7 +182,7 @@ namespace BlackConfig const QString &CBuildConfig::getShortVersionString() { - static const QVersionNumber v { versionMajor(), versionMinor(), versionMicro() }; + static const QVersionNumber v { versionMajor(), versionMinor() }; static const QString s(v.toString()); return s; } diff --git a/src/blackconfig/buildconfig.h b/src/blackconfig/buildconfig.h index 15be1342b..28587b51e 100644 --- a/src/blackconfig/buildconfig.h +++ b/src/blackconfig/buildconfig.h @@ -160,9 +160,6 @@ namespace BlackConfig static constexpr int versionMinor(); // defined in buildconfig_gen.inc.in //! Patch version - static constexpr int versionMicro(); // defined in buildconfig_gen.inc.in - - //! Revision version static int versionRevision(); // defined in buildconfig_gen.cpp.in }; } // ns diff --git a/src/blackconfig/buildconfig_gen.inc.in b/src/blackconfig/buildconfig_gen.inc.in index c8c573b8e..e1a109a41 100644 --- a/src/blackconfig/buildconfig_gen.inc.in +++ b/src/blackconfig/buildconfig_gen.inc.in @@ -112,4 +112,3 @@ constexpr bool BlackConfig::CBuildConfig::isVatsimVersion() constexpr int BlackConfig::CBuildConfig::versionMajor() { return $$swiftConfig(version.major); } constexpr int BlackConfig::CBuildConfig::versionMinor() { return $$swiftConfig(version.minor); } -constexpr int BlackConfig::CBuildConfig::versionMicro() { return $$swiftConfig(version.micro); }