commit 2b753d0f9f6182a4d81fef10bad957cd3ffdd016
parent a95a07c2d254ad7249e1682f7c4424a948c35133
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Thu, 30 May 2024 13:16:42 +0200
move version number related code to base plugin lib
Diffstat:
14 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/source/jucePluginEditorLib/CMakeLists.txt b/source/jucePluginEditorLib/CMakeLists.txt
@@ -1,10 +1,7 @@
cmake_minimum_required(VERSION 3.15)
project(jucePluginEditorLib VERSION ${CMAKE_PROJECT_VERSION})
-configure_file(${CMAKE_CURRENT_LIST_DIR}/version.h.in ${CMAKE_CURRENT_LIST_DIR}/version.h)
-
set(SOURCES
- createVersionDateTime.cmake
focusedParameter.cpp focusedParameter.h
focusedParameterTooltip.cpp focusedParameterTooltip.h
lcd.cpp lcd.h
@@ -15,10 +12,7 @@ set(SOURCES
pluginEditorWindow.cpp pluginEditorWindow.h
pluginEditorState.cpp pluginEditorState.h
pluginProcessor.cpp pluginProcessor.h
- pluginVersion.cpp pluginVersion.h
types.h
- version.h.in version.h
- versionDateTime.h.in versionDateTime.h
)
set(SOURCES_PM
@@ -57,9 +51,3 @@ target_link_libraries(jucePluginEditorLib PUBLIC jucePluginLib juceUiLib)
target_include_directories(jucePluginEditorLib PUBLIC ../JUCE/modules)
target_compile_definitions(jucePluginEditorLib PRIVATE JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1)
set_property(TARGET jucePluginEditorLib PROPERTY FOLDER "Gearmulator")
-
-add_custom_command(
- OUTPUT ${CMAKE_CURRENT_LIST_DIR}/_doesnotexist_versionDateTime.h # fake, causes regeneration for every build, exactly what we want
- OUTPUT ${CMAKE_CURRENT_LIST_DIR}/versionDateTime.h # valid
- COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_LIST_DIR}/createVersionDateTime.cmake"
-)
diff --git a/source/jucePluginEditorLib/pluginVersion.cpp b/source/jucePluginEditorLib/pluginVersion.cpp
@@ -1,32 +0,0 @@
-#include "pluginVersion.h"
-
-#include "version.h"
-#include "versionDateTime.h"
-
-namespace jucePluginEditorLib
-{
- std::string Version::getVersionString()
- {
- return g_pluginVersionString;
- }
-
- uint32_t Version::getVersionNumber()
- {
- return g_pluginVersion;
- }
-
- std::string Version::getVersionDate()
- {
- return g_pluginVersionDate;
- }
-
- std::string Version::getVersionTime()
- {
- return g_pluginVersionTime;
- }
-
- std::string Version::getVersionDateTime()
- {
- return getVersionDate() + ' ' + getVersionTime();
- }
-}
diff --git a/source/jucePluginEditorLib/pluginVersion.h b/source/jucePluginEditorLib/pluginVersion.h
@@ -1,15 +0,0 @@
-#pragma once
-#include <string>
-
-namespace jucePluginEditorLib
-{
- class Version
- {
- public:
- static std::string getVersionString();
- static uint32_t getVersionNumber();
- static std::string getVersionDate();
- static std::string getVersionTime();
- static std::string getVersionDateTime();
- };
-}
diff --git a/source/jucePluginEditorLib/version.h.in b/source/jucePluginEditorLib/version.h.in
@@ -1,4 +0,0 @@
-#pragma once
-
-static constexpr const char* const g_pluginVersionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@";
-static constexpr uint32_t g_pluginVersion = @PROJECT_VERSION_MAJOR@@PROJECT_VERSION_MINOR@@PROJECT_VERSION_PATCH@;
diff --git a/source/jucePluginEditorLib/.gitignore b/source/jucePluginLib/.gitignore
diff --git a/source/jucePluginLib/CMakeLists.txt b/source/jucePluginLib/CMakeLists.txt
@@ -1,10 +1,13 @@
cmake_minimum_required(VERSION 3.15)
project(jucePluginLib VERSION ${CMAKE_PROJECT_VERSION})
+configure_file(${CMAKE_CURRENT_LIST_DIR}/version.h.in ${CMAKE_CURRENT_LIST_DIR}/version.h)
+
set(SOURCES
- event.cpp event.h
+ createVersionDateTime.cmake
controller.cpp controller.h
dummydevice.cpp dummydevice.h
+ event.cpp event.h
midipacket.cpp midipacket.h
parameter.cpp parameter.h
parameterbinding.cpp parameterbinding.h
@@ -13,9 +16,12 @@ set(SOURCES
parameterlink.cpp parameterlink.h
parameterregion.cpp parameterregion.h
parametervaluelist.cpp parametervaluelist.h
+ pluginVersion.cpp pluginVersion.h
processor.cpp processor.h
softknob.cpp softknob.h
types.h
+ version.h.in version.h
+ versionDateTime.h.in versionDateTime.h
)
set(SOURCES_PATCHDB
@@ -41,3 +47,9 @@ target_link_libraries(jucePluginLib PUBLIC juceUiLib synthLib)
target_include_directories(jucePluginLib PUBLIC ../JUCE/modules)
target_compile_definitions(jucePluginLib PRIVATE JUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1)
set_property(TARGET jucePluginLib PROPERTY FOLDER "Gearmulator")
+
+add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_LIST_DIR}/_doesnotexist_versionDateTime.h # fake, causes regeneration for every build, exactly what we want
+ OUTPUT ${CMAKE_CURRENT_LIST_DIR}/versionDateTime.h # valid
+ COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_LIST_DIR}/createVersionDateTime.cmake"
+)
diff --git a/source/jucePluginEditorLib/createVersionDateTime.cmake b/source/jucePluginLib/createVersionDateTime.cmake
diff --git a/source/jucePluginLib/pluginVersion.cpp b/source/jucePluginLib/pluginVersion.cpp
@@ -0,0 +1,32 @@
+#include "pluginVersion.h"
+
+#include "version.h"
+#include "versionDateTime.h"
+
+namespace pluginLib
+{
+ std::string Version::getVersionString()
+ {
+ return g_pluginVersionString;
+ }
+
+ uint32_t Version::getVersionNumber()
+ {
+ return g_pluginVersion;
+ }
+
+ std::string Version::getVersionDate()
+ {
+ return g_pluginVersionDate;
+ }
+
+ std::string Version::getVersionTime()
+ {
+ return g_pluginVersionTime;
+ }
+
+ std::string Version::getVersionDateTime()
+ {
+ return getVersionDate() + ' ' + getVersionTime();
+ }
+}
diff --git a/source/jucePluginLib/pluginVersion.h b/source/jucePluginLib/pluginVersion.h
@@ -0,0 +1,15 @@
+#pragma once
+#include <string>
+
+namespace pluginLib
+{
+ class Version
+ {
+ public:
+ static std::string getVersionString();
+ static uint32_t getVersionNumber();
+ static std::string getVersionDate();
+ static std::string getVersionTime();
+ static std::string getVersionDateTime();
+ };
+}
diff --git a/source/jucePluginLib/version.h.in b/source/jucePluginLib/version.h.in
@@ -0,0 +1,4 @@
+#pragma once
+
+static constexpr const char* const g_pluginVersionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@";
+static constexpr uint32_t g_pluginVersion = 10000 * @PROJECT_VERSION_MAJOR@ + 100 * @PROJECT_VERSION_MINOR@ + @PROJECT_VERSION_PATCH@;
diff --git a/source/jucePluginEditorLib/versionDateTime.h.in b/source/jucePluginLib/versionDateTime.h.in
diff --git a/source/mqJucePlugin/mqLcd.cpp b/source/mqJucePlugin/mqLcd.cpp
@@ -1,6 +1,6 @@
#include "mqLcd.h"
-#include "../jucePluginEditorLib/pluginVersion.h"
+#include "../jucePluginLib/pluginVersion.h"
#include "../wLib/lcdfonts.h"
@@ -26,8 +26,8 @@ void MqLcd::setCgRam(std::array<uint8_t, 64>& _data)
bool MqLcd::getOverrideText(std::vector<std::vector<uint8_t>>& _lines)
{
- const std::string lineA(std::string("Vavra v") + jucePluginEditorLib::Version::getVersionString());
- const std::string lineB = jucePluginEditorLib::Version::getVersionDateTime();
+ const std::string lineA(std::string("Vavra v") + pluginLib::Version::getVersionString());
+ const std::string lineB = pluginLib::Version::getVersionDateTime();
_lines =
{
diff --git a/source/virusJucePlugin/VirusEditor.cpp b/source/virusJucePlugin/VirusEditor.cpp
@@ -10,7 +10,7 @@
#include "../jucePluginLib/parameterbinding.h"
#include "../jucePluginEditorLib/patchmanager/savepatchdesc.h"
-#include "../jucePluginEditorLib/pluginVersion.h"
+#include "../jucePluginLib/pluginVersion.h"
#include "../synthLib/os.h"
@@ -109,13 +109,13 @@ namespace genericVirusUI
if(auto* versionInfo = findComponentT<juce::Label>("VersionInfo", false))
{
- const std::string message = "DSP 56300 Emulator Version " + jucePluginEditorLib::Version::getVersionString() + " - " + jucePluginEditorLib::Version::getVersionDateTime();
+ const std::string message = "DSP 56300 Emulator Version " + pluginLib::Version::getVersionString() + " - " + pluginLib::Version::getVersionDateTime();
versionInfo->setText(message, juce::dontSendNotification);
}
if(auto* versionNumber = findComponentT<juce::Label>("VersionNumber", false))
{
- versionNumber->setText(jucePluginEditorLib::Version::getVersionString(), juce::dontSendNotification);
+ versionNumber->setText(pluginLib::Version::getVersionString(), juce::dontSendNotification);
}
m_deviceModel = findComponentT<juce::Label>("DeviceModel", false);
diff --git a/source/xtJucePlugin/xtLcd.cpp b/source/xtJucePlugin/xtLcd.cpp
@@ -2,7 +2,7 @@
#include "xtController.h"
-#include "../jucePluginEditorLib/pluginVersion.h"
+#include "../jucePluginLib/pluginVersion.h"
#include "../wLib/lcdfonts.h"
@@ -59,8 +59,8 @@ void XtLcd::setText(const std::array<uint8_t, 80>& _text)
bool XtLcd::getOverrideText(std::vector<std::vector<uint8_t>>& _lines)
{
- std::string lineA(std::string("Xenia v") + jucePluginEditorLib::Version::getVersionString());
- std::string lineB = jucePluginEditorLib::Version::getVersionDateTime();
+ std::string lineA(std::string("Xenia v") + pluginLib::Version::getVersionString());
+ std::string lineB = pluginLib::Version::getVersionDateTime();
constexpr char lineAright[] = "From TUS";
constexpr char lineBright[] = "with <3";
