CI: fix arm64_v8a to arm64-v8a in android.yml

Add version to log

.github/workflows/android.yml

@@ -17,7 +17,7 @@ jobs:
         include:
           - qt_arch: android_arm64_v8a
             VCPKG_TARGET_TRIPLET: arm64-android
-            ANDROID_ABI: arm64_v8a
+            ANDROID_ABI: arm64-v8a
 
           - qt_arch: android_x86_64 
             VCPKG_TARGET_TRIPLET: x64-android
@@ -30,7 +30,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install
-      SerialPortAssistant_VERSION: v0.5.20
+      SerialPortAssistant_VERSION: v0.5.21
       VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_DEFAULT_HOST_TRIPLET: x64-linux

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: build
 env:
   artifact_path: artifact_path
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  SerialPortAssistant_VERSION: v0.5.20
+  SerialPortAssistant_VERSION: v0.5.21
 
 on:
   push:

.github/workflows/mingw.yml

@@ -26,7 +26,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}\.cache\source
       TOOSL_DIR:   ${{github.workspace}}\.cache\tools
       INSTALL_DIR: ${{github.workspace}}\.cache\install_mingw
-      SerialPortAssistant_VERSION: v0.5.20
+      SerialPortAssistant_VERSION: v0.5.21
       artifact_name: build_mingw
 
     # Map the job outputs to step outputs

.github/workflows/msvc.yml

@@ -42,7 +42,7 @@ jobs:
       CMAKE_GENERATOR: "Visual Studio 17 2022"
       VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
       CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}}
-      SerialPortAssistant_VERSION: v0.5.20
+      SerialPortAssistant_VERSION: v0.5.21
       VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       qt_modules: qtwebengine ${{matrix.qt_modules}}

.github/workflows/ubuntu.yml

@@ -22,7 +22,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_ubuntu_${{matrix.BUILD_TYPE}}
-      SerialPortAssistant_VERSION: 0.5.20
+      SerialPortAssistant_VERSION: 0.5.21
       artifact_name: build_ubuntu
 
     # Map the job outputs to step outputs

App/Main.cpp

@@ -28,6 +28,9 @@ Module Name:
     #include "QUIWidget/QUIWidget.h"
 #endif
 
