From c7fa949e9903a2b97063cfec9d5db454aa2f2a4a Mon Sep 17 00:00:00 2001 From: Simon Judd Date: Thu, 1 Jun 2023 00:03:17 +0930 Subject: [PATCH] Bump version to 3.2.3 --- Info.plist | 4 ++-- dist/makebuild.ps1 | 4 +--- msvc/SLADE.rc | 8 ++++---- net.mancubus.SLADE.metainfo.xml | 1 + src/Application/App.cpp | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Info.plist b/Info.plist index c63e0edb3..f408a20c5 100644 --- a/Info.plist +++ b/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.2.2 + 3.2.3 CFBundleSignature SLA3 NSPrincipalClass @@ -29,7 +29,7 @@ NSRequiresAquaSystemAppearance CFBundleVersion - 3.2.2 + 3.2.3 CFBundleDocumentTypes diff --git a/dist/makebuild.ps1 b/dist/makebuild.ps1 index 1be9d44fc..28beb6199 100644 --- a/dist/makebuild.ps1 +++ b/dist/makebuild.ps1 @@ -1,4 +1,4 @@ -$version = "3.2.2" +$version = "3.2.3" $rev_short = Invoke-Expression "git.exe rev-parse --short HEAD" # Check for 7-zip install @@ -90,7 +90,6 @@ Copy-Item (resolve-path ".\slade.pk3") "$releasedir" -Force # Win32 Copy-Item (resolve-path ".\SLADE.exe") "$releasedir32" -Force Copy-Item (resolve-path ".\SLADE.pdb") "$releasedir32" -Force -Copy-Item (resolve-path ".\dll32\libfluidsynth.dll") "$releasedir32" -Force # x64 Copy-Item (resolve-path ".\SLADE-x64.exe") "$releasedir64\SLADE.exe" -Force Copy-Item (resolve-path ".\SLADE-x64.pdb") "$releasedir64\SLADE.pdb" -Force @@ -114,7 +113,6 @@ if ($buildbinaries.ToLower() -eq "y") Write-Host "`nBuiling win32 binaries 7z..." -foregroundcolor yellow & $7zpath a -t7z "$releasedir\slade_${version}${timestamp}.7z" ` - "$releasedir32\libfluidsynth.dll" ` "$releasedir32\SLADE.exe" ` "$releasedir32\SLADE.pdb" ` "$releasedir\slade.pk3" diff --git a/msvc/SLADE.rc b/msvc/SLADE.rc index ff8ca64ef..db1f095e6 100644 --- a/msvc/SLADE.rc +++ b/msvc/SLADE.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,2,2 - PRODUCTVERSION 3,2,2 + FILEVERSION 3,2,3 + PRODUCTVERSION 3,2,3 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -68,12 +68,12 @@ BEGIN BLOCK "0c0904b0" BEGIN VALUE "FileDescription", "SLADE" - VALUE "FileVersion", "3.2.2" + VALUE "FileVersion", "3.2.3" VALUE "InternalName", "SLADE.exe" VALUE "LegalCopyright", "Copyright (C) 2023" VALUE "OriginalFilename", "SLADE.exe" VALUE "ProductName", "SLADE" - VALUE "ProductVersion", "3.2.2" + VALUE "ProductVersion", "3.2.3" END END BLOCK "VarFileInfo" diff --git a/net.mancubus.SLADE.metainfo.xml b/net.mancubus.SLADE.metainfo.xml index 72ab95ec3..ad46d260f 100644 --- a/net.mancubus.SLADE.metainfo.xml +++ b/net.mancubus.SLADE.metainfo.xml @@ -58,6 +58,7 @@ + diff --git a/src/Application/App.cpp b/src/Application/App.cpp index 4d0495a2f..6bd8c4886 100644 --- a/src/Application/App.cpp +++ b/src/Application/App.cpp @@ -80,7 +80,7 @@ bool exiting = false; std::thread::id main_thread_id; // Version -Version version_num{ 3, 2, 2, 0 }; +Version version_num{ 3, 2, 3, 0 }; // Directory paths string dir_data;