From 68e0a69dc449f00c3a288b53d4bbfa4677d2759b Mon Sep 17 00:00:00 2001 From: Simon Judd Date: Tue, 12 Apr 2022 19:05:40 +0930 Subject: [PATCH] Bump version to 3.2.0 --- Info.plist | 4 ++-- dist/makebuild.ps1 | 2 +- msvc/SLADE.rc | 4 ++-- msvc/SLADE.vcxproj | 10 +++++----- net.mancubus.SLADE.metainfo.xml | 1 + src/Application/App.cpp | 2 +- win_installer/SLADE.iss | 7 +++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Info.plist b/Info.plist index 488bfb38d..dfdca7b6e 100644 --- a/Info.plist +++ b/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.1.13 + 3.2.0 CFBundleSignature SLA3 NSPrincipalClass @@ -29,7 +29,7 @@ NSRequiresAquaSystemAppearance CFBundleVersion - 3.1.13 + 3.2.0 CFBundleDocumentTypes diff --git a/dist/makebuild.ps1 b/dist/makebuild.ps1 index 22604b8b0..f404639d6 100644 --- a/dist/makebuild.ps1 +++ b/dist/makebuild.ps1 @@ -1,4 +1,4 @@ -$version = "3.2.0_b4" +$version = "3.2.0" $rev_short = Invoke-Expression "git.exe rev-parse --short HEAD" # Check for 7-zip install diff --git a/msvc/SLADE.rc b/msvc/SLADE.rc index 29b25e663..5fd701ccf 100644 --- a/msvc/SLADE.rc +++ b/msvc/SLADE.rc @@ -68,12 +68,12 @@ BEGIN BLOCK "0c0904b0" BEGIN VALUE "FileDescription", "SLADE" - VALUE "FileVersion", "3.2.0 Beta 4" + VALUE "FileVersion", "3.2.0" VALUE "InternalName", "SLADE.exe" VALUE "LegalCopyright", "Copyright (C) 2022" VALUE "OriginalFilename", "SLADE.exe" VALUE "ProductName", "SLADE" - VALUE "ProductVersion", "3.2.0 Beta 4" + VALUE "ProductVersion", "3.2.0" END END BLOCK "VarFileInfo" diff --git a/msvc/SLADE.vcxproj b/msvc/SLADE.vcxproj index 8d4d2829d..b0b241ed9 100644 --- a/msvc/SLADE.vcxproj +++ b/msvc/SLADE.vcxproj @@ -79,12 +79,12 @@ false true true - $(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(IncludePath) - $(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(IncludePath) + $(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(ProjectDir)..\thirdparty\glad\include;$(IncludePath) + $(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(ProjectDir)..\thirdparty\glad\include;$(IncludePath) $(ProjectDir)\fluidsynth\lib;$(SolutionDir)..\build\lib\$(Configuration)\;$(LibraryPath) $(ProjectDir)\fluidsynth\lib;$(SolutionDir)..\build\lib\$(Platform)\$(Configuration)\;$(LibraryPath) - $(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(IncludePath) - $(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(IncludePath) + $(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(ProjectDir)..\thirdparty\glad\include;$(IncludePath) + $(ProjectDir)..\src;$(ProjectDir)\fluidsynth\include;$(ProjectDir)..;$(ProjectDir)..\thirdparty\dumb;$(ProjectDir)..\src\Application;$(ProjectDir)..\thirdparty\glad\include;$(IncludePath) $(ProjectDir)\fluidsynth\lib;$(SolutionDir)..\build\lib\$(Configuration)\;$(LibraryPath) $(ProjectDir)\fluidsynth\lib;$(SolutionDir)..\build\lib\$(Platform)\$(Configuration)\;$(LibraryPath) SLADE-dbg @@ -973,4 +973,4 @@ - + \ No newline at end of file diff --git a/net.mancubus.SLADE.metainfo.xml b/net.mancubus.SLADE.metainfo.xml index 2bc6c6b98..f917ed9fd 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 fdc1a3d54..936a82127 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, 0, 4 }; +Version version_num{ 3, 2, 0, 0 }; // Directory paths string dir_data; diff --git a/win_installer/SLADE.iss b/win_installer/SLADE.iss index 52453c88d..0cecd5507 100644 --- a/win_installer/SLADE.iss +++ b/win_installer/SLADE.iss @@ -3,7 +3,7 @@ #define MyAppName "SLADE" #define MyAppVersion "3.2.0" -#define MyAppURL "http://slade.mancubus.net" +#define MyAppURL "https://slade.mancubus.net" #define MyAppExeName "SLADE.exe" ; TODO: @@ -25,13 +25,12 @@ DefaultGroupName={#MyAppName} AllowNoIcons=yes ;InfoBeforeFile=..\dist\SLADE.html OutputBaseFilename=Setup_{#MyAppName}_{#MyAppVersion} -SetupIconFile=..\build\msvc\slade.ico +SetupIconFile=..\msvc\slade.ico Compression=lzma SolidCompression=yes [Languages] Name: "en"; MessagesFile: "compiler:Default.isl" -;Name: "de"; MessagesFile: "compiler:Languages\German.isl" [Tasks] Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked @@ -69,7 +68,7 @@ begin initwinversion(); // Check for VS2015 runtimes installed - vcredist2015(); + //vcredist2015(); Result := true; end;