diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index a36490d..123daf5 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}} - Calendar_VERSION: v1.0.8 + Calendar_VERSION: v1.0.81 VCPKGGITCOMMITID: 1ba9a2591f15af5900f2ce2b3e2bf31771e3ac48 ANDROID_PLATFORM: android-23 ANDROID_NATIVE_API_LEVEL: 23 @@ -147,7 +147,7 @@ jobs: 7z a Calendar_${{env.Calendar_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip install/* - name: Update artifact - #if: ${{ matrix.BUILD_TYPE == 'Release' }} + if: ${{ matrix.BUILD_TYPE == 'Release' }} uses: actions/upload-artifact@v3 with: name: ${{ env.artifact_name }} diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0341446..671e3a5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -95,15 +95,15 @@ jobs: -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build/install \ -DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install - 7z a Calendar${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip ./install/* + 7z a Calendar_${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip ./install/* - name: Update artifact - #if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }} + if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }} uses: actions/upload-artifact@v3 with: name: ${{ env.artifact_name }} path: | - ${{github.workspace}}/build/Calendar${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip + ${{github.workspace}}/build/Calendar_${{env.Calendar_VERSION}}_macos_qt${{matrix.qt_version}}.zip # - name: Upload To Github Release # if: ${{ matrix.BUILD_TYPE == 'Release' && startsWith(github.ref, 'refs/tags/') }} diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index c935384..764515b 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -108,7 +108,7 @@ jobs: working-directory: ${{env.SOURCE_DIR}} run: git clone https://github.com/KangLin/RabbitCommon.git - - name: Build LunarCalendar + - name: Build Calendar env: RabbitCommon_DIR: ${{env.SOURCE_DIR}}/RabbitCommon run: | @@ -134,12 +134,14 @@ jobs: copy /Y ${{env.INSTALL_DIR}}\bin\*.dll install\bin copy /Y ${{env.INSTALL_DIR}}\lib\*.dll install\bin copy /Y ${{env.RUNVCPKG_VCPKG_ROOT}}\installed\${{env.RUNVCPKG_VCPKG_TRIPLET_OUT}}\bin\*.dll install\bin - 7z a Calendar${{env.Calendar_VERSION}}_qt${{matrix.qt_version}}_${{matrix.triplet}}_${{matrix.BUILD_TYPE}}.zip .\install\* + 7z a Calendar_${{env.Calendar_VERSION}}_${{matrix.triplet}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip .\install\* + makensis Install.nsi - name: Update artifact - #if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }} + if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '5.12.12' }} uses: actions/upload-artifact@v3 with: name: ${{ env.artifact_name }} path: | - ${{github.workspace}}\build\Calendar${{env.Calendar_VERSION}}_qt${{matrix.qt_version}}_${{matrix.triplet}}_${{matrix.BUILD_TYPE}}.zip + ${{github.workspace}}\build\Calendar_${{env.Calendar_VERSION}}_${{matrix.triplet}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.zip + ${{github.workspace}}\build\Calendar_*.exe diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 29c85d5..be07cc4 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -77,7 +77,7 @@ jobs: run: | export Qt6_DIR=/usr/lib/`uname -a`-linux-gnu/cmake/Qt6 ./build_debpackage.sh - cp ../calendar_${{env.Calendar_VERSION}}_amd64.deb calendar_${{env.Calendar_VERSION}}_amd64.deb + cp ../calendar_${{env.Calendar_VERSION}}_amd64.deb calendar_${{env.Calendar_VERSION}}_ubuntu_amd64.deb - name: Update artifact if: ${{ matrix.BUILD_TYPE == 'Release' }} diff --git a/Install/Install.nsi b/Install/Install.nsi index 583cb2c..468d4a7 100644 --- a/Install/Install.nsi +++ b/Install/Install.nsi @@ -72,7 +72,7 @@ LangString LANG_DIRECTORY_PERMISSION ${LANG_SIMPCHINESE} "无目录访问权限" Name "$(LANG_PRODUCT_NAME) ${PRODUCT_VERSION}" Caption "$(LANG_PRODUCT_NAME) ${PRODUCT_VERSION}" -OutFile "${PRODUCT_NAME}_Setup_${PRODUCT_VERSION}.exe" +OutFile "${PRODUCT_NAME}_${PRODUCT_VERSION}.exe" InstallDir "$LOCALAPPDATA\${PRODUCT_NAME}" ;InstallDirRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" "" diff --git a/README.md b/README.md index fbaa68f..8ec6489 100644 --- a/README.md +++ b/README.md @@ -86,41 +86,8 @@ please compile and test the students with the corresponding equipment. ### Download -- [![Latest Release](https://img.shields.io/github/release/KangLin/Calendar.svg?label=Github%20Release)](https://github.com/KangLin/Calendar/releases/latest) -- [![Download Calendar](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/rabbitcalendar/files/latest/download) - + Windows: Windows installation package, support for Windows xp and above - - [Download Calendar_Setup_v1.0.8.exe from github](https://github.com/KangLin/Calendar/releases/download/v1.0.8/Calendar_Setup_v1.0.8.exe) - - [Download Calendar_Setup_v1.0.8.exe from sourceforge](https://sourceforge.net/projects/rabbitcalendar/files/v1.0.8/Calendar_Setup_v1.0.8.exe/download) - + Android: - - [Download Calendar_armeabi-v7a_v1.0.8.apk from github](https://github.com/KangLin/Calendar/releases/download/v1.0.8/Calendar_armeabi-v7a_v1.0.8.apk) - - + Ubuntu: - + Ubuntu 20.04: calendar_1.0.8_amd64_Ubuntu-20.04.deb - - sudo apt install ./calendar_1.0.8_amd64_Ubuntu-20.04.deb - - # If you're on an older Linux distribution, you will need to run this instead: - # sudo dpkg -i calendar_1.0.8_amd64_Ubuntu-20.04.deb - # sudo apt-get install -f # Install dependencies - - - [Download from github](https://github.com/KangLin/calendar/releases/download/v1.0.8/calendar_1.0.8_amd64_Ubuntu-20.04.deb) - - [Download from sourceforge](https://sourceforge.net/projects/calendar/files/v1.0.8/calendar_1.0.8_amd64_Ubuntu-20.04.deb/download) - + MD5SUM file: calendar_1.0.8_amd64_Ubuntu-20.04.deb.md5sum - - [Download from github](https://github.com/KangLin/calendar/releases/download/v1.0.8/calendar_1.0.8_amd64_Ubuntu-20.04.deb.md5sum) - - [Download from sourceforge](https://sourceforge.net/projects/calendar/files/v1.0.8/calendar_1.0.8_amd64_Ubuntu-20.04.deb.md5sum/download) - + Ubuntu 18.04: calendar_1.0.8_amd64_Ubuntu-18.04.deb - - sudo apt install ./calendar_1.0.8_amd64_Ubuntu-18.04.deb - - # If you're on an older Linux distribution, you will need to run this instead: - # sudo dpkg -i calendar_1.0.8_amd64_Ubuntu-18.04.deb - # sudo apt-get install -f # Install dependencies - - - [Download from github](https://github.com/KangLin/calendar/releases/download/v1.0.8/calendar_1.0.8_amd64_Ubuntu-18.04.deb) - - [Download from sourceforge](https://sourceforge.net/projects/calendar/files/v1.0.8/calendar_1.0.8_amd64_Ubuntu-18.04.deb/download) - + MD5SUM file: calendar_1.0.8_amd64_Ubuntu-18.04.deb.md5sum - - [Download from github](https://github.com/KangLin/calendar/releases/download/v1.0.8/calendar_1.0.8_amd64_Ubuntu-18.04.deb.md5sum) - - [Download from sourceforge](https://sourceforge.net/projects/calendar/files/v1.0.8/calendar_1.0.8_amd64_Ubuntu-18.04.deb.md5sum/download) +- [![Latest release from github](https://img.shields.io/github/release/KangLin/Calendar.svg?label=Github%20Release)](https://github.com/KangLin/Calendar/releases/latest) +- [![Latest release from sourceforge](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/rabbitcalendar/files/latest/download) ### Depend - [Qt (LGPL v2.1)](http://qt.io/) diff --git a/README_zh_CN.md b/README_zh_CN.md index fffa290..aef55fe 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -75,10 +75,10 @@ Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己 - ![Sticky](Resource/Image/ScreenShot/Sticky_zh_CN.png) - ![Tasks](Resource/Image/ScreenShot/Task_zh_CN.png) + Android 下截图 -- ![Android Calendar](Resource/Image/ScreenShot/AndroidCalendar_zh_CN.png) -- ![Android Stricky List](Resource/Image/ScreenShot/AndroidStrickyList_zh_CN.png) -- ![Android Stricky](Resource/Image/ScreenShot/AndroidStricky_zh_CN.png) -- ![Android Tasks](Resource/Image/ScreenShot/AndroidTask_zh_CN.png) + - ![Android Calendar](Resource/Image/ScreenShot/AndroidCalendar_zh_CN.png) + - ![Android Stricky List](Resource/Image/ScreenShot/AndroidStrickyList_zh_CN.png) + - ![Android Stricky](Resource/Image/ScreenShot/AndroidStricky_zh_CN.png) + - ![Android Tasks](Resource/Image/ScreenShot/AndroidTask_zh_CN.png) ### 捐赠 本软件如果对你有用，或者你喜欢它，请你捐赠，支持作者。谢谢！ @@ -89,40 +89,6 @@ Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己 - [![最后发行版本下载](https://img.shields.io/github/release/KangLin/Calendar.svg?label=Github%20最后发行版本下载)](https://github.com/KangLin/Calendar/releases/latest) - [![最后发行版本下载](https://a.fsdn.com/con/app/sf-download-button)](https://sourceforge.net/projects/rabbitcalendar/files/latest/download) -- windows: - Windows安装包，支持 Windows xp 以上系统 - + [从 sourceforge 下载 Calendar_Setup_v1.0.8.exe ](https://sourceforge.net/projects/rabbitcalendar/files/v1.0.8/Calendar_Setup_v1.0.8.exe/download) - + [从 Github 下载 Calendar_Setup_v1.0.8.exe](https://github.com/KangLin/Calendar/releases/download/v1.0.8/Calendar_Setup_v1.0.8.exe) -- android: - + [从 github 下载 Calendar_armeabi-v7a_v1.0.8.apk](https://github.com/KangLin/Calendar/releases/download/v1.0.8/Calendar_v1.0.8.apk) - -- Ubuntu: - + Ubuntu 20.04: calendar_1.0.8_amd64_Ubuntu-20.04.deb - - sudo apt install ./calendar_1.0.8_amd64_Ubuntu-20.04.deb - - # 如要你是在老的 linux 发行版本上，你需要用下列命令替换： - # sudo dpkg -i calendar_1.0.8_amd64_Ubuntu-20.04.deb - # sudo apt-get install -f # 安装依赖 - - - [从 github 下载](https://github.com/KangLin/calendar/releases/download/v1.0.8/calendar_1.0.8_amd64_Ubuntu-20.04.deb) - - [从 sourceforge 下载](https://sourceforge.net/projects/calendar/files/v1.0.8/calendar_1.0.8_amd64_Ubuntu-20.04.deb/download) - + md5 校验文件: calendar_1.0.8_amd64_Ubuntu-20.04.deb.md5sum - - [从 github 下载](https://github.com/KangLin/calendar/releases/download/v1.0.8/calendar_1.0.8_amd64_Ubuntu-20.04.deb.md5sum) - - [从 sourceforge 下载](https://sourceforge.net/projects/calendar/files/v1.0.8/calendar_1.0.8_amd64_Ubuntu-20.04.deb.md5sum/download) - + Ubuntu 18.04: calendar_1.0.8_amd64_Ubuntu-18.04.deb - - sudo apt install ./calendar_1.0.8_amd64_Ubuntu-18.04.deb - - # 如要你是在老的 linux 发行版本上，你需要用下列命令替换： - # sudo dpkg -i calendar_1.0.8_amd64_Ubuntu-18.04.deb - # sudo apt-get install -f # 安装依赖 - - - [从 github 下载](https://github.com/KangLin/calendar/releases/download/v1.0.8/calendar_1.0.8_amd64_Ubuntu-18.04.deb) - - [从 sourceforge 下载](https://sourceforge.net/projects/calendar/files/v1.0.8/calendar_1.0.8_amd64_Ubuntu-18.04.deb/download) - + md5 校验文件: calendar_1.0.8_amd64_Ubuntu-18.04.deb.md5sum - - [从 github 下载](https://github.com/KangLin/calendar/releases/download/v1.0.8/calendar_1.0.8_amd64_Ubuntu-18.04.deb.md5sum) - - [从 sourceforge 下载](https://sourceforge.net/projects/calendar/files/v1.0.8/calendar_1.0.8_amd64_Ubuntu-18.04.deb.md5sum/download) ### 依赖 - [Qt (LGPL v2.1)](http://qt.io/) @@ -181,11 +147,11 @@ Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己 - 安装库和程序 cmake --build . --config Release --target install/strip - + - 生成 APK cmake --build . --config Release --target APK - + - 主机是windows + 编译 @@ -199,7 +165,7 @@ Mac os 和 IOS ，本人没有相应设备，请有相应设备的同学自己 -DANDROID_PLATFORM=android-24 ^ -DQt5_DIR= ^ -DRabbitCommon_DIR= - + + 安装 - 安装库和程序 @@ -264,9 +230,9 @@ Qt因为版权原因，没有提供openssl动态库，所以必须自己复制op + 子模块方式 add_subdirectory(3th_libs/Calendar/Src) - + + 非子模块方式 - + # Need include ${RabbitCommon_DIR}/cmake/Translations.cmake if( "${RabbitCommon_DIR}" STREQUAL "" ) set(RabbitCommon_DIR $ENV{RabbitCommon_DIR}) @@ -298,13 +264,13 @@ Qt因为版权原因，没有提供openssl动态库，所以必须自己复制op message(" ag:") message(FATAL_ERROR " cmake -DCalendar_DIR= ") endif() - + - 库方式: - + + Cmake 参数指定 Calendar_DIR 到库安装目录 - + FIND_PACKAGE(Calendar) - + + 在 CMakeLists.txt 中增加头文件和库文件 SET(APP_LIBS ${PROJECT_NAME} ${QT_LIBRARIES})