Merge pull request #476 from tpaviot/review/release-OCE-0.15

Update CMakeLists.txt and NEWS to release OCE 0.15

BUILD.MSVC.txt

@@ -43,7 +43,6 @@ precompiled binaries if you just want to use it in a supported compiler.
     Some modules of OCE require external libraries. These include
 
     - freetype , required by Visualization
-    - FTGL , required by Visualization
     - TCL , required by DRAW
     - gl2ps and FreeImage , optionally required by Visualization
     - TBB , optionally required to to multithreading
@@ -242,4 +241,4 @@ precompiled binaries if you just want to use it in a supported compiler.
   9.2) Debug symbols 
     If you include them in the INSTALL directory, you will be able to see OCE call stacks and local variables. The INSTALL dir will grow in size
     of about 200MB.
-
+

CMakeLists.txt

@@ -25,12 +25,12 @@ set(OCE_VERSION_MINOR 15)
 # (uncomment following line)
 #set(OCE_VERSION_PATCH 0)
 #  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 7)
+set(OCE_ABI_SOVERSION 8)
 set(OCE_ABI_VERSION ${OCE_ABI_SOVERSION}.0.0)
 
 # Set the minimum version of cmake required to 2.6
@@ -80,7 +80,7 @@ endif(CMAKE_BUILD_TOOL STREQUAL "nmake")
 
 if(MSVC)
 	option_with_default( OCE_INSTALL_PDB_FILES "Install PDB files (debug informations)" ON )
-	option_with_default( OCE_MULTITHREADED_BUILD "Multithreaded build (/CL Option)" ON )
+	option_with_default( OCE_MULTITHREADED_BUILD "Multithreaded build (/MP Option)" ON )
 endif(MSVC)
 
 ############################

INSTALL.Unix

@@ -66,14 +66,7 @@ can run these commands:
 ==================
 More expert options can be defined in the "Advanced mode".
 
-2.2.1 FTGL note:
-==============
-OCE supports either ftgl-2.1.2 or the latest ftgl-2.1.3-rc5. If you wish to
-build OCE over ftgl-2.1.2, define the FTGL_V212_INCLUDE_DIR variable instead
-of FTGL_INCLUDE_DIR.  For instance,
- flags="$flags -DFTGL_V212_INCLUDE_DIR:PATH=/opt/ftgl-2.1.2/include"
-
-2.2.2 Additional flags:
+2.2.1 Additional flags:
 =====================
 OCE can be compiled with TBB or OpenMP in order to support parallel meshing.
 By default, this support is disabled.  Enable it with

NEWS

@@ -1,3 +1,31 @@
+Version 0.15 - February 2014
+
+This version is not binary compatible with OCE 0.14.1, OCE_ABI_SOVERSION
+was incremented.
+
+* Upgraded to OCCT 6.7.0
+
+* Relicensed to LGPL 2.1.
+
+* Many bug and warning fixes detected by static analysis and compilers.
+
+* Add support for OCCT tests.
+
+* Build OCE and run tests on travis-ci.org service.
+
+* Build system improvements and additions
+  - Added multithreaded build option for MSVC.
+  - Build improvements and fixes with MSVC and Mingw.
+  - Fix build failures with Borland compiler.
+  - Fix build failures with Mesa 10.
+  - Various CMake improvements when compiling with bundle.
+  - Removed OCE_DISABLE_TKSERVICE_FONT option, it is no more possible
+    to build TKService without freetype.
+
+Users who contributed to this release:
+  Denis Barbier, Thomas Paviot, QbProg, Fotios Sioutis, Johannes Obermayr,
+  Jacob Abel, Benjamin Bihler
+
 Version 0.14.1 - January 2014
 
 This version is binary compatible with 0CE 0.14.

README.md

@@ -1,31 +1,48 @@
+Travis-CI Build Status :
 [![Build Status](https://travis-ci.org/tpaviot/oce.png?branch=master)](https://travis-ci.org/tpaviot/oce)
 
 oce stands for *o*pencascade *c*ommunity *e*dition.
 
-This project aims at gathering patches/changes/improvements from the OCC community over the latest release
-(currently OCCT 6.7.0).
+This project aims at gathering patches/changes/improvements from the OCC
+community over the latest release (currently OCCT 6.7.0).
 
 We use the following online resources:
   * Sources
        https://github.com/tpaviot/oce
   * Binaries
-       http://code.google.com/p/oce-binaries/downloads/
+       oce < 0.14: http://code.google.com/p/oce-binaries/downloads/
+       oce >= 0.14: Google Drive at http://bit.ly/1kvDoTN
   * Bug tracker
        https://github.com/tpaviot/oce/issues
   * Mailing list
        http://groups.google.com/group/oce-dev/about
+  * Travic-CI
+       https://travis-ci.org/tpaviot/oce
 
-Just email [email protected] for a request regarding write access to the repository.
+Just ask @tpaviot ([email protected]) or @dbarbier ([email protected]) for a
+request regarding write access to the repository.
 
 How to create a local copy of the repository?
 =============================================
- git clone git://github.com/tpaviot/oce.git
+
+    git clone git://github.com/tpaviot/oce.git
 
 How to stay up to date with latest developements?
 =================================================
- cd oce
- git pull
+
+    cd oce
+    git pull
 
 How to compile on Unix?
 =======================
+
 Read INSTALL.Unix file for instructions on compiling.
+
+License
+=======
+
+OCE has the same license as OCCT; since OCCT 6.7.0, you can redistribute it
+and/or modify it under the terms of the GNU Lesser General Public License
+version 2.1 as published by the Free Software Foundation, with special
+exception defined in the file OCCT_LGPL_EXCEPTION.txt.
+See LICENSE_LGPL_21.txt for the full license text.