+#include <QLoggingCategory>
+static Q_LOGGING_CATEGORY(log, "main")
+
 int main(int argc, char *argv[])
 {
 #if defined (_DEBUG)
@@ -43,6 +46,15 @@ int main(int argc, char *argv[])
 #ifdef RABBITCOMMON
     RabbitCommon::CTools::Instance()->Init();
 #endif
+    qInfo(log) << QObject::tr("SerialPortAssistant version: %1 ").arg(a.applicationVersion())
+#ifdef SerialPortAssistant_Revision
+                      + QObject::tr("(Revision:")
+                      + " [" + SerialPortAssistant_Revision
+                      + "](http://github.com/KangLin/RabbitCommon/tree/"
+                      + SerialPortAssistant_Revision + ")"
+#endif
+               + "); "
+               + QObject::tr("RabbitCommon:") + RabbitCommon::CTools::Version();
 
     CMainWindow *w = new CMainWindow();
     a.setApplicationDisplayName(w->windowTitle());

App/android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.KangLinStudio.SerialPortAssistant" android:installLocation="auto" android:versionCode="1" android:versionName="0.5.20">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.KangLinStudio.SerialPortAssistant" android:installLocation="auto" android:versionCode="0" android:versionName="0.5.21" >
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>

ChangeLog.md

@@ -6,6 +6,7 @@
     but the loading dynamic library path is not set correctly.
     Please help you set it.
   - Use RabbitCommon v2.1.0
+  - Add version output log
 
 + Version: v0.5.20
   - Modify deploy.sh

ChangeLog_zh_CN.md

@@ -4,6 +4,7 @@
   - 修复 android 资源错误
   - 当前在自动化编译中能成功编译 macos 。但是未能正确设置动态库的加载路径。请会的朋友帮助我设置。
   - 使用 RabbitCommon v2.1.0
+  - 增加版本输出到日志
 
 + 版本: v0.5.20
   - 修改 deploy.sh

Install/Install.nsi

@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "SerialPortAssistant"
-!define PRODUCT_VERSION "v0.5.20"
+!define PRODUCT_VERSION "v0.5.21"
 !define PRODUCT_PUBLISHER "KangLin studio"
 !define PRODUCT_WEB_SITE "https://github.com/KangLin/${PRODUCT_NAME}"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"

README.md

@@ -64,9 +64,9 @@ Author: Kang Lin ([email protected])
 - Install
   - ubuntu
 
-        sudo apt install ./serialportassistant_0.5.20_amd64.deb
+        sudo apt install ./serialportassistant_0.5.21_amd64.deb
         # If you're on an older Linux distribution, you will need to run this instead:         
-        # sudo dpkg -i serialportassistant_0.5.20_amd64.deb
+        # sudo dpkg -i serialportassistant_0.5.21_amd64.deb
         # sudo apt-get install -f # Install dependencies
 
 ## Donate

README_zh_CN.md

@@ -59,9 +59,9 @@
 - 安装说明：
   - ubuntu
 
-        sudo apt install ./serialportassistant_0.5.20_amd64.deb
+        sudo apt install ./serialportassistant_0.5.21_amd64.deb
         # 如果你是老的 Linux 发行系统。你需要用下列命令替换：
-        # sudo dpkg -i serialportassistant_0.5.20_amd64.deb
+        # sudo dpkg -i serialportassistant_0.5.21_amd64.deb
         # sudo apt-get install -f # Install dependencies
 
 ### 捐赠  

Update/update.json

@@ -1,7 +1,7 @@
 {
     "redirect": [
         {
-          "version":"v0.5.20"
+          "version":"v0.5.21"
         }
     ]
 }

appveyor.yml

@@ -1,12 +1,12 @@
-version: 'v0.5.20.{build}'
+version: 'v0.5.21.{build}'
 
 cache:
   - ..\other_source
 # Clean cached
 # https://www.appveyor.com/docs/build-cache/#cleaning-up-cache
 
 environment:
-  SerialPortAssistant_VERSION: "v0.5.20"
+  SerialPortAssistant_VERSION: "v0.5.21"
   STOREPASS:
     secure: l9BZEU39F1a4vSkhwl0CHR+yh6CD1c7byGzMv+1NUa4=
   QT_USER:

debian/changelog

@@ -1,9 +1,21 @@
-serialportassistant (0.5.20) stable; urgency=medium
+serialportassistant (0.5.21) stable; urgency=medium
 
+    * CI: fix arm64_v8a to arm64-v8a in android.yml
+    * CI: run program in macos.yml
+    * Modify debian/rules
+    * Use etc replace ${CMAKE_INSTALL_SYSCONFDIR}
+    * Modify translations
+    * Modify deploy.sh
+    * Modify Change log etc documents install position.
     * Modify deploy.sh to vcpkg.json
-    * CI: modify appveyor.yml to rename winxp to windows_xp
-    * CI: modify macos.yml
-    * CI: update qt version 6.6.1 to 6.6.2
+    * CI: copy vcpkg dll to install\bin in msvc.yml
+    * CI: use QT_CHAINLOAD_TOOLCHAIN_FILE in android.yml
+    * CI: modify ANDROID_ABI
+    * Android: modify resource
+    * CI: modify android.yml
+    * Modify README
+    * Android: modify string translation in resource
+    * FIX: deploy.sh modify version bug
 
- -- Kang Lin <[email protected]>  Thu, 22 Feb 2024 14:37:02 +0800
+ -- Kang Lin <[email protected]>  Fri, 15 Mar 2024 11:34:08 +0800
 

deploy.sh

@@ -56,20 +56,19 @@ sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: ${VERSION}
 sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: ${VERSION}/g" ${SOURCE_DIR}/.github/workflows/android.yml
 sed -i "s/v[0-9]\+\.[0-9]\+\.[0-9]\+/${VERSION}/g" ${SOURCE_DIR}/README*.md
 sed -i "s/          \"version\":[[:blank:]]*\"v\?[0-9]\+\.[0-9]\+\.[0-9]\+\"/          \"version\":\"${VERSION}\"/g" ${SOURCE_DIR}/Update/update.json
-if [ -f ${SOURCE_DIR}/vcpkg.json ]; then
-    sed -i "s/  \"version-string\":.*\"[0-9]\+\.[0-9]\+\.[0-9]\+\",/  \"version-string\": \"${DEBIAN_VERSION}\",/g" ${SOURCE_DIR}/vcpkg.json
-fi
-
 
 DEBIAN_VERSION=`echo ${VERSION}|cut -d "v" -f 2`
 sed -i "s/serialportassistant_[0-9]\+\.[0-9]\+\.[0-9]\+/serialportassistant_${DEBIAN_VERSION}/g" ${SOURCE_DIR}/README*.md
 sed -i "s/serialportassistant (.*)/serialportassistant (${DEBIAN_VERSION})/g" ${SOURCE_DIR}/debian/changelog
 sed -i "s/SerialPortAssistant_VERSION:.*/SerialPortAssistant_VERSION: ${DEBIAN_VERSION}/g" ${SOURCE_DIR}/.github/workflows/ubuntu.yml
+if [ -f ${SOURCE_DIR}/vcpkg.json ]; then
+    sed -i "s/  \"version-string\":.*\"[0-9]\+\.[0-9]\+\.[0-9]\+\",/  \"version-string\": \"${DEBIAN_VERSION}\",/g" ${SOURCE_DIR}/vcpkg.json
+fi
+
 MAJOR_VERSION=`echo ${DEBIAN_VERSION}|cut -d "." -f 1`
 sed -i "s/android:versionCode=.*android/android:versionCode=\"${MAJOR_VERSION}\" android/g"  ${SOURCE_DIR}/App/android/AndroidManifest.xml
 sed -i "s/android:versionName=.*>/android:versionName=\"${DEBIAN_VERSION}\" >/g"  ${SOURCE_DIR}/App/android/AndroidManifest.xml
 
-
 CHANGLOG_TMP=${SOURCE_DIR}/debian/changelog.tmp
 CHANGLOG_FILE=${SOURCE_DIR}/debian/changelog
 echo "serialportassistant (${DEBIAN_VERSION}) stable; urgency=medium" > ${CHANGLOG_FILE}

vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "serialportassistant",
-  "version-string": "1.0.9",
+  "version-string": "",
   "dependencies": [
     "openssl"
   ],