Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2025-02-03 #6036

Merged
merged 2 commits into from
Feb 3, 2025
Merged

Release 2025-02-03 #6036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
231362b
CMake: rename PROJECT_VERSION -> PIONEER_VERSION
sturnclaw Feb 3, 2025
8f0692f
Set release version to 20250203
sturnclaw Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(pioneer LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_CXX_STANDARD 17)

set(PROJECT_VERSION "20240710"
set(PIONEER_VERSION "20250203"
CACHE STRING "Version identifier for current compiled build")

set(PROJECT_VERSION_INFO ""
Expand Down
2 changes: 1 addition & 1 deletion buildopts.h.cmakein
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define BUILDOPTS_H

#define PIONEER_EXTRAVERSION "@PROJECT_VERSION_INFO@"
#define PIONEER_VERSION "@PROJECT_VERSION@"
#define PIONEER_VERSION "@PIONEER_VERSION@"
#define PIONEER_DATA_DIR "@PIONEER_DATA_RUNTIME_DIR@"
#define REMOTE_LUA_REPL_PORT @REMOTE_LUA_REPL_PORT@

Expand Down
4 changes: 2 additions & 2 deletions pioneer.iss.cmakein
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
[Setup]
AppId={{5ba280c9-1d73-4039-b2e1-7fc7800f784c}
AppName="{#AppName}"
AppVersion="@PROJECT_VERSION@"
AppVersion="@PIONEER_VERSION@"
AppPublisher="{#AppName} Developers"
AppPublisherURL="{#AppUrl}"
AppSupportURL="{#AppUrl}"
AppUpdatesURL="{#AppUrl}"
AppCopyright="Copyright 2008-@BUILD_YEAR@ {#AppName} developers"
CreateAppDir=yes
LicenseFile="@PROJECT_SOURCE_DIR@\licenses\GPL-3.txt"
OutputBaseFilename=pioneer-@PROJECT_VERSION@-win
OutputBaseFilename=pioneer-@PIONEER_VERSION@-win
OutputDir="@PROJECT_SOURCE_DIR@"
Compression=lzma
SolidCompression=yes
Expand Down
2 changes: 1 addition & 1 deletion pioneer.rc.cmakein
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ BEGIN
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.en.html"
VALUE "OriginalFilename", "pioneer.exe"
VALUE "ProductName", "Pioneer"
VALUE "ProductVersion", "@PROJECT_VERSION@"
VALUE "ProductVersion", "@PIONEER_VERSION@"
END
END

Expand Down