Skip to content

Commit

Permalink
Add build time
Browse files Browse the repository at this point in the history
  • Loading branch information
KangLin committed Jul 19, 2023
1 parent 059c277 commit 1c7f847
Show file tree
Hide file tree
Showing 20 changed files with 34 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions App/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion App/Resource/Translations/CalendarApp_zh_CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<message>
<location filename="../../DlgOption.ui" line="47"/>
<source>Enable run from boot</source>
<translation>允许开户自启动</translation>
<translation>允许开机自启动</translation>
</message>
<message>
<location filename="../../DlgOption.ui" line="34"/>
Expand Down
2 changes: 1 addition & 1 deletion App/Resource/Translations/CalendarApp_zh_TW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<message>
<location filename="../../DlgOption.ui" line="47"/>
<source>Enable run from boot</source>
<translation>允許開戶自啟動</translation>
<translation>允許開機自啟動</translation>
</message>
<message>
<location filename="../../DlgOption.ui" line="34"/>
Expand Down
2 changes: 1 addition & 1 deletion App/android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package="org.KangLinStudio.Calendar"
android:installLocation="auto"
android:versionCode="1"
android:versionName="1.0.9">
android:versionName="1.0.10">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
- v1.0.10
+ Add build time

- v1.0.9
+ Add update xml
+ FIX: windows resource
Expand Down
3 changes: 3 additions & 0 deletions ChangeLog_zh_CN.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
- v1.0.10
+ 增加编译时间

- v1.0.9
+ 增加:更新 xml 文件
+ 修复: windows 资源
Expand Down
2 changes: 1 addition & 1 deletion Install/Install.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions Update/update.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version='1.0' encoding='UTF-8'?>
<REDIRECT>
<VERSION>v1.0.9</VERSION>
<VERSION>v1.0.10</VERSION>
<WINDOWS>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.9/update_windows.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.9/update_windows.xml/download</URL>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_windows.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_windows.xml/download</URL>
</WINDOWS>
<LINUX>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.9/update_linux.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.9/update_linux.xml/download</URL>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_linux.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_linux.xml/download</URL>
</LINUX>
<LINUX_APPIMAGE>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.9/update_linux.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.9/update_linux.xml/download</URL>
<URL>https://github.com/KangLin/Calendar/releases/download/v1.0.10/update_linux.xml</URL>
<URL>https://sourceforge.net/projects/rabbitcalendar/files/v1.0.10/update_linux.xml/download</URL>
</LINUX_APPIMAGE>
</REDIRECT>
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#TODO: Change version
version: 'v1.0.9.{build}'
version: 'v1.0.10.{build}'

cache:
- Package
Expand Down
4 changes: 2 additions & 2 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}.<br> The change see [ChangeLog.md](ChangeLog.md) or [ChangeLog_zh_CN.md](ChangeLog_zh_CN.md)"
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
calendar (1.0.9) stable; urgency=medium
calendar (1.0.10) stable; urgency=medium

* Initial Release.

Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Section: main
Priority: optional
Maintainer: Kang Lin <[email protected]>
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
Expand Down

0 comments on commit 1c7f847

Please sign in to comment.