Skip to content
This repository was archived by the owner on Apr 28, 2023. It is now read-only.

Commit f82e77d

Browse files
tpaviottpaviot
authored
Merge pull request tpaviot#690 from tpaviot/review/appveyor-fix-mingw
Review/appveyor fix mingw
2 parents 3661be5 + a71db8e commit f82e77d

8 files changed

+142
-73
lines changed

‎.travis.yml

+86-19
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,119 @@
11
language: cpp
2+
23
compiler:
34
- gcc
45
- clang
6+
7+
cache:
8+
apt: true
9+
510
env:
611
- RUN_TESTS=false OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=OFF
12+
13+
addons:
14+
apt:
15+
sources:
16+
- ubuntu-toolchain-r-test
17+
packages:
18+
- tcl8.5-dev
19+
- tk8.5-dev
20+
- libgl2ps-dev
21+
- libfreeimage-dev
22+
- libtbb-dev
23+
- tclthread
24+
- libgl1-mesa-dri
25+
- xsltproc
26+
- g++-5
27+
- g++-6
28+
- g++-7
29+
730
matrix:
831
include:
932
- os: linux
1033
compiler: gcc
11-
env: RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
34+
env: MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
35+
dist: trusty
36+
addons:
37+
apt:
38+
sources:
39+
- ubuntu-toolchain-r-test
40+
packages:
41+
- g++-5
42+
- os: linux
43+
compiler: gcc
44+
env: MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
45+
dist: trusty
46+
addons:
47+
apt:
48+
sources:
49+
- ubuntu-toolchain-r-test
50+
packages:
51+
- g++-6
52+
- os: linux
53+
compiler: gcc
54+
env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
55+
addons:
56+
apt:
57+
sources:
58+
- ubuntu-toolchain-r-test
59+
packages:
60+
- g++-7
1261
dist: trusty
1362
- os: linux
1463
compiler: clang
15-
env: RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
64+
env: RUN_TESTS=true OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
1665
dist: trusty
66+
addons:
67+
apt:
68+
sources:
69+
- llvm-toolchain-trusty-4.0
70+
packages:
71+
- clang-4.0
1772
- os: linux
1873
compiler: gcc
19-
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=OFF
74+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=OFF MATRIX_EVAL=""
2075
- os: linux
2176
compiler: gcc
22-
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
77+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON MATRIX_EVAL=""
2378
- os: linux
2479
compiler: gcc
25-
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON OCE_MULTITHREAD_LIBRARY=OPENMP
80+
env: OCE_MULTITHREAD_LIBRARY=OPENMP OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON MATRIX_EVAL=""
2681
- os: linux
2782
compiler: gcc
28-
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON OCE_MULTITHREAD_LIBRARY=TBB
83+
env: OCE_MULTITHREAD_LIBRARY=TBB OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON MATRIX_EVAL=""
2984
- os: osx
3085
compiler: clang
31-
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
86+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
3287
- os: osx
3388
osx_image: xcode8.3
3489
compiler: clang
35-
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
90+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
91+
- os: osx
92+
osx_image: xcode9.2
93+
compiler: clang
94+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
95+
- os: osx
96+
osx_image: xcode9.3beta
97+
compiler: clang
98+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
3699
exclude:
37100
- env: RUN_TESTS=false OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=OFF
38101
allow_failures:
39102
- os: osx
40103
compiler: clang
41-
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
104+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
42105
- os: osx
43106
osx_image: xcode8.3
44107
compiler: clang
45-
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
46-
108+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
109+
- os: osx
110+
osx_image: xcode9.2
111+
compiler: clang
112+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
113+
- os: osx
114+
osx_image: xcode9.3beta
115+
compiler: clang
116+
env: OCE_USE_PCH=ON OCE_COPY_HEADERS_BUILD=ON
47117

