Skip to content

Commit

Permalink
Fixed Git build version in the about dialog
Browse files Browse the repository at this point in the history
previously the library build version was displayed instead, which is no more the same after the library and plugins repository split.
  • Loading branch information
redtide committed Jan 4, 2024
1 parent 6fe2f2f commit 536d3ff
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 7 deletions.
13 changes: 13 additions & 0 deletions plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,16 @@ endif()
if(PLUGIN_PUREDATA)
add_subdirectory(puredata)
endif()

include(GitBuildID)
make_git_build_id(
SOURCE_DIR "${PROJECT_SOURCE_DIR}"
OUTPUT_FILE "${PROJECT_BINARY_DIR}/git-build-id/PluginGitBuildId.c"
PREFIX "Plugin"
)
add_library(plugins_git_build_id STATIC EXCLUDE_FROM_ALL
"${PROJECT_SOURCE_DIR}/plugins/git-build-id/PluginGitBuildId.h"
"${PROJECT_BINARY_DIR}/git-build-id/PluginGitBuildId.c"
)
target_include_directories(plugins_git_build_id PUBLIC "plugins/git-build-id")
target_link_libraries(sfizz_editor PRIVATE plugins_git_build_id)
8 changes: 4 additions & 4 deletions plugins/editor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ add_library(sfizz_editor STATIC EXCLUDE_FROM_ALL
)
add_library(sfizz::editor ALIAS sfizz_editor)

target_include_directories(sfizz_editor PUBLIC "src")
target_include_directories(sfizz_editor PUBLIC
src
${PROJECT_SOURCE_DIR}/plugins/git-build-id
)
target_link_libraries(sfizz_editor PUBLIC sfizz::messaging sfizz::plugins-common)
target_link_libraries(sfizz_editor PRIVATE sfizz::vstgui)
target_compile_definitions(sfizz_editor PRIVATE
Expand Down Expand Up @@ -161,6 +164,3 @@ if(NOT CMAKE_CROSSCOMPILING)
DEPENDS layout-maker "${CMAKE_CURRENT_SOURCE_DIR}/layout/${_layout}.fl")
endforeach()
endif()

# Git build identifier
target_link_libraries(sfizz_editor PRIVATE sfizz-git-build-id)
6 changes: 3 additions & 3 deletions plugins/editor/src/editor/DlgAbout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "DlgAbout.h"
#include "GUIComponents.h"
#include "GUIDefs.h"
#include "GitBuildId.h"
#include "PluginGitBuildId.h"
#include "NativeHelpers.h"

#include "utility/vstgui_before.h"
Expand Down Expand Up @@ -53,8 +53,8 @@ SAboutDialog::SAboutDialog(const CRect& bounds)

const char* version = SFIZZ_VERSION;
std::string versionBuf;
if (GitBuildId[0]) {
versionBuf = absl::StrCat(SFIZZ_VERSION ".", GitBuildId);
if (PluginGitBuildId[0]) {
versionBuf = absl::StrCat(SFIZZ_VERSION ".", PluginGitBuildId);
version = versionBuf.c_str();
}
#if 0
Expand Down
21 changes: 21 additions & 0 deletions plugins/git-build-id/PluginGitBuildId.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// SPDX-License-Identifier: BSD-2-Clause

// This code is part of the sfizz library and is licensed under a BSD 2-clause
// license. You should have receive a LICENSE.md file along with the code.
// If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz

#pragma once

#if defined(__cplusplus)
extern "C" {
#endif

/**
* @brief Short identifier of the current head commit.
* This generated identifier is empty if the build is not from a Git repository.
*/
extern const char* PluginGitBuildId;

#if defined(__cplusplus)
} // extern "C"
#endif

0 comments on commit 536d3ff

Please sign in to comment.