Skip to content

Commit

Permalink
Release 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
KangLin committed Dec 17, 2020
1 parent 11895f8 commit bc35b3b
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ before_install:
- sudo Xvfb :99 -ac &
- export DISPLAY=:99.0
- mkdir -p ${SOURCE_DIR}/Tools
- export VERSION="v1.0.0"
- export VERSION="1.0.1"

install:
- cd ${SOURCE_DIR}
Expand Down
2 changes: 1 addition & 1 deletion App/android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<manifest package="org.KangLinStudio.Calendar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.0" android:versionCode="1" android:installLocation="auto">
<manifest package="org.KangLinStudio.Calendar" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.1" android:versionCode="1" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>

<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CONFIGURE_FILE(
ADD_CUSTOM_TARGET(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake")

SET(BUILD_VERSION "v1.0.0")
SET(BUILD_VERSION "1.0.1")
# Find Git Version Patch
IF(EXISTS "${CMAKE_SOURCE_DIR}/.git")
if(NOT GIT)
Expand Down
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- v1.0.1
+ Modify style
+ Add 2021 chinese holiday

- v1.0.0
+ FIX: android run fail
Expand Down
1 change: 1 addition & 0 deletions ChangeLog_zh_CN.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- v1.0.1
+ 修改样式
+ 增加 2021 年节假日

- v1.0.0
+ FIX: android 运行失败
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.0"
!define PRODUCT_VERSION "1.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"
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,24 @@ please compile and test the students with the corresponding equipment.
### [Download setup package](https://github.com/KangLin/Calendar/releases/latest)

- windows
- [Calendar-Setup-v1.0.0.exe](https://github.com/KangLin/Calendar/releases/download/v1.0.0/Calendar-Setup-v1.0.0.exe)
- [Calendar-Setup-v1.0.1.exe](https://github.com/KangLin/Calendar/releases/download/v1.0.1/Calendar-Setup-v1.0.1.exe)
Windows installation package, support for Windows xp and above

- android
+ [Calendar_armeabi-v7a_v1.0.0.apk](https://github.com/KangLin/Calendar/releases/download/v1.0.0/Calendar_armeabi-v7a_v1.0.0.apk)
+ [Calendar_armeabi-v7a_v1.0.1.apk](https://github.com/KangLin/Calendar/releases/download/v1.0.1/Calendar_armeabi-v7a_v1.0.1.apk)

- linux
- [Calendar_v1.0.0.tar.gz](https://github.com/KangLin/Calendar/releases/download/v1.0.0/Calendar_v1.0.0.tar.gz)
- [Calendar_v1.0.1.tar.gz](https://github.com/KangLin/Calendar/releases/download/v1.0.1/Calendar_v1.0.1.tar.gz)
The AppImage format executable can be run directly on the Linux system, see: https://appimage.org/
Usage:

1. Decompress. Copy Calendar_v1.0.0.tar.gz to install directory, then decompress it:
1. Decompress. Copy Calendar_v1.0.1.tar.gz to install directory, then decompress it:

```
mkdir Calendar
cd Calendar
cp $DOWNLOAD/Calendar_v1.0.0.tar.gz .
tar xvfz Calendar_v1.0.0.tar.gz
cp $DOWNLOAD/Calendar_v1.0.1.tar.gz .
tar xvfz Calendar_v1.0.1.tar.gz
```

2. install
Expand All @@ -95,7 +95,7 @@ please compile and test the students with the corresponding equipment.
```

- ubuntu
- [Calendar_1.0.0_amd64.deb](https://github.com/KangLin/Calendar/releases/download/v1.0.0/Calendar_1.0.0_amd64.deb)
- [Calendar_1.0.1_amd64.deb](https://github.com/KangLin/Calendar/releases/download/v1.0.1/Calendar_1.0.1_amd64.deb)
Deb installation package for Ubuntu

### Depend
Expand Down
14 changes: 7 additions & 7 deletions README_zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,23 @@ Mac os 和 IOS ,本人没有相应设备,请有相应设备的同学自己
### [下载安装包](https://github.com/KangLin/Calendar/releases/latest)

- windows
- [Calendar-Setup-v1.0.0.exe](https://github.com/KangLin/Calendar/releases/download/v1.0.0/Calendar-Setup-v1.0.0.exe)
- [Calendar-Setup-v1.0.1.exe](https://github.com/KangLin/Calendar/releases/download/v1.0.1/Calendar-Setup-v1.0.1.exe)
Windows安装包,支持 Windows xp 以上系统

- android
+ [Calendar_v1.0.0.apk](https://github.com/KangLin/Calendar/releases/download/v1.0.0/Calendar_v1.0.0.apk)
+ [Calendar_v1.0.1.apk](https://github.com/KangLin/Calendar/releases/download/v1.0.1/Calendar_v1.0.1.apk)

- linux
- [Calendar_v1.0.0.tar.gz](https://github.com/KangLin/Calendar/releases/download/v1.0.0/Calendar_v1.0.0.tar.gz)
- [Calendar_v1.0.1.tar.gz](https://github.com/KangLin/Calendar/releases/download/v1.0.1/Calendar_v1.0.1.tar.gz)
AppImage格式的执行程序,可直接运行在linux系统,详见:https://appimage.org/
使用:
1. 解压。复制 Calendar_v1.0.0.tar.gz 到安装目录,然后解压:
1. 解压。复制 Calendar_v1.0.1.tar.gz 到安装目录,然后解压:

```
mkdir Calendar
cd Calendar
cp $DOWNLOAD/Calendar_v1.0.0.tar.gz .
tar xvfz Calendar_v1.0.0.tar.gz
cp $DOWNLOAD/Calendar_v1.0.1.tar.gz .
tar xvfz Calendar_v1.0.1.tar.gz
```
2. 安装
Expand All @@ -94,7 +94,7 @@ Mac os 和 IOS ,本人没有相应设备,请有相应设备的同学自己
```

- ubuntu
- [Calendar_1.0.0_amd64.deb](https://github.com/KangLin/Calendar/releases/download/v1.0.0/Calendar_1.0.0_amd64.deb)
- [Calendar_1.0.1_amd64.deb](https://github.com/KangLin/Calendar/releases/download/v1.0.1/Calendar_1.0.1_amd64.deb)
deb 安装包,可用于 Ubuntu

### 依赖
Expand Down
2 changes: 1 addition & 1 deletion Update/update.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<REDIRECT>
<VERSION>v1.0.0</VERSION>
<VERSION>1.0.1</VERSION>
</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.0.{build}'
version: '1.0.1.{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.0"
export VERSION="1.0.1"
fi
if [ -z "$VERSION" ]; then
export VERSION="v1.0.0"
export VERSION="1.0.1"
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.0) stable; urgency=medium
calendar (1.0.1) 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.0"
Standards-Version:"1.0.1"
Homepage: https://github.com/KangLin/Calendar
Vcs-Git: https://github.com/KangLin/Calendar.git
#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/Calendar.git
Expand Down
2 changes: 1 addition & 1 deletion pri/Common.pri
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ isEmpty(BUILD_VERSION) {
}
}
isEmpty(BUILD_VERSION){
BUILD_VERSION="v1.0.0"
BUILD_VERSION="1.0.1"
}
message("Calendar BUILD_VERSION:$$BUILD_VERSION")
DEFINES += BUILD_VERSION=\"\\\"$$quote($$BUILD_VERSION)\\\"\"
Expand Down

0 comments on commit bc35b3b

Please sign in to comment.