diff --git a/CMakeLists.txt b/CMakeLists.txt index 262732dbec..dd56a4dda9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/NEWS.md b/NEWS.md index e5d048aec9..a5c6d3acb7 100644 --- a/NEWS.md +++ b/NEWS.md @@ -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 diff --git a/README.md b/README.md index 9ce49311c5..5e583b1413 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ 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 @@ -21,6 +21,7 @@ Below are listed all the oce release since the beginning of the project, the OCC | 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 | @@ -60,8 +61,8 @@ We use the following online resources: * Appveyor https://ci.appveyor.com/project/tpaviot/oce -Just ask @tpaviot (tpaviot@gmail.com) or @dbarbier (bouzim@gmail.com) for a -request regarding write access to the repository. +Just ask @tpaviot (tpaviot@gmail.com) for a request regarding write access +to the repository. ## Get the source and compile diff --git a/appveyor-scripts/make-oce-msys.sh b/appveyor-scripts/make-oce-msys.sh index 7856800a9e..dd0fa0ee5a 100644 --- a/appveyor-scripts/make-oce-msys.sh +++ b/appveyor-scripts/make-oce-msys.sh @@ -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 diff --git a/appveyor.yml b/appveyor.yml index 1fc9c9d74d..ca73a316cc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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"