support both x86 and X64 versions on Windows

This commit is contained in:
Le Tan 2017-03-16 20:56:22 +08:00
parent b27e6817b0
commit 88fd5b14a5
2 changed files with 25 additions and 12 deletions

View File

@ -14,13 +14,8 @@ VNote提供定期释出的稳定版本以及总是保持最新的滚(wen)动(
## Windows ## Windows
![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/tamlok/vnote?svg=true) ![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/tamlok/vnote?svg=true)
- Tagged releases: [Github Release](https://github.com/tamlok/vnote/releases) - Tagged releases (稳定版本): [Github Release](https://github.com/tamlok/vnote/releases)
- Rolling build: [AppVeyor Artifacts](https://ci.appveyor.com/project/tamlok/vnote/build/artifacts) - Rolling build (滚动构建版本): [Bintray](https://bintray.com/tamlok/vnote/vnote/view/files)
- 稳定版本: [Github Release](https://github.com/tamlok/vnote/releases)
- 滚动构建版本: [AppVeyor Artifacts](https://ci.appveyor.com/project/tamlok/vnote/build/artifacts)
## Linux ## Linux
[![Build Status](https://travis-ci.org/tamlok/vnote.svg?branch=master)](https://travis-ci.org/tamlok/vnote) [![Build Status](https://travis-ci.org/tamlok/vnote.svg?branch=master)](https://travis-ci.org/tamlok/vnote)
@ -28,6 +23,7 @@ VNote提供定期释出的稳定版本以及总是保持最新的滚(wen)动(
**NOT** ready yet! Please help yourself to compile and build it from sources. **NOT** ready yet! Please help yourself to compile and build it from sources.
## MacOS ## MacOS
[![Build Status](https://travis-ci.org/tamlok/vnote.svg?branch=master)](https://travis-ci.org/tamlok/vnote)
*** ***
# Description (简介) # Description (简介)

View File

@ -7,11 +7,14 @@ branches:
- master - master
environment: environment:
COMPILER: msvc
VSVER: 14
matrix: matrix:
- QT: C:\Qt\5.7\msvc2015_64 - QT: C:\Qt\5.7\msvc2015_64
PLATFORM: amd64 PLATFORM: amd64
COMPILER: msvc - QT: C:\Qt\5.7\msvc2015
VSVER: 14 PLATFORM: x86
clone_depth: 1 clone_depth: 1
@ -23,9 +26,11 @@ install:
# scripts that run before build # scripts that run before build
before_build: before_build:
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM% - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PLATFORM%
# After calling vcvarsall.bat, %PLATFORM% will be X64 or x86
- mkdir build - mkdir build
- cd build - cd build
- qmake -r -spec win32-msvc2015 CONFIG+=x86_64 CONFIG-=debug CONFIG+=release ../VNote.pro - if "%PLATFORM%" EQU "X64" (qmake -r -spec win32-msvc2015 CONFIG+=x86_64 CONFIG-=debug CONFIG+=release ../VNote.pro)
- if "%PLATFORM%" EQU "x86" (qmake -r -spec win32-msvc2015 CONFIG+=Win32 CONFIG-=debug CONFIG+=release ../VNote.pro)
# custom build scripts # custom build scripts
build_script: build_script:
@ -41,8 +46,20 @@ after_build:
- echo %APPVEYOR_BUILD_VERSION% > "distrib\VNote\version.txt" - echo %APPVEYOR_BUILD_VERSION% > "distrib\VNote\version.txt"
- echo %APPVEYOR_REPO_COMMIT% >> "distrib\VNote\version.txt" - echo %APPVEYOR_REPO_COMMIT% >> "distrib\VNote\version.txt"
- cd distrib - cd distrib
- 7z a vnote_win_x86_64_portable_%APPVEYOR_BUILD_VERSION%.zip VNote - 7z a vnote_win_%PLATFORM%_portable_%APPVEYOR_BUILD_VERSION%.zip VNote
artifacts: artifacts:
- path: build\distrib\vnote_win_x86_64_portable_%APPVEYOR_BUILD_VERSION%.zip - path: build\distrib\vnote_win_%PLATFORM%_portable_%APPVEYOR_BUILD_VERSION%.zip
name: portable name: portable
deploy:
- provider: BinTray
username: tamlok
api_key:
secure: YJqzsVDlC2NYH2RgzbUMtjZWbSXOdWUiiENOIqImo31hOfeiB0MiVGmBLmKPAHEg
subject: tamlok
repo: vnote
package: vnote
version: 1.0
publish: true
override: true