Skip to content

Commit

Permalink
Merge pull request #650 from tpaviot/review/prepare-0.18
Browse files Browse the repository at this point in the history
Review/prepare 0.18
  • Loading branch information
tpaviot authored Jan 13, 2017
2 parents a16a1d0 + 262af2a commit 715efd1
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ set(OCE_VERSION_MINOR 18)
# (uncomment following line)
set(OCE_VERSION_PATCH)
# Empty for official releases, set to -dev, -rc1, etc for development releases
set(OCE_VERSION_DEVEL -dev)
set(OCE_VERSION_DEVEL)

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

set(OCE_ABI_SOVERSION 10)
set(OCE_ABI_SOVERSION 11)
set(OCE_ABI_VERSION ${OCE_ABI_SOVERSION}.0.0)

# Set the minimum version of cmake required to 2.6
Expand Down
18 changes: 18 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
### Version 0.18 - January 2017

This version is not binary compatible with OCE 0.17.x, OCE_ABI_SOVERSION
was incremented.

* Upgraded to OCCT 6.9.1
http://www.opencascade.com/pub/doc/Release_Notes_6.7.0.pdf
* Support VTK OpenGL2 backend

* 0027385: assertion in static initializer in a Windows GUI application

* Removed outdated OpenCL option

* Fix null pointer access in BRepMesh_EdgeTessellator

Users who contributed to this release:
blobfish, Florian Chevassu, Julien Finet, Thomas Paviot

### Version 0.17.2 - May 2016

This version is binary compatible with 0CE 0.17 and OCE 0.17.1
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@ oce stands for **o**pencascade **c**ommunity **e**dition. This project aims at g

You can download source code as well as precompiled binaries for windows at:

**[oce-0.17.2](https://github.com/tpaviot/oce/releases/tag/OCE-0.17.2)** (June 2016)
**[oce-0.18](https://github.com/tpaviot/oce/releases/tag/OCE-0.18)** (January 2017)

## OCE history

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

| OCE release number | ABI Change | OCE release date | OCCT version |
| ------------- | ------------- | ------------- |------------- |
| [0.18](https://github.com/tpaviot/oce/releases/tag/OCE-0.18) | Yes | January 2017 | 6.9.1
| [0.17.2](https://github.com/tpaviot/oce/releases/tag/OCE-0.17.2) | No | June 2016 | 6.8.0
| [0.17.1](https://github.com/tpaviot/oce/releases/tag/OCE-0.17.1) | No | January 2016 | 6.8.0 |
| [0.17](https://github.com/tpaviot/oce/releases/tag/OCE-0.17) | Yes | March 2015 | 6.8.0 |
Expand Down Expand Up @@ -60,8 +61,8 @@ We use the following online resources:
* Appveyor
https://ci.appveyor.com/project/tpaviot/oce

Just ask @tpaviot ([email protected]) or @dbarbier ([email protected]) for a
request regarding write access to the repository.
Just ask @tpaviot ([email protected]) for a request regarding write access
to the repository.

## Get the source and compile

Expand Down
4 changes: 2 additions & 2 deletions appveyor-scripts/make-oce-msys.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ cmake -DOCE_VISUALISATION:BOOL=ON \
-DOCE_WITH_FREEIMAGE:BOOL=OFF \
-DOCE_TESTING:BOOL=ON \
-DOCE_COPY_HEADERS_BUILD:BOOL=ON \
-DOCE_INSTALL_PREFIX=C:\\oce-0.18-dev \
-DOCE_INSTALL_PREFIX=C:\\oce-0.18 \
-G'MSYS Makefiles' ..
mingw32-make -j4
mingw32-make install > /dev/null
#
# Finally run tests
#
export PATH=$PATH:/c/MinGW/bin:/c/oce-0.18-dev/$ARCH/bin:/c/MinGW/bin:
export PATH=$PATH:/c/MinGW/bin:/c/oce-0.18/$ARCH/bin:/c/MinGW/bin:
mingw32-make test
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: oce-0.18-dev.{build}
version: oce-0.18.{build}

environment:
oce_version: 0.18-dev
oce_version: 0.18
matrix:
- generator: "MSYS Makefiles"
ARCH: "i686"
Expand Down

0 comments on commit 715efd1

Please sign in to comment.