From 1c7f847889e190edbd291521df9866913bc9c234 Mon Sep 17 00:00:00 2001 From: Kang Lin Date: Wed, 12 Jul 2023 12:42:42 +0800 Subject: [PATCH] Add build time --- .github/workflows/android.yml | 4 ++-- .github/workflows/build.yml | 2 +- .github/workflows/macos.yml | 4 ++-- .github/workflows/msvc.yml | 4 ++-- .github/workflows/ubuntu.yml | 2 +- .travis.yml | 2 +- 3th_libs/LunarCalendar | 2 +- App/MainWindow.cpp | 1 + App/Resource/Translations/CalendarApp_zh_CN.ts | 2 +- App/Resource/Translations/CalendarApp_zh_TW.ts | 2 +- App/android/AndroidManifest.xml | 2 +- CMakeLists.txt | 2 +- ChangeLog.md | 3 +++ ChangeLog_zh_CN.md | 3 +++ Install/Install.nsi | 2 +- Update/update.xml | 14 +++++++------- appveyor.yml | 2 +- ci/build.sh | 4 ++-- debian/changelog | 2 +- debian/control | 2 +- 20 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 85e8e33..fe29350 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -35,8 +35,8 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}} - Calendar_VERSION: v1.0.9 - VCPKGGITCOMMITID: 5ac89392d779288ec8073ebba69cf12d3537f6d7 + Calendar_VERSION: v1.0.10 + VCPKGGITCOMMITID: 861c33057553ee836e7061ffbdabc25ea343145d ANDROID_PLATFORM: android-23 ANDROID_NATIVE_API_LEVEL: 23 qt_modules: 'qtimageformats qtmultimedia qtscxml' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f34766a..5ff3323 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build env: artifact_path: artifact_path GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - Calendar_VERSION: v1.0.9 + Calendar_VERSION: v1.0.10 on: push: diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 796e2aa..74058ce 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -34,9 +34,9 @@ jobs: TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_macos qt_modules: qtwebengine ${{matrix.qt_modules}} - Calendar_VERSION: 1.0.9 + Calendar_VERSION: 1.0.10 artifact_name: build_macos - VCPKGGITCOMMITID: 5ac89392d779288ec8073ebba69cf12d3537f6d7 + VCPKGGITCOMMITID: 861c33057553ee836e7061ffbdabc25ea343145d # Map the job outputs to step outputs outputs: diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 01cb929..d22aca6 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -45,8 +45,8 @@ jobs: CMAKE_GENERATOR: "Visual Studio 17 2022" VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}} CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}} - Calendar_VERSION: v1.0.9 - VCPKGGITCOMMITID: 5ac89392d779288ec8073ebba69cf12d3537f6d7 + Calendar_VERSION: v1.0.10 + VCPKGGITCOMMITID: 861c33057553ee836e7061ffbdabc25ea343145d qt_modules: ${{matrix.qt_modules}} artifact_name: build_msvc diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 41143ef..e43c500 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 - Calendar_VERSION: 1.0.9 + Calendar_VERSION: 1.0.10 artifact_name: build_ubuntu # Map the job outputs to step outputs diff --git a/.travis.yml b/.travis.yml index efdd41e..d0c77a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ before_install: - sudo Xvfb :99 -ac & - export DISPLAY=:99.0 - mkdir -p ${SOURCE_DIR}/Tools - - export VERSION="v1.0.9" + - export VERSION="v1.0.10" install: - cd ${SOURCE_DIR} diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar index 5058053..caacbda 160000 --- a/3th_libs/LunarCalendar +++ b/3th_libs/LunarCalendar @@ -1 +1 @@ -Subproject commit 5058053af159ce0dbb85eec332bd9a3b151d323e +Subproject commit caacbdaeb214a84e169e2db255b465c86b8344cc diff --git a/App/MainWindow.cpp b/App/MainWindow.cpp index ecde5fd..8d53e65 100644 --- a/App/MainWindow.cpp +++ b/App/MainWindow.cpp @@ -118,6 +118,7 @@ void CMainWindow::slotAbout() QPixmap p = icon.pixmap(*sizeList.begin()); about.m_AppIcon = p.toImage(); about.m_szHomePage = "https://github.com/KangLin/Calendar"; + about.m_szBuildTime = QString("%1/%2").arg(__DATE__, __TIME__); about.m_szCopyrightStartTime = "2019"; about.m_szVersionRevision = Calendar_REVISION; if(about.isHidden()) diff --git a/App/Resource/Translations/CalendarApp_zh_CN.ts b/App/Resource/Translations/CalendarApp_zh_CN.ts index abd8cac..9903295 100644 --- a/App/Resource/Translations/CalendarApp_zh_CN.ts +++ b/App/Resource/Translations/CalendarApp_zh_CN.ts @@ -16,7 +16,7 @@ Enable run from boot - 允许开户自启动 + 允许开机自启动 diff --git a/App/Resource/Translations/CalendarApp_zh_TW.ts b/App/Resource/Translations/CalendarApp_zh_TW.ts index b45a376..f80dd7b 100644 --- a/App/Resource/Translations/CalendarApp_zh_TW.ts +++ b/App/Resource/Translations/CalendarApp_zh_TW.ts @@ -16,7 +16,7 @@ Enable run from boot - 允許開戶自啟動 + 允許開機自啟動 diff --git a/App/android/AndroidManifest.xml b/App/android/AndroidManifest.xml index d49401b..9617e76 100644 --- a/App/android/AndroidManifest.xml +++ b/App/android/AndroidManifest.xml @@ -3,7 +3,7 @@ package="org.KangLinStudio.Calendar" android:installLocation="auto" android:versionCode="1" - android:versionName="1.0.9"> + android:versionName="1.0.10"> diff --git a/CMakeLists.txt b/CMakeLists.txt index abb5e5e..aec6149 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ GET_VERSION(OUT_VERSION Calendar_VERSION OUT_REVISION Calendar_REVISION) message("Calendar_VERSION:${Calendar_VERSION}; Calendar_REVISION:${Calendar_REVISION}") if(NOT Calendar_VERSION) - set(Calendar_VERSION "v1.0.9") + set(Calendar_VERSION "v1.0.10") endif() set(VERSION ${Calendar_VERSION}) add_subdirectory(3th_libs/LunarCalendar/Src) diff --git a/ChangeLog.md b/ChangeLog.md index 751043e..714a642 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +- v1.0.10 + + Add build time + - v1.0.9 + Add update xml + FIX: windows resource diff --git a/ChangeLog_zh_CN.md b/ChangeLog_zh_CN.md index 5e0bc11..8896d38 100644 --- a/ChangeLog_zh_CN.md +++ b/ChangeLog_zh_CN.md @@ -1,3 +1,6 @@ +- v1.0.10 + + 增加编译时间 + - v1.0.9 + 增加：更新 xml 文件 + 修复: windows 资源 diff --git a/Install/Install.nsi b/Install/Install.nsi index a881afa..cc5235c 100644 --- a/Install/Install.nsi +++ b/Install/Install.nsi @@ -3,7 +3,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "Calendar" !define PRODUCT_APP_NAME "CalendarApp" -!define PRODUCT_VERSION "v1.0.9" +!define PRODUCT_VERSION "v1.0.10" !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/Update/update.xml b/Update/update.xml index c4214ce..518b706 100644 --- a/Update/update.xml +++ b/Update/update.xml @@ -1,16 +1,16 @@ - v1.0.9 + v1.0.10 - https://github.com/KangLin/Calendar/releases/download/v1.0.9/update_windows.xml - https://sourceforge.net/projects/rabbitcalendar/files/v1.0.9/update_windows.xml/download + https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_windows.xml + https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_windows.xml/download - https://github.com/KangLin/Calendar/releases/download/v1.0.9/update_linux.xml - https://sourceforge.net/projects/rabbitcalendar/files/v1.0.9/update_linux.xml/download + https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_linux.xml + https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_linux.xml/download - https://github.com/KangLin/Calendar/releases/download/v1.0.9/update_linux.xml - https://sourceforge.net/projects/rabbitcalendar/files/v1.0.9/update_linux.xml/download + https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_linux.xml + https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_linux.xml/download diff --git a/appveyor.yml b/appveyor.yml index 543e7c9..3ec9e30 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ #TODO: Change version -version: 'v1.0.9.{build}' +version: 'v1.0.10.{build}' cache: - Package diff --git a/ci/build.sh b/ci/build.sh index 9068c4b..abee9a2 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -115,10 +115,10 @@ esac export PKG_CONFIG_PATH=${ThirdLibs_DIR}/lib/pkgconfig:${PKG_CONFIG_PATH} if [ -n "$appveyor_build_version" -a -z "$VERSION" ]; then - export VERSION="v1.0.9" + export VERSION="v1.0.10" fi if [ -z "$VERSION" ]; then - export VERSION="v1.0.9" + export VERSION="v1.0.10" fi export UPLOADTOOL_BODY="Release Calendar ${VERSION}.
The change see [ChangeLog.md](ChangeLog.md) or [ChangeLog_zh_CN.md](ChangeLog_zh_CN.md)" diff --git a/debian/changelog b/debian/changelog index 781e05a..51369ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -calendar (1.0.9) stable; urgency=medium +calendar (1.0.10) stable; urgency=medium * Initial Release. diff --git a/debian/control b/debian/control index 6c156cb..7bdeca4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: main Priority: optional Maintainer: Kang Lin Build-Depends: debhelper (>= 6) -Standards-Version:"v1.0.9" +Standards-Version:"v1.0.10" Homepage: https://github.com/KangLin/Calendar Vcs-Git: https://github.com/KangLin/Calendar.git Vcs-Browser: https://github.com/KangLin/Calendar