release v1.5

This commit is contained in:
Le Tan 2017-05-25 22:27:50 +08:00
parent c54bc9c680
commit 7d05f96f94
5 changed files with 11 additions and 11 deletions

View File

@ -16,10 +16,10 @@
}, },
"version": { "version": {
"name": "1.4", "name": "1.5",
"desc": "VNote Releases", "desc": "VNote Releases",
"released": "2017-05-06", "released": "2017-05-25",
"vcs_tag": "1.4", "vcs_tag": "1.5",
"gpgSign": false "gpgSign": false
}, },

View File

@ -16,10 +16,10 @@
}, },
"version": { "version": {
"name": "1.4", "name": "1.5",
"desc": "VNote Releases", "desc": "VNote Releases",
"released": "2017-05-06", "released": "2017-05-25",
"vcs_tag": "1.4", "vcs_tag": "1.5",
"gpgSign": false "gpgSign": false
}, },

View File

@ -19,7 +19,7 @@ branches:
before_install: before_install:
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo apt-get -qq update ; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo apt-get -qq update ; fi
- export version="1.4" - export version="1.5"
install: install:
- if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install p7zip-full ; fi - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install p7zip-full ; fi

View File

@ -1,6 +1,6 @@
image: Visual Studio 2015 image: Visual Studio 2015
version: 1.4.{build} version: 1.5.{build}
branches: branches:
only: only:
@ -38,7 +38,7 @@ build_script:
# scripts that run after build # scripts that run after build
after_build: after_build:
- set vnote_version=1.4 - set vnote_version=1.5
# Clone OpenSSL DLLs # Clone OpenSSL DLLs
- git clone https://github.com/tamlok/openssl-utils.git openssl-utils.git - git clone https://github.com/tamlok/openssl-utils.git openssl-utils.git
- mkdir distrib\VNote - mkdir distrib\VNote
@ -66,6 +66,6 @@ deploy:
subject: tamlok subject: tamlok
repo: vnote repo: vnote
package: vnote package: vnote
version: 1.4 version: 1.5
publish: true publish: true
override: true override: true

View File

@ -13,7 +13,7 @@
const QString VConfigManager::orgName = QString("vnote"); const QString VConfigManager::orgName = QString("vnote");
const QString VConfigManager::appName = QString("vnote"); const QString VConfigManager::appName = QString("vnote");
const QString VConfigManager::c_version = QString("1.4"); const QString VConfigManager::c_version = QString("1.5");
const QString VConfigManager::c_obsoleteDirConfigFile = QString(".vnote.json"); const QString VConfigManager::c_obsoleteDirConfigFile = QString(".vnote.json");
const QString VConfigManager::c_dirConfigFile = QString("_vnote.json"); const QString VConfigManager::c_dirConfigFile = QString("_vnote.json");
const QString VConfigManager::defaultConfigFilePath = QString(":/resources/vnote.ini"); const QString VConfigManager::defaultConfigFilePath = QString(":/resources/vnote.ini");