From ecf3eaf7ea808bf27906978314e6f444d09c7a93 Mon Sep 17 00:00:00 2001 From: Kang Lin Date: Mon, 7 Aug 2023 12:24:38 +0800 Subject: [PATCH] Release v0.5.15 --- .github/workflows/android.yml | 2 +- .github/workflows/mingw.yml | 2 +- .github/workflows/msvc.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- App/App.pro | 2 +- Install/Install.nsi | 2 +- README.md | 28 ++++++++++++++-------------- README_zh_CN.md | 28 ++++++++++++++-------------- Update/update.xml | 2 +- appveyor.yml | 2 +- ci/build.sh | 4 ++-- debian/changelog | 20 +++++++++++++++----- debian/control | 2 +- 13 files changed, 54 insertions(+), 44 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 3adf055..79eb7bd 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -38,7 +38,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}}_${{matrix.qt_arch}} - SerialPortAssistant_VERSION: v0.5.14 + SerialPortAssistant_VERSION: v0.5.15 VCPKGGITCOMMITID: 2f6176ce98fee807a207dc9e8fec213f111c291b ANDROID_PLATFORM: android-23 ANDROID_NATIVE_API_LEVEL: 23 diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 4e817a9..56bf6b2 100644 --- a/.github/workflows/mingw.yml +++ b/.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.14 + SerialPortAssistant_VERSION: v0.5.15 artifact_name: build_mingw # Map the job outputs to step outputs diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index a93f8a3..a2a2855 100644 --- a/.github/workflows/msvc.yml +++ b/.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.14 + SerialPortAssistant_VERSION: v0.5.15 VCPKGGITCOMMITID: 2f6176ce98fee807a207dc9e8fec213f111c291b qt_modules: qtwebengine ${{matrix.qt_modules}} artifact_name: build_msvc diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d1810e8..cfd17ae 100644 --- a/.github/workflows/ubuntu.yml +++ b/.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.14 + SerialPortAssistant_VERSION: 0.5.15 artifact_name: build_ubuntu # Map the job outputs to step outputs diff --git a/App/App.pro b/App/App.pro index 777adbd..1af438d 100644 --- a/App/App.pro +++ b/App/App.pro @@ -47,7 +47,7 @@ isEmpty(SerialPortAssistant_VERSION) { } } isEmpty(SerialPortAssistant_VERSION){ - SerialPortAssistant_VERSION="v0.5.14" + SerialPortAssistant_VERSION="v0.5.15" } message("SerialPortAssistant_VERSION:$$SerialPortAssistant_VERSION") message("SerialPortAssistant_Revision:$$SerialPortAssistant_Revision") diff --git a/Install/Install.nsi b/Install/Install.nsi index db3da9e..8115f77 100644 --- a/Install/Install.nsi +++ b/Install/Install.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "SerialPortAssistant" -!define PRODUCT_VERSION "v0.5.14" +!define PRODUCT_VERSION "v0.5.15" !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" diff --git a/README.md b/README.md index 748e2c1..42e20f8 100644 --- a/README.md +++ b/README.md @@ -56,32 +56,32 @@ Author: Kang Lin (kl222@126.com) - [![Download SerialPortAssistant](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/serialportassistant/files/latest/download) - windows: Windows XP or later - + [Download SerialPortAssistant_Setup_v0.5.14.exe from github](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/SerialPortAssistant_Setup_v0.5.14.exe) - + [Download SerialPortAssistant_Setup_v0.5.14.exe from sourceforge](https://sourceforge.net/projects/serialportassistant/files/v0.5.14/SerialPortAssistant_Setup_v0.5.14.exe/download) + + [Download SerialPortAssistant_v0.5.15_qt0.5.15_Setup.exe from github](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/SerialPortAssistant_v0.5.15_qt0.5.15_Setup.exe) + + [Download SerialPortAssistant_v0.5.15_qt0.5.15_Setup.exe from sourceforge](https://sourceforge.net/projects/serialportassistant/files/v0.5.15/SerialPortAssistant_v0.5.15_qt0.5.15_Setup.exe/download) - ubuntu - + serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb - - [Download from sourceforge](https://sourceforge.net/projects/serialportassistant/files/v0.5.14/serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb/download) - - [Download from github](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb) + + serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb + - [Download from sourceforge](https://sourceforge.net/projects/serialportassistant/files/v0.5.15/serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb/download) + - [Download from github](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb) - sudo apt install ./serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb + sudo apt install ./serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb # If you're on an older Linux distribution, you will need to run this instead: - # sudo dpkg -i serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb + # sudo dpkg -i serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb # sudo apt-get install -f # Install dependencies - + serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb: - - [Download from sourceforge](https://sourceforge.net/projects/serialportassistant/files/v0.5.14/serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb/download) - - [Download from github](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb) + + serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb: + - [Download from sourceforge](https://sourceforge.net/projects/serialportassistant/files/v0.5.15/serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb/download) + - [Download from github](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb) - sudo apt install ./serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb + sudo apt install ./serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb # If you're on an older Linux distribution, you will need to run this instead: - # sudo dpkg -i serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb + # sudo dpkg -i serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb # sudo apt-get install -f # Install dependencies - android + Download from github: - - [SerialPortAssistant_armeabi-v7a_v0.5.14.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/SerialPortAssistant_armeabi-v7a_v0.5.14.apk) - - [SerialPortAssistant_x86_v0.5.14.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/SerialPortAssistant_x86_v0.5.14.apk) + - [SerialPortAssistant_armeabi-v7a_v0.5.15.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/SerialPortAssistant_armeabi-v7a_v0.5.15.apk) + - [SerialPortAssistant_x86_v0.5.15.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/SerialPortAssistant_x86_v0.5.15.apk) ## Donate If you are satisfied, you can donate to me diff --git a/README_zh_CN.md b/README_zh_CN.md index b13475c..dfad37d 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -52,32 +52,32 @@ - [![Download SerialPortAssistant](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/serialportassistant/files/latest/download) - windows: 支持 Windows XP 及以后系统 - + [从 sourceforge 下载 SerialPortAssistant_Setup_v0.5.14-10.exe](https://sourceforge.net/projects/serialportassistant/files/v0.5.14/SerialPortAssistant_Setup_v0.5.14.exe/download) - + [从 github 下载 SerialPortAssistant_Setup_v0.5.14.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/SerialPortAssistant_Setup_v0.5.14.exe) + + [从 sourceforge 下载 SerialPortAssistant_Setup_v0.5.15-10.exe](https://sourceforge.net/projects/serialportassistant/files/v0.5.15/SerialPortAssistant_Setup_v0.5.15.exe/download) + + [从 github 下载 SerialPortAssistant_Setup_v0.5.15.exe](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/SerialPortAssistant_Setup_v0.5.15.exe) - ubuntu - + serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb - - [从 sourceforge 下载](https://sourceforge.net/projects/serialportassistant/files/v0.5.14/serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb/download) - - [从 github 下载](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb) + + serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb + - [从 sourceforge 下载](https://sourceforge.net/projects/serialportassistant/files/v0.5.15/serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb/download) + - [从 github 下载](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb) - sudo apt install ./serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb + sudo apt install ./serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb # 如果你是老的 Linux 发行系统。你需要用下列命令替换： - # sudo dpkg -i serialportassistant_0.5.14_Ubuntu-20.04_amd64.deb + # sudo dpkg -i serialportassistant_0.5.15_Ubuntu-20.04_amd64.deb # sudo apt-get install -f # Install dependencies - + serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb: - - [从 sourceforge 下载](https://sourceforge.net/projects/serialportassistant/files/v0.5.14/serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb/download) - - [从 github 下载](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb) + + serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb: + - [从 sourceforge 下载](https://sourceforge.net/projects/serialportassistant/files/v0.5.15/serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb/download) + - [从 github 下载](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb) - sudo apt install ./serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb + sudo apt install ./serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb # 如果你是老的 Linux 发行系统。你需要用下列命令替换： - # sudo dpkg -i serialportassistant_0.5.14_Ubuntu-18.04_amd64.deb + # sudo dpkg -i serialportassistant_0.5.15_Ubuntu-18.04_amd64.deb # sudo apt-get install -f # Install dependencies - android + 从 github 下载: - - [SerialPortAssistant_armeabi-v7a_v0.5.14.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/SerialPortAssistant_armeabi-v7a_v0.5.14.apk) - - [SerialPortAssistant_x86_v0.5.14.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.14/SerialPortAssistant_x86_v0.5.14.apk) + - [SerialPortAssistant_armeabi-v7a_v0.5.15.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/SerialPortAssistant_armeabi-v7a_v0.5.15.apk) + - [SerialPortAssistant_x86_v0.5.15.apk](https://github.com/KangLin/SerialPortAssistant/releases/download/v0.5.15/SerialPortAssistant_x86_v0.5.15.apk) ### 捐赠 如果你用得满意，可以对本人进行捐赠 diff --git a/Update/update.xml b/Update/update.xml index 4b13922..144050e 100644 --- a/Update/update.xml +++ b/Update/update.xml @@ -1,4 +1,4 @@ - v0.5.14 + v0.5.15 diff --git a/appveyor.yml b/appveyor.yml index d1edac7..925b2be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ #TODO: Change version -version: 'v0.5.14.{build}' +version: 'v0.5.15.{build}' environment: STOREPASS: diff --git a/ci/build.sh b/ci/build.sh index 32e2c88..7e444cd 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -107,10 +107,10 @@ case ${BUILD_TARGERT} in esac if [ -n "$appveyor_SerialPortAssistant_VERSION" -a -z "$VERSION" ]; then - export VERSION="v0.5.14" + export VERSION="v0.5.15" fi if [ -z "$VERSION" ]; then - export VERSION="v0.5.14" + export VERSION="v0.5.15" fi export UPLOADTOOL_BODY="Release SerialPortAssistant-${VERSION}.
The change see [ChangeLog.md](ChangeLog.md) or [ChangeLog_zh_CN.md](ChangeLog_zh_CN.md)" #export UPLOADTOOL_PR_BODY= diff --git a/debian/changelog b/debian/changelog index 6f30e72..d13f247 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,18 @@ -serialportassistant (0.5.14) stable; urgency=medium +serialportassistant (0.5.15) stable; urgency=medium - * CI: Use qDebug output log file - * FIX deploy.sh for mingw.yml - * Docs: modify README + * Add CMake + * Modify README + * CI: modify build.yml + * Modify change log + * Merge branch 'develop' + * Use QFileDialog::getOpenFileName + * Rename HAVE_GUI to HAVE_RABBITCOMMON_GUI + * Modify etc/SerialPortAssistant_logqt.ini + * Android: modify AndroidManifest.xml + * vcpkg update to VCPKGGITCOMMITID: 1286cac8751e13bb289061b7e3b89eb4c3f613a2 + * CI: add webengine + * Modify log menu + * Use RabbitCommon v2 - -- Kang Lin Thu, 02 Mar 2023 21:31:34 +0800 + -- Kang Lin Mon, 07 Aug 2023 12:24:37 +0800 diff --git a/debian/control b/debian/control index 70465bb..b5e32b6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: main Priority: optional Maintainer: Kang Lin Build-Depends: debhelper (>= 6) -Standards-Version:"v0.5.14" +Standards-Version:"v0.5.15" Homepage: https://github.com/KangLin/SerialPortAssistant Vcs-Git: https://github.com/KangLin/SerialPortAssistant.git #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/SerialPortAssistant.git