48118
before_install:
49119
# osx
@@ -55,15 +125,9 @@ before_install:
55125
fi
56126
# linux
57127
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
58-
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test;
59-
sudo apt-get update -q;
60-
sudo apt-get install tcl8.5-dev tk8.5-dev libgl2ps-dev libfreeimage-dev libtbb-dev;
61-
sudo apt-get install tclthread;
62-
sudo apt-get install libgl1-mesa-dri;
63-
sudo apt-get install xsltproc;
64-
sudo apt-get install -qq gcc-5 g++-5;
65-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5;
128+
eval "${MATRIX_EVAL}";
66129
fi
130+
67131
before_script:
68132
# Initialize xvfb server
69133
# Depth is necessary, otherwise DRAWEXE exits with this message:
@@ -78,7 +142,9 @@ before_script:
78142
fi
79143
- mkdir cmake-build
80144
- cd cmake-build
145+
81146
script: sh ../.travis.build.sh
147+
82148
after_script:
83149
- test ! -r occt/summary.xml || xsltproc --param duration 1 ../.travis.xsl occt/summary.xml
84150
- if [ -r occt/summary.xml ]; then
@@ -89,6 +155,7 @@ after_script:
89155
for file in $(cat occt/summary.failed); do head -n -1 occt/$file.{tcl,log}; done;
90156
fi;
91157
fi
158+
92159
branches:
93160
only:
94161
- master

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set(OCE_VERSION_MINOR 18)
2525
# (uncomment following line)
2626
set(OCE_VERSION_PATCH 3)
2727
# Empty for official releases, set to -dev, -rc1, etc for development releases
28-
set(OCE_VERSION_DEVEL -dev)
28+
set(OCE_VERSION_DEVEL)
2929

3030
# bugfix release: add ${OCE_VERSION_PATCH} to OCE_VERSION
3131
set(OCE_VERSION ${OCE_VERSION_MAJOR}.${OCE_VERSION_MINOR}${OCE_VERSION_DEVEL})

‎NEWS.md

+21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,24 @@
1+
### Version 0.18.3 - February 2018
2+
3+
This version is binary compatible with OCE 0.18.x
4+
5+
* Fix some typos / some rephrasing in README
6+
7+
* Update for vtk 8
8+
9+
* Fixed osx issue with xlocale
10+
11+
* Added missing Precision.hxx header
12+
13+
* Added missing header in Quantity_Color_1.hxx
14+
15+
* Fixed MinGW issue in OSD_MemInfo.cxx
16+
17+
* travis-ci (gcc-5/6/7, osx images) and appveyor updates (Mingw)
18+
19+
Users who contributed to this release:
20+
Thomas Séverin, Janus Weil, Michael Gielda, Nicolas Vuaille, Thomas Paviot
21+
122
### Version 0.18.2 - August 2017
223

324
This version is binary compatible with OCE 0.18.x

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ oce stands for **o**pencascade **c**ommunity **e**dition. This project aims at g
1313

1414
You can download source code as well as precompiled binaries for Windows at:
1515

