Skip to content

Commit 0647037

Browse files
committed
Test appveyor build Py27 with webengine
1 parent e6bd99e commit 0647037

20 files changed

Lines changed: 1625 additions & 2 deletions

.ci/install.sh

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
if [[ "$(uname -s)" == 'Darwin' ]]; then
6+
brew update || brew update
7+
brew outdated pyenv || brew upgrade pyenv
8+
brew install pyenv-virtualenv
9+
brew install cmake || true
10+
11+
if which pyenv > /dev/null; then
12+
eval "$(pyenv init -)"
13+
fi
14+
15+
pyenv install 3.7.1
16+
pyenv virtualenv 3.7.1 conan
17+
pyenv rehash
18+
pyenv activate conan
19+
fi
20+
21+
pip install conan --upgrade
22+
pip install conan_package_tools bincrafters_package_tools
23+
24+
conan user

.ci/run.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
3+
set -ex
4+
5+
if [[ "$(uname -s)" == 'Darwin' ]]; then
6+
if which pyenv > /dev/null; then
7+
eval "$(pyenv init -)"
8+
fi
9+
pyenv activate conan
10+
fi
11+
12+
python build.py

.circleci/config.yml

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
version: 2
2+
.conan-steps: &conan-steps
3+
parallelism: 4
4+
steps:
5+
- checkout
6+
- run:
7+
name: Update Conan package
8+
command: |
9+
chmod +x .ci/install.sh
10+
.ci/install.sh
11+
- run:
12+
name: Build recipe
13+
command: |
14+
export CONAN_CURRENT_PAGE=$((${CIRCLE_NODE_INDEX}+1))
15+
export CONAN_TOTAL_PAGES=${CIRCLE_NODE_TOTAL}
16+
chmod +x .ci/run.sh
17+
.ci/run.sh
18+
19+
jobs:
20+
gcc-49:
21+
docker:
22+
- image: conanio/gcc49
23+
environment:
24+
- CONAN_GCC_VERSIONS: "4.9"
25+
<<: *conan-steps
26+
27+
gcc-5:
28+
docker:
29+
- image: conanio/gcc5
30+
environment:
31+
- CONAN_GCC_VERSIONS: "5"
32+
<<: *conan-steps
33+
34+
gcc-6:
35+
docker:
36+
- image: conanio/gcc6
37+
environment:
38+
- CONAN_GCC_VERSIONS: "6"
39+
<<: *conan-steps
40+
41+
gcc-7:
42+
docker:
43+
- image: conanio/gcc7
44+
environment:
45+
- CONAN_GCC_VERSIONS: "7"
46+
<<: *conan-steps
47+
48+
gcc-8:
49+
docker:
50+
- image: conanio/gcc8
51+
environment:
52+
- CONAN_GCC_VERSIONS: "8"
53+
<<: *conan-steps
54+
55+
clang-39:
56+
docker:
57+
- image: conanio/clang39
58+
environment:
59+
- CONAN_CLANG_VERSIONS: "3.9"
60+
<<: *conan-steps
61+
62+
clang-40:
63+
docker:
64+
- image: conanio/clang40
65+
environment:
66+
- CONAN_CLANG_VERSIONS: "4.0"
67+
<<: *conan-steps
68+
69+
clang-50:
70+
docker:
71+
- image: conanio/clang50
72+
environment:
73+
- CONAN_CLANG_VERSIONS: "5.0"
74+
<<: *conan-steps
75+
76+
clang-60:
77+
docker:
78+
- image: conanio/clang60
79+
environment:
80+
- CONAN_CLANG_VERSIONS: "6.0"
81+
<<: *conan-steps
82+
83+
84+
workflows:
85+
version: 2
86+
build_and_test:
87+
jobs:
88+
- gcc-49
89+
- gcc-5
90+
- gcc-6
91+
- gcc-7
92+
- gcc-8
93+
- clang-39
94+
- clang-40
95+
- clang-50
96+
- clang-60

