Skip to content

Commit

Permalink
v2.2.1, webui 1.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
na-trium-144 committed Sep 15, 2024
1 parent e6bdbce commit 60e9711
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 30 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## [2.2.1] - 2024-09-16
### Fixed
* webcface/webcface.h をincludeするとfunc_info.hのwarningが出ていたのを修正 (#404)
* サーバーに未接続のときのReq送信を修正 (#403)

## [2.2.0] - 2024-09-10
### Fixed
* Client::sync() を高速化 (#402)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.5)

project(webcface VERSION 2.2.0)
project(webcface VERSION 2.2.1)

if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
set(IS_MAIN on)
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.0"
PROJECT_NUMBER = "2.2.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
Expand Down
48 changes: 24 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ Ubuntu20.04でビルドしているため、それより古いUbuntuでは動作
<details open><summary>x86_64</summary>

```sh
curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.2.0/webcface_2.2.0_linux_amd64.zip
sudo unzip webcface_2.2.0_linux_amd64.zip -d /opt/webcface
rm webcface_2.2.0_linux_amd64.zip
curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.2.1/webcface_2.2.1_linux_amd64.zip
sudo unzip webcface_2.2.1_linux_amd64.zip -d /opt/webcface
rm webcface_2.2.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/
Expand All @@ -186,9 +186,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.2.0/webcface_2.2.0_linux_arm64.zip
sudo unzip webcface_2.2.0_linux_arm64.zip -d /opt/webcface
rm webcface_2.2.0_linux_arm64.zip
curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.2.1/webcface_2.2.1_linux_arm64.zip
sudo unzip webcface_2.2.1_linux_arm64.zip -d /opt/webcface
rm webcface_2.2.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/
Expand All @@ -198,9 +198,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.2.0/webcface_2.2.0_linux_armhf.zip
sudo unzip webcface_2.2.0_linux_armhf.zip -d /opt/webcface
rm webcface_2.2.0_linux_armhf.zip
curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.2.1/webcface_2.2.1_linux_armhf.zip
sudo unzip webcface_2.2.1_linux_armhf.zip -d /opt/webcface
rm webcface_2.2.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/
Expand All @@ -221,10 +221,10 @@ Ubuntu20.04でビルドしているため、それより古いUbuntuでは動作
<details open><summary>x86_64</summary>

```sh
curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.2.0/webcface_2.2.0_amd64.deb
curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.2.1/webcface_2.2.1_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.1/webcface-webui_1.8.1_all.deb
curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.1/webcface-desktop_1.8.1_linux_amd64.deb
curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.2/webcface-webui_1.8.2_all.deb
curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.2/webcface-desktop_1.8.2_linux_amd64.deb
sudo apt install ./webcface*.deb
rm ./webcface*.deb
```
Expand All @@ -233,10 +233,10 @@ rm ./webcface*.deb
<details><summary>arm64</summary>

```sh
curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.2.0/webcface_2.2.0_arm64.deb
curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.2.1/webcface_2.2.1_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.1/webcface-webui_1.8.1_all.deb
curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.1/webcface-desktop_1.8.1_linux_arm64.deb
curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.2/webcface-webui_1.8.2_all.deb
curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.2/webcface-desktop_1.8.2_linux_arm64.deb
sudo apt install ./webcface*.deb
rm ./webcface*.deb
```
Expand All @@ -245,10 +245,10 @@ rm ./webcface*.deb
<details><summary>armhf</summary>

```sh
curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.2.0/webcface_2.2.0_armhf.deb
curl -fLO https://github.com/na-trium-144/webcface/releases/download/v2.2.1/webcface_2.2.1_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.1/webcface-webui_1.8.1_all.deb
curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.1/webcface-desktop_1.8.1_linux_armv7l.deb
curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.2/webcface-webui_1.8.2_all.deb
curl -fLO https://github.com/na-trium-144/webcface-webui/releases/download/v1.8.2/webcface-desktop_1.8.2_linux_armv7l.deb
sudo apt install ./webcface*.deb
rm ./webcface*.deb
```
Expand All @@ -267,16 +267,16 @@ Universalバイナリになっており、IntelMacもAppleシリコンも共通
macOS 12 (Monterey) でビルドしているので、それより古いMacでは動かないかもしれません。

```sh
curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.2.0/webcface_2.2.0_macos_universal.zip
curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.2.0/webcface-desktop_2.2.0_macos_app.zip
curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.2.1/webcface_2.2.1_macos_universal.zip
curl -fLO https://github.com/na-trium-144/webcface-package/releases/download/v2.2.1/webcface-desktop_2.2.1_macos_app.zip
```

sudo権限が使用できれば以下のように webcface_universal を /opt/webcface に、 webcface-desktop_app を /Applications に展開するのがおすすめです。
```sh
sudo unzip webcface_2.2.0_macos_universal.zip -d /opt/webcface
sudo unzip webcface-desktop_2.2.0_macos_app.zip -d /Applications
rm webcface_2.2.0_macos_universal.zip
rm webcface-desktop_2.2.0_macos_app.zip
sudo unzip webcface_2.2.1_macos_universal.zip -d /opt/webcface
sudo unzip webcface-desktop_2.2.1_macos_app.zip -d /Applications
rm webcface_2.2.1_macos_universal.zip
rm webcface-desktop_2.2.1_macos_app.zip
```

また、展開したディレクトリ内の bin/ をPATHに、 lib/pkgconfig/ をPKG_CONFIG_PATHに追加してください。
Expand Down
4 changes: 2 additions & 2 deletions docs/31_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ MesonまたはCMakeを使用する場合は、subproject/subdirectoryとしてWe
```
[wrap-git]
url = https://github.com/na-trium-144/webcface.git
revision = v2.2.0
revision = v2.2.1
depth = 1
[provide]
dependency_names = webcface
Expand Down Expand Up @@ -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.2.0
GIT_TAG v2.2.1
)
FetchContent_MakeAvailable(webcface)
```
Expand Down
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project('webcface', 'c', 'cpp',
version: '2.2.0',
version: '2.2.1',
license: 'MIT',
meson_version: '>=1.3.0',
default_options: [
Expand All @@ -18,7 +18,7 @@ py = find_program('python3')

webcface_abi_major = '20' # ABIの破壊的変更で1増やす
webcface_abi_minor = '2' # ABIの追加で1増やす
webcface_webui_version = '1.8.1'
webcface_webui_version = '1.8.2'

webcface_description = 'Web-based IPC & Dashboard-like UI'
webcface_contact = '[email protected]'
Expand Down

0 comments on commit 60e9711

Please sign in to comment.