v2.5.1

na-trium-144 · Nov 30, 2024 · 7797389 · 7797389
1 parent 6c1bf18
commit 7797389
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [2.5.1] - 2024-11-30
+### Changed
+* subprojectのspdlogをstaticライブラリにしビルドを高速化 (#427)
+### Fixed
+* syncInit受信時にそのメンバーの過去のデータを消す (#433)
+* address already in use などでサーバーが起動できなかったときの終了処理を修正 (#434)
+* webcface-server.service から呼び出すserverコマンドを絶対パスに変更 (#435)
+
 ## [2.5.0] - 2024-11-18
 ### Changed
 * ABIバージョン: 21

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(webcface VERSION 2.5.0)
+project(webcface VERSION 2.5.1)
 
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
     set(IS_MAIN on)

diff --git 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.5.0"
+PROJECT_NUMBER         = "2.5.1"
 
 # 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
@@ -197,9 +197,9 @@ Ubuntu20.04でビルドしているため、それより古いUbuntuでは動作
 <details open><summary>x86_64</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.0-2/webcface_2.5.0-2_linux_amd64.zip
-sudo unzip webcface_2.5.0-2_linux_amd64.zip -d /opt/webcface
-rm webcface_2.5.0-2_linux_amd64.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.1/webcface_2.5.1_linux_amd64.zip
+sudo unzip webcface_2.5.1_linux_amd64.zip -d /opt/webcface
+rm webcface_2.5.1_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/
@@ -209,9 +209,9 @@ sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
 <details><summary>arm64</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.0-2/webcface_2.5.0-2_linux_arm64.zip
-sudo unzip webcface_2.5.0-2_linux_arm64.zip -d /opt/webcface
-rm webcface_2.5.0-2_linux_arm64.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.1/webcface_2.5.1_linux_arm64.zip
+sudo unzip webcface_2.5.1_linux_arm64.zip -d /opt/webcface
+rm webcface_2.5.1_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/
@@ -221,9 +221,9 @@ sudo ln -sf /opt/webcface/lib/systemd/system/*.service /etc/systemd/system/
 <details><summary>armhf</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.0-2/webcface_2.5.0-2_linux_armhf.zip
-sudo unzip webcface_2.5.0-2_linux_armhf.zip -d /opt/webcface
-rm webcface_2.5.0-2_linux_armhf.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.1/webcface_2.5.1_linux_armhf.zip
+sudo unzip webcface_2.5.1_linux_armhf.zip -d /opt/webcface
+rm webcface_2.5.1_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/
@@ -244,10 +244,10 @@ Ubuntu20.04でビルドしているため、それより古いUbuntuでは動作
 <details open><summary>x86_64</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.5.0/webcface_2.5.0_amd64.deb
-curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.2/webcface-tools_2.1.2_amd64.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.2/webcface-webui_1.10.2_all.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.2/webcface-desktop_1.10.2_linux_amd64.deb
+curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.5.1/webcface_2.5.1_amd64.deb
+curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.3/webcface-tools_2.1.3_amd64.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.3/webcface-webui_1.10.3_all.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.3/webcface-desktop_1.10.3_linux_amd64.deb
 sudo apt install ./webcface*.deb
 rm ./webcface*.deb
 ```
@@ -256,10 +256,10 @@ rm ./webcface*.deb
 <details><summary>arm64</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.5.0/webcface_2.5.0_arm64.deb
-curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.2/webcface-tools_2.1.2_arm64.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.2/webcface-webui_1.10.2_all.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.2/webcface-desktop_1.10.2_linux_arm64.deb
+curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.5.1/webcface_2.5.1_arm64.deb
+curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.3/webcface-tools_2.1.3_arm64.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.3/webcface-webui_1.10.3_all.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.3/webcface-desktop_1.10.3_linux_arm64.deb
 sudo apt install ./webcface*.deb
 rm ./webcface*.deb
 ```
@@ -268,10 +268,10 @@ rm ./webcface*.deb
 <details><summary>armhf</summary>
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.5.0/webcface_2.5.0_armhf.deb
-curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.2/webcface-tools_2.1.2_armhf.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.2/webcface-webui_1.10.2_all.deb
-curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.2/webcface-desktop_1.10.2_linux_armv7l.deb
+curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.5.1/webcface_2.5.1_armhf.deb
+curl -fLO https://github.com/na-trium-144/webcface-tools/releases/download/v2.1.3/webcface-tools_2.1.3_armhf.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.3/webcface-webui_1.10.3_all.deb
+curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.10.3/webcface-desktop_1.10.3_linux_armv7l.deb
 sudo apt install ./webcface*.deb
 rm ./webcface*.deb
 ```
@@ -290,16 +290,16 @@ Universalバイナリになっており、IntelMacもAppleシリコンも共通
 macOS 12 (Monterey) でビルドしているので、それより古いMacでは動かないかもしれません。
 
 ```sh
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.0-2/webcface_2.5.0-2_macos_universal.zip
-curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.0-2/webcface-desktop_2.5.0-2_macos_app.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.1/webcface_2.5.1_macos_universal.zip
+curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.5.1/webcface-desktop_2.5.1_macos_app.zip
 ```
 
 sudo権限が使用できれば以下のように webcface_universal を /opt/webcface に、 webcface-desktop_app を /Applications に展開するのがおすすめです。
 ```sh
-sudo unzip webcface_2.5.0-2_macos_universal.zip -d /opt/webcface
-sudo unzip webcface-desktop_2.5.0-2_macos_app.zip -d /Applications
-rm webcface_2.5.0-2_macos_universal.zip
-rm webcface-desktop_2.5.0-2_macos_app.zip
+sudo unzip webcface_2.5.1_macos_universal.zip -d /opt/webcface
+sudo unzip webcface-desktop_2.5.1_macos_app.zip -d /Applications
+rm webcface_2.5.1_macos_universal.zip
+rm webcface-desktop_2.5.1_macos_app.zip
 ```
 
 また、展開したディレクトリ内の bin/ をPATHに、 lib/pkgconfig/ をPKG_CONFIG_PATHに追加してください。

diff --git 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.5.0
+    revision = v2.5.1
     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.5.0
+      GIT_TAG        v2.5.1
     )
     FetchContent_MakeAvailable(webcface)
     ```
@@ -113,7 +113,7 @@ C++ではなくCからアクセスできるAPIとして、wcf〜 で始まる名
 ~~&lt;webcface/c_wcf.h&gt; をincludeすることで使えます。~~  
 <span class="since-c">1.7</span> &lt;webcface/wcf.h&gt; をincludeすることで使えます。(c_wcf.hも一応使えます)  
 ほとんどの関数は戻り値が <del>int 型</del> <span class="since-c">2.0</span> enum wcfStatus 型で、
-成功した場合 0 (= <del>WCF_OK</del> <span class="since-c">2.0</span> WCF_OK)、例外が発生した場合正の値を返します。
+成功した場合 0 (= WCF_OK)、例外が発生した場合正の値を返します。
 
 ## Python
 
@@ -148,7 +148,7 @@ CommonJSで`requires("webcface")`のように使うこともできると思い
 <span class="since-js">1.7</span>
 ブラウザー上で使う場合はCDNも利用できます。
 ```html
-<script src="https://cdn.jsdelivr.net/npm/webcface@1.7.0/dist/webcface.bundle.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/webcface@1.9.1/dist/webcface.bundle.js"></script>
 ```
 で読み込むとグローバルに `webcface.Client` などが使用できるようになります。
 

diff --git a/docs/84_versioning.md b/docs/84_versioning.md
@@ -55,7 +55,7 @@ ABIのマイナーバージョンはMacで `otool` などを使った場合に
 | 2.1.0〜2.3.0 | 20.2 | |
 | 2.4.0〜2.4.1 | 20.3 | 2.1.0〜2.1.1 |
 | 2.4.2 | 20.4 | |
-| 2.5.0〜 | 21.0 | 2.1.2〜 |
+| 2.5 | 21.0 | 2.1.2〜 |
 
 <div class="section_buttons">
 

diff --git a/meson.build b/meson.build
@@ -1,5 +1,5 @@
 project('webcface', 'c', 'cpp',
-  version: '2.5.0',
+  version: '2.5.1',
   license: 'MIT',
   meson_version: '>=1.3.0',
   default_options: [
@@ -18,7 +18,7 @@ py = find_program('python3')
 
 webcface_abi_major = '21' # ABIの破壊的変更で1増やす
 webcface_abi_minor = '0' # ABIの追加で1増やす
-webcface_webui_version = '1.10.2'
+webcface_webui_version = '1.10.3'
 
 webcface_description = 'Web-based IPC & Dashboard-like UI'
 webcface_contact = '[email protected]'