From 7fa2c4b5ee4c6fc397df901328e38f44d1184feb Mon Sep 17 00:00:00 2001 From: na-trium-144 <100704180+na-trium-144@users.noreply.github.com> Date: Wed, 2 Oct 2024 19:00:31 +0900 Subject: [PATCH] v2.4.0 --- CHANGELOG.md | 10 ++++++++++ CMakeLists.txt | 2 +- Doxyfile | 2 +- README.md | 36 ++++++++++++++++++------------------ docs/31_setup.md | 4 ++-- meson.build | 4 ++-- 6 files changed, 34 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35bd3c0189..6621899f22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [2.4.0] - 2024-10-02 +### Changed +* Logメッセージを仕様変更、Logに名前をつけて複数送信できるようになった (#410) + * ver2.3以前のサーバーと2.4以降のクライアントの間ではLogを送受信できなくなります +* Funcに登録した引数にCallHandleをとる関数がthrowしたときそれをcatchしてrejectする +### Added +* Func::set() で引数にCallHandleをとる関数を渡してセットし、その後からsetArgs()などオプションを使う使い方 +* Field::logEntries() +* Member::onLogEntry() + ## [2.3.0] - 2024-09-17 ### Fixed * ver2.2.1以降でserverがセグフォすることがあったバグを修正 (#407) diff --git a/CMakeLists.txt b/CMakeLists.txt index 310ed66dda..917f576419 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(webcface VERSION 2.3.0) +project(webcface VERSION 2.4.0) if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) set(IS_MAIN on) diff --git a/Doxyfile b/Doxyfile index c839f66165..d2f9dedbc5 100644 --- a/Doxyfile +++ b/Doxyfile @@ -48,7 +48,7 @@ PROJECT_NAME = "WebCFace" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "2.3.0" +PROJECT_NUMBER = "2.4.0" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/README.md b/README.md index c2bc2d91da..1d0df80cc5 100644 --- a/README.md +++ b/README.md @@ -195,9 +195,9 @@ Ubuntu20.04でビルドしているため、それより古いUbuntuでは動作
x86_64 ```sh -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.3.0/webcface_2.3.0_linux_amd64.zip -sudo unzip webcface_2.3.0_linux_amd64.zip -d /opt/webcface -rm webcface_2.3.0_linux_amd64.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0/webcface_2.4.0_linux_amd64.zip +sudo unzip webcface_2.4.0_linux_amd64.zip -d /opt/webcface +rm webcface_2.4.0_linux_amd64.zip echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.bashrc echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/ @@ -207,9 +207,9 @@ sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
arm64 ```sh -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.3.0/webcface_2.3.0_linux_arm64.zip -sudo unzip webcface_2.3.0_linux_arm64.zip -d /opt/webcface -rm webcface_2.3.0_linux_arm64.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0/webcface_2.4.0_linux_arm64.zip +sudo unzip webcface_2.4.0_linux_arm64.zip -d /opt/webcface +rm webcface_2.4.0_linux_arm64.zip echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.bashrc echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/aarch64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/ @@ -219,9 +219,9 @@ sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
armhf ```sh -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.3.0/webcface_2.3.0_linux_armhf.zip -sudo unzip webcface_2.3.0_linux_armhf.zip -d /opt/webcface -rm webcface_2.3.0_linux_armhf.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0/webcface_2.4.0_linux_armhf.zip +sudo unzip webcface_2.4.0_linux_armhf.zip -d /opt/webcface +rm webcface_2.4.0_linux_armhf.zip echo 'export PATH="/opt/webcface/bin:$PATH"' >> ~/.bashrc echo 'export PKG_CONFIG_PATH="/opt/webcface/lib/arm-linux-gnueabihf/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bashrc sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/ @@ -242,7 +242,7 @@ Ubuntu20.04でビルドしているため、それより古いUbuntuでは動作
x86_64 ```sh -curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.3.0/webcface_2.3.0_amd64.deb +curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.0/webcface_2.4.0_amd64.deb curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.0.1/webcface-tools_2.0.1_amd64.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.3/webcface-webui_1.8.3_all.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.3/webcface-desktop_1.8.3_linux_amd64.deb @@ -254,7 +254,7 @@ rm ./webcface*.deb
arm64 ```sh -curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.3.0/webcface_2.3.0_arm64.deb +curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.0/webcface_2.4.0_arm64.deb curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.0.1/webcface-tools_2.0.1_arm64.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.3/webcface-webui_1.8.3_all.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.3/webcface-desktop_1.8.3_linux_arm64.deb @@ -266,7 +266,7 @@ rm ./webcface*.deb
armhf ```sh -curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.3.0/webcface_2.3.0_armhf.deb +curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.4.0/webcface_2.4.0_armhf.deb curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.0.1/webcface-tools_2.0.1_armhf.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.3/webcface-webui_1.8.3_all.deb curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.3/webcface-desktop_1.8.3_linux_armv7l.deb @@ -288,16 +288,16 @@ Universalバイナリになっており、IntelMacもAppleシリコンも共通 macOS 12 (Monterey) でビルドしているので、それより古いMacでは動かないかもしれません。 ```sh -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.3.0/webcface_2.3.0_macos_universal.zip -curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.3.0/webcface-desktop_2.3.0_macos_app.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0/webcface_2.4.0_macos_universal.zip +curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.4.0/webcface-desktop_2.4.0_macos_app.zip ``` sudo権限が使用できれば以下のように webcface_universal を /opt/webcface に、 webcface-desktop_app を /Applications に展開するのがおすすめです。 ```sh -sudo unzip webcface_2.3.0_macos_universal.zip -d /opt/webcface -sudo unzip webcface-desktop_2.3.0_macos_app.zip -d /Applications -rm webcface_2.3.0_macos_universal.zip -rm webcface-desktop_2.3.0_macos_app.zip +sudo unzip webcface_2.4.0_macos_universal.zip -d /opt/webcface +sudo unzip webcface-desktop_2.4.0_macos_app.zip -d /Applications +rm webcface_2.4.0_macos_universal.zip +rm webcface-desktop_2.4.0_macos_app.zip ``` また、展開したディレクトリ内の bin/ をPATHに、 lib/pkgconfig/ をPKG_CONFIG_PATHに追加してください。 diff --git a/docs/31_setup.md b/docs/31_setup.md index d2d0502807..bfa7918908 100644 --- a/docs/31_setup.md +++ b/docs/31_setup.md @@ -32,7 +32,7 @@ MesonまたはCMakeを使用する場合は、subproject/subdirectoryとしてWe ``` [wrap-git] url = https://github.com/na-trium-144/webcface.git - revision = v2.3.0 + revision = v2.4.0 depth = 1 [provide] dependency_names = webcface @@ -66,7 +66,7 @@ MesonまたはCMakeを使用する場合は、subproject/subdirectoryとしてWe ```cmake FetchContent_Declare(webcface GIT_REPOSITORY https://github.com/na-trium-144/webcface.git - GIT_TAG v2.3.0 + GIT_TAG v2.4.0 ) FetchContent_MakeAvailable(webcface) ``` diff --git a/meson.build b/meson.build index 4146510f34..fef2f42eae 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('webcface', 'c', 'cpp', - version: '2.3.0', + version: '2.4.0', license: 'MIT', meson_version: '>=1.3.0', default_options: [ @@ -17,7 +17,7 @@ cxx = meson.get_compiler('cpp') py = find_program('python3') webcface_abi_major = '20' # ABIの破壊的変更で1増やす -webcface_abi_minor = '2' # ABIの追加で1増やす +webcface_abi_minor = '3' # ABIの追加で1増やす webcface_webui_version = '1.8.3' webcface_description = 'Web-based IPC & Dashboard-like UI'