.gitignore

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Compiled Object files
2+
*.slo
3+
*.lo
4+
*.o
5+
*.obj
6+
7+
# Precompiled Headers
8+
*.gch
9+
*.pch
10+
11+
# Compiled Dynamic libraries
12+
*.so
13+
*.dylib
14+
*.dll
15+
16+
# Fortran module files
17+
*.mod
18+
*.smod
19+
20+
# Compiled Static libraries
21+
*.lai
22+
*.la
23+
*.a
24+
*.lib
25+
26+
# Executables
27+
*.exe
28+
*.out
29+
*.app
30+
31+
# Cache
32+
__pycache__/*
33+
test_package/__pycache__/*
34+
test_package/build/*
35+
build/*
36+
*.pyc
37+
tmp/
38+
39+
# IDE
40+
.idea/*
41+
.project
42+
.pydevproject
43+
.settings/*
44+
.ropeproject/*

.travis.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
env:
2+
global:
3+
- CONAN_TOTAL_PAGES=8
4+
- CONAN_DOCKER_32_IMAGES=True
5+
osx: &osx
6+
os: osx
7+
language: generic
8+
matrix:
9+
include:
10+
- <<: *osx
11+
osx_image: xcode10.1
12+
env: CONAN_APPLE_CLANG_VERSIONS=10.0 CONAN_CURRENT_PAGE=1
13+
- <<: *osx
14+
osx_image: xcode10.1
15+
env: CONAN_APPLE_CLANG_VERSIONS=10.0 CONAN_CURRENT_PAGE=2
16+
- <<: *osx
17+
osx_image: xcode10.1
18+
env: CONAN_APPLE_CLANG_VERSIONS=10.0 CONAN_CURRENT_PAGE=3
19+
- <<: *osx
20+
osx_image: xcode10.1
21+
env: CONAN_APPLE_CLANG_VERSIONS=10.0 CONAN_CURRENT_PAGE=4
22+
install:
23+
- chmod +x .ci/install.sh
24+
- ./.ci/install.sh
25+
script:
26+
- chmod +x .ci/run.sh
27+
- ./.ci/run.sh

3f9c9db.diff

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
From 3f9c9db15d95fe52438971d8c1d01dfe00c23c6c Mon Sep 17 00:00:00 2001
2+
From: Kai Koehne <kai.koehne@qt.io>
3+
Date: Tue, 30 Jul 2019 11:07:18 +0200
4+
Subject: [PATCH] Use pkg-config --libs-only-other to resolve e.g. -pthread
5+
6+
Fixes: QTBUG-77159
7+
Change-Id: If9ab3797ccfb52c6b96a4ab120c59fd8896d5466
8+
---
9+
10+
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
11+
index 242544d..f759d04 100644
12+
--- a/mkspecs/features/qt_configure.prf
13+
+++ b/mkspecs/features/qt_configure.prf
14+
@@ -823,7 +823,8 @@
15+
contains($${1}.libs, ".*\\.$${QMAKE_EXTENSION_STATICLIB}$") {
16+
qtRunLoggedCommand("$$pkg_config --static --libs-only-L $$args", libpaths)|return(false)
17+
qtRunLoggedCommand("$$pkg_config --static --libs-only-l $$args", libs)|return(false)
18+
- eval(libs = $$libpaths $$libs)
19+
+ qtRunLoggedCommand("$$pkg_config --static --libs-only-other $$args", libs_other)|return(false)
20+
+ eval(libs = $$libpaths $$libs $$libs_other)
21+
!qtConfResolveLibs($${1}.libs, $$libs): \
22+
return(false)
23+
}

LICENSE.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2017 - 2019 Bincrafters
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
# conan-qt
2-
Build qt with webengine - based on bincrafters qt
1+
## Conan package recipe for [*qt*](https://www.qt.io)
2+
3+
Modified from original https://github.com/bincrafters/conan-qt to build webengine
4+
5+
[MIT](https://github.com/bincrafters/conan-qt/blob/stable/5.12.4/LICENSE.md)

appveyor.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
build: false
2+
3+
environment:
4+
PYTHON_HOME: "C:\\Python27"
5+
6+
CONAN_TOTAL_PAGES: 6
7+
8+
matrix:
9+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
10+
CONAN_VISUAL_VERSIONS: 15
11+
CONAN_BUILD_TYPES: Release
12+
CONAN_CURRENT_PAGE: 1
13+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
14+
CONAN_VISUAL_VERSIONS: 15
15+
CONAN_BUILD_TYPES: Release
16+
CONAN_CURRENT_PAGE: 2
17+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
18+
CONAN_VISUAL_VERSIONS: 15
19+
CONAN_BUILD_TYPES: Release
20+
CONAN_CURRENT_PAGE: 3
21+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
22+
CONAN_VISUAL_VERSIONS: 15
23+
CONAN_BUILD_TYPES: Release
24+
CONAN_CURRENT_PAGE: 4
25+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
26+
CONAN_VISUAL_VERSIONS: 15
27+
CONAN_BUILD_TYPES: Release
28+
CONAN_CURRENT_PAGE: 5
29+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
30+
CONAN_VISUAL_VERSIONS: 15
31+
CONAN_BUILD_TYPES: Release
32+
CONAN_CURRENT_PAGE: 6
33+
34+
install:
35+
- set PATH=%PYTHON_HOME%;%PYTHON_HOME%/Scripts/;%PATH%
36+
- pip.exe install conan --upgrade
37+
- pip.exe install conan_package_tools bincrafters_package_tools
38+
- conan user # It creates the conan data directory
39+
40+
test_script:
41+
- python build.py

0 commit comments

Comments
 (0)