From f70b62c23fc0818c1e84b297cf4f3917b95b9d14 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 30 11月 2019 19:16:45 +0800
Subject: [PATCH] try wine64 for mingw build
---
.travis.yml | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index dde395e..ed056e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,7 +62,6 @@
- libboost-thread-dev
- libboost-date-time-dev
before_script:
- - mkdir build
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug ..
script:
- cmake --build . --target install
@@ -76,7 +75,7 @@
- docker run --name centos7_toconfigure -v `pwd`:/root/open-license-manager centos:centos7 /bin/bash -c
"yum -y update && yum -y install install centos-release-scl &&
yum -y install cmake boost boost-devel boost-static openssl openssl-devel glibc-static devtoolset-7-toolchain devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-valgrind-devel &&
- cd /root/open-license-manager && mkdir build && cd build &&
+ cd /root/open-license-manager/build &&
CC=/opt/rh/devtoolset-7/root/usr/bin/gcc CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ cmake .."
- docker commit centos7_toconfigure centos7_configured
script:
@@ -85,6 +84,9 @@
- os: linux
dist: bionic
name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
+ env:
+ - CTEST_OUTPUT_ON_FAILURE=1
+ - WINEARCH=win64
addons:
apt:
packages:
@@ -93,10 +95,11 @@
- mingw-w64
- mingw-w64-tools
- mingw-w64-x86-64-dev
+ - wine64-development
+ - wine64-development-preloader
- wine-development
- - wine32-development
+ - wine64
before_script:
- - mkdir build
- cd build
- wget -c https://dl.bintray.com/boostorg/release/1.71.0/source/boost_1_71_0.tar.bz2
- tar xjf boost_1_71_0.tar.bz2
@@ -109,17 +112,15 @@
- os: windows
name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MD)"
before_script:
- - travis_wait 40 ./windows_download_boost.bat
- - cd "${TRAVIS_BUILD_DIR}"
- - mkdir build
- - cd build && cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" ..
+ - travis_wait 40 ./scripts/windows_download_boost.bat
+ - cd "${TRAVIS_BUILD_DIR}/build"
+ - cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" ..
- os: windows
name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MT)"
before_script:
- - travis_wait 40 ./windows_download_boost.bat
+ - travis_wait 40 ./scripts/windows_download_boost.bat
- cd "${TRAVIS_BUILD_DIR}"
- - mkdir build
- cd build && cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT="C:/local/boost" -DSTATIC_RUNTIME=1 ..
- os: windows
@@ -147,17 +148,13 @@
dir
fi
- cd "${TRAVIS_BUILD_DIR}"
- - mkdir build
- - cd build && cmake -G "MinGW Makefiles" --trace-expand -DBOOST_ROOT="C:/local/boost" -DBoost_ARCHITECTURE="-x64" -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID="x64" -DCMAKE_SH="CMAKE_SH-NOTFOUND" ..
-
+ - cd build && cmake -G "MinGW Makefiles" -DBOOST_ROOT="C:/local/boost" -DBoost_ARCHITECTURE="-x64" -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID="x64" -DCMAKE_SH="CMAKE_SH-NOTFOUND" ..
env:
- CTEST_OUTPUT_ON_FAILURE=1
-
before_script:
- - mkdir build
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
script:
- cmake --build . --target install --config Release
- ctest -C Release
-
+
\ No newline at end of file
--
Gitblit v1.9.1