diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index bf303c3a..46fa8d5e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -35,7 +35,7 @@ jobs: SOURCE_DIR: ${{github.workspace}}/.cache/source TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.BUILD_TYPE}} - LunarCalendar_VERSION: v1.0.0 + LunarCalendar_VERSION: v1.0.1 VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 ANDROID_PLATFORM: android-23 ANDROID_NATIVE_API_LEVEL: 23 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 507301f5..7c3511ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ name: build env: artifact_path: artifact_path GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - LunarCalendar_VERSION: v1.0.0 + LunarCalendar_VERSION: v1.0.1 on: push: diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml index f1c078d8..06a05673 100644 --- a/.github/workflows/doxygen.yml +++ b/.github/workflows/doxygen.yml @@ -21,7 +21,7 @@ jobs: TOOSL_DIR: ${{github.workspace}}/.cache/tools INSTALL_DIR: ${{github.workspace}}/.cache/install_doxygen DOXYGEN_VERSION: 1.9.8 - LunarCalendar_VERSION: v1.0.0 + LunarCalendar_VERSION: v1.0.1 artifact_name: build_doxygen # Map the job outputs to step outputs diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 066a87f3..e3634d18 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -36,7 +36,7 @@ jobs: INSTALL_DIR: ${{github.workspace}}/.cache/install_macos qt_modules: qtwebengine ${{matrix.qt_modules}} VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 - LunarCalendar_VERSION: v1.0.0 + LunarCalendar_VERSION: v1.0.1 artifact_name: build_macos # Map the job outputs to step outputs diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml index 3632e4b0..f0c1c7f9 100644 --- a/.github/workflows/mingw.yml +++ b/.github/workflows/mingw.yml @@ -25,7 +25,7 @@ jobs: TOOSL_DIR: ${{github.workspace}}\.cache\tools INSTALL_DIR: ${{github.workspace}}\.cache\install_mingw artifact_name: build_mingw - LunarCalendar_VERSION: v1.0.0 + LunarCalendar_VERSION: v1.0.1 # Map the job outputs to step outputs outputs: diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 2995ce85..d7b96991 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -43,7 +43,7 @@ jobs: CMAKE_GENERATOR: "Visual Studio 17 2022" VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}} CMAKE_GENERATOR_PLATFORM: ${{matrix.CMAKE_GENERATOR_PLATFORM}} - LunarCalendar_VERSION: v1.0.0 + LunarCalendar_VERSION: v1.0.1 VCPKGGITCOMMITID: a1a1cbc975abf909a6c8985a6a2b8fe20bbd9bd6 qt_modules: qtwebengine ${{matrix.qt_modules}} artifact_name: build_msvc diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 363d2c16..30a74742 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 - LunarCalendar_VERSION: 1.0.0 + LunarCalendar_VERSION: 1.0.1 artifact_name: build_ubuntu # Map the job outputs to step outputs diff --git a/.travis.yml b/.travis.yml index 9d9ac2fd..046af752 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.0" + - export VERSION="v1.0.1" install: - cd ${SOURCE_DIR} diff --git a/App/android/AndroidManifest.xml b/App/android/AndroidManifest.xml index 732c359f..3b32c7a8 100644 --- a/App/android/AndroidManifest.xml +++ b/App/android/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e4f067f..a5221bb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ endif() GET_VERSION(OUT_VERSION LunarCalendar_VERSION OUT_REVISION LunarCalendar_REVISION) if(NOT LunarCalendar_VERSION) - SET(LunarCalendar_VERSION "v1.0.0") + SET(LunarCalendar_VERSION "v1.0.1") endif() message("LunarCalendar_VERSION:${LunarCalendar_VERSION}") diff --git a/Install/Install.nsi b/Install/Install.nsi index 77c8c72c..59551a51 100644 --- a/Install/Install.nsi +++ b/Install/Install.nsi @@ -3,7 +3,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "LunarCalendar" !define PRODUCT_APP_NAME "LunarCalendarApp" -!define PRODUCT_VERSION "v1.0.0" +!define PRODUCT_VERSION "v1.0.1" !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 83407905..e9add945 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ please compile and test the students with the corresponding equipment. - Ubuntu: *.deb - Windows: *.exe - Android: *.apk -- Documents: [LunarCalendar_v1.0.0_document.zip](https://github.com/KangLin/LunarCalendar/releases/download/v1.0.0/LunarCalendar_v1.0.0_document.zip) +- Documents: [LunarCalendar_v1.0.1_document.zip](https://github.com/KangLin/LunarCalendar/releases/download/v1.0.1/LunarCalendar_v1.0.1_document.zip) ### Compile diff --git a/README_zh_CN.md b/README_zh_CN.md index 504eadbb..01fd140c 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -109,7 +109,7 @@ Mac os 和 IOS ,本人没有相应设备,请有相应设备的同学自己 - Ubuntu: *.deb - Windows: *.exe - Android: *.apk -- 文档:[LunarCalendar_v1.0.0_document.zip](https://github.com/KangLin/LunarCalendar/releases/download/v1.0.0/LunarCalendar_v1.0.0_document.zip) +- 文档:[LunarCalendar_v1.0.1_document.zip](https://github.com/KangLin/LunarCalendar/releases/download/v1.0.1/LunarCalendar_v1.0.1_document.zip) ### 文档 diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt index aa82079e..29cd1c40 100644 --- a/Src/CMakeLists.txt +++ b/Src/CMakeLists.txt @@ -38,7 +38,7 @@ endif() GET_VERSION(OUT_VERSION LunarCalendar_VERSION OUT_REVISION LunarCalendar_REVISION) if(NOT LunarCalendar_VERSION) - SET(LunarCalendar_VERSION "v1.0.0") + SET(LunarCalendar_VERSION "v1.0.1") endif() message("LunarCalendar_VERSION:${LunarCalendar_VERSION}") message("LunarCalendar_REVISION:${LunarCalendar_REVISION}") diff --git a/Update/update.xml b/Update/update.xml index f55340c4..0735ddf1 100644 --- a/Update/update.xml +++ b/Update/update.xml @@ -1,4 +1,4 @@ - v1.0.0 + v1.0.1 diff --git a/appveyor.yml b/appveyor.yml index 1d0d4d8e..5ca45d92 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 'v1.0.0.{build}' +version: 'v1.0.1.{build}' cache: - C:\projects\other_source diff --git a/debian/changelog b/debian/changelog index 1e7613a6..3c1212b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ lunarcalendar (1.0.1) unstable; urgency=medium - * Modify debian package - -- Kang Lin Sat, 20 Apr 2019 19:53:02 -0700 + + -- Kang Lin Mon, 19 Feb 2024 14:41:26 +0800 diff --git a/deploy.sh b/deploy.sh index 84ff66ba..561e2477 100755 --- a/deploy.sh +++ b/deploy.sh @@ -47,8 +47,7 @@ sed -i "s/ SET(LunarCalendar_VERSION.*/ SET(LunarCalendar_VERSION \"${VERS sed -i "s/^\!define PRODUCT_VERSION.*/\!define PRODUCT_VERSION \"${VERSION}\"/g" ${SOURCE_DIR}/Install/Install.nsi sed -i "s/^version: '.*{build}'/version: '${VERSION}.{build}'/g" ${SOURCE_DIR}/appveyor.yml sed -i "s/^\ - export VERSION=.*/\ - export VERSION=\"${VERSION}\"/g" ${SOURCE_DIR}/.travis.yml -sed -i "s/LunarCalendar_VERSION:.*/LunarCalendar_VERSION: \"${VERSION}\"/g" ${SOURCE_DIR}/appveyor.yml -sed -i "s/export VERSION=".*"/export VERSION=\"${VERSION}\"/g" ${SOURCE_DIR}/ci/build.sh +sed -i "s/LunarCalendar_VERSION=.*/LunarCalendar_VERSION=\"${VERSION}\"/g" ${SOURCE_DIR}/appveyor.yml sed -i "s/.*${VERSION}