16-
**[oce-0.18.2](https://github.com/tpaviot/oce/releases/tag/OCE-0.18.2)** (August 2017)
16+
**[oce-0.18.3](https://github.com/tpaviot/oce/releases/tag/OCE-0.18.3)** (February 2018)
1717

1818
## OCE history
1919

2020
Below are listed all the oce releases since the beginning of the project, the matching OCCT version, as well as ABI Change if any (an ABI change means that OCE binaries are not compatible with previous ones).
2121

2222
| OCE release number | ABI Change | OCE release date | OCCT version |
2323
| ------------- | ------------- | ------------- |------------- |
24+
| [0.18.3](https://github.com/tpaviot/oce/releases/tag/OCE-0.18.3) | No | February | 6.9.1
2425
| [0.18.2](https://github.com/tpaviot/oce/releases/tag/OCE-0.18.2) | No | August 2017 | 6.9.1
2526
| [0.18.1](https://github.com/tpaviot/oce/releases/tag/OCE-0.18.1) | No | May 2017 | 6.9.1
2627
| [0.18](https://github.com/tpaviot/oce/releases/tag/OCE-0.18) | Yes | January 2017 | 6.9.1

‎appveyor-scripts/make-oce-msys.bat

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
cd C:\projects\oce
2+
mkdir cmake-build
3+
cd cmake-build
4+
cmake -DOCE_VISUALISATION:BOOL=ON ^
5+
-DOCE_DATAEXCHANGE:BOOL=OFF ^
6+
-DOCE_OCAF:BOOL=OFF ^
7+
-DOCE_WITH_GL2PS:BOOL=ON ^
8+
-DOCE_WITH_FREEIMAGE:BOOL=OFF ^
9+
-DOCE_TESTING:BOOL=ON ^
10+
-DOCE_COPY_HEADERS_BUILD:BOOL=ON ^
11+
-DOCE_INSTALL_PREFIX=C:\oce-0.18.3 ^
12+
-G "%generator%" ..
13+
mingw32-make -j5
14+
mingw32-make install
15+
dir
16+
dir C:\oce-0.18.3
17+
set PATH=%PATH%;C:\oce-0.18.3\bin
18+
mingw32-make test
19+
cd ..

‎appveyor-scripts/make-oce-msys.sh

-42
This file was deleted.

‎appveyor.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,18 @@ version: oce-0.18.3.{build}
33
environment:
44
oce_version: 0.18.3
55
matrix:
6-
- generator: "MSYS Makefiles"
6+
- generator: "MinGW Makefiles"
77
ARCH: "i686"
8-
Compiler: MinGW-gcc-4.9.3
9-
- generator: "MSYS Makefiles"
8+
Compiler: MinGW-gcc-5.3.0
9+
BINDIR: C:\MinGW\bin
10+
- generator: "MinGW Makefiles"
1011
ARCH: "Win64"
11-
Compiler: MinGW64-gcc-5.4.0
12+
Compiler: MinGW64-gcc-6.3.0
13+
BINDIR: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin
14+
- generator: "MinGW Makefiles"
15+
ARCH: "Win64"
16+
Compiler: MinGW64-gcc-7.2.0
17+
BINDIR: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
1218
- generator: "Visual Studio 12"
1319
ARCH: "Win32"
1420
Compiler: "MSVC2013"
@@ -22,10 +28,6 @@ environment:
2228
ARCH: "Win64"
2329
Compiler: "MSVC2015"
2430

25-
cache:
26-
- i686-4.9.3-release-posix-dwarf-rt_v4-rev1.7z
27-
- x86_64-5.4.0-release-posix-seh-rt_v5-rev0.7z
28-
2931
configuration:
3032
- Release
3133

@@ -46,7 +48,9 @@ install:
4648
- cmd: CALL FetchBundle.bat
4749

4850
build_script:
49-
- cmd: if "%generator%" == "MSYS Makefiles" (C:\MinGW\msys\1.0\bin\sh --login /c/projects/oce/appveyor-scripts/make-oce-msys.sh)
51+
- if "%generator%"=="MinGW Makefiles" (set "PATH=%PATH:C:\Program Files\Git\usr\bin;=%")
52+
- if not "%BINDIR%"=="" (set "PATH=%PATH%;%BINDIR%")
53+
- if "%generator%" == "MinGW Makefiles" (CALL C:\projects\oce\appveyor-scripts\make-oce-msys.bat)
5054
else (CALL C:\projects\oce\appveyor-scripts\make-oce-msvc.bat)
5155

5256
after_build:

‎src/OSD/OSD_MemInfo.cxx

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#if (defined(_WIN32) || defined(__WIN32__))
1717
#if defined(__MINGW32__)
1818
#define WIN32_WINNT 0x0500
19-
#define WINVER 0x0500
2019
#endif
2120
#include <windows.h>
2221
#include <winbase.h>

0 commit comments

Comments
 (0)