From 1d526888a206f3857186b0063e608a61585ea08c Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 25 Jun 2015 18:09:33 +0200 Subject: [PATCH 01/13] Add build status --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 6cabe32..5f55af0 100644 --- a/README.md +++ b/README.md @@ -96,3 +96,8 @@ same conditions as regards security. The fact that you are presently reading this means that you have had knowledge of the CeCILL-B license and that you accept its terms. + +Build status +============ + +[![Build Status](https://travis-ci.org/fougue/gmio.png)](https://travis-ci.org/fougue/gmio) From 02a0cfb5462f9f3e24002f83e860df42f2b8a9f2 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 25 Jun 2015 18:19:08 +0200 Subject: [PATCH 02/13] Build debug and release variants --- .travis.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index adaafc7..8586168 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,16 @@ compiler: env: matrix: - - LINUX=1 TRAVIS_SHARED_LIBS=ON + - LINUX=1 TRAVIS_TRAVIS_SHARED_LIBS=ON - LINUX=1 TRAVIS_SHARED_LIBS=OFF script: - - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS + - mkdir debug && cd debug + - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_DEBUG_POSTFIX=d -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install - make - \ No newline at end of file + - make install + - + - cd .. && mkdir release && cd release + - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install + - make install + From 198326e885bcaa4f87065cd52152e1ce0a91a7ca Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 25 Jun 2015 18:22:41 +0200 Subject: [PATCH 03/13] Fix cmake step --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8586168..8456b5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,11 @@ env: script: - mkdir debug && cd debug - - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_DEBUG_POSTFIX=d -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install + - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_DEBUG_POSTFIX=d -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install - make - make install - - cd .. && mkdir release && cd release - - cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install + - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install - make install From 946a10fe6828173e714526533d4478a3843d33b8 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Thu, 25 Jun 2015 18:25:10 +0200 Subject: [PATCH 04/13] Set "_d" for debug suffix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8456b5f..f49b3d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ env: script: - mkdir debug && cd debug - - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_DEBUG_POSTFIX=d -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install + - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_DEBUG_POSTFIX=_d -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install - make - make install - From 30edf3f86cb5e443d5c4f11556a1140c3c44da5f Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 26 Jun 2015 09:28:49 +0200 Subject: [PATCH 05/13] Add "travis" title for build status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5f55af0..ffe21c7 100644 --- a/README.md +++ b/README.md @@ -100,4 +100,4 @@ knowledge of the CeCILL-B license and that you accept its terms. Build status ============ -[![Build Status](https://travis-ci.org/fougue/gmio.png)](https://travis-ci.org/fougue/gmio) +Travis (linux_x64) : [![Build Status](https://travis-ci.org/fougue/gmio.png)](https://travis-ci.org/fougue/gmio) From 1622ad8984eabf2c8f6fbe74fe50b2fde3121a00 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 26 Jun 2015 09:56:19 +0200 Subject: [PATCH 06/13] Copy/Pase Travis status badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ffe21c7..8ea1d77 100644 --- a/README.md +++ b/README.md @@ -100,4 +100,4 @@ knowledge of the CeCILL-B license and that you accept its terms. Build status ============ -Travis (linux_x64) : [![Build Status](https://travis-ci.org/fougue/gmio.png)](https://travis-ci.org/fougue/gmio) +Travis (linux_x64) : [![Build Status](https://travis-ci.org/fougue/gmio.svg?branch=master)](https://travis-ci.org/fougue/gmio) From 5ccecc58ea0adc330b2ad69536b7bf885c409c8c Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 26 Jun 2015 09:59:02 +0200 Subject: [PATCH 07/13] Add AppVeyor status badge --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 8ea1d77..f8c7091 100644 --- a/README.md +++ b/README.md @@ -101,3 +101,6 @@ Build status ============ Travis (linux_x64) : [![Build Status](https://travis-ci.org/fougue/gmio.svg?branch=master)](https://travis-ci.org/fougue/gmio) +AppVeyor (Windows) : [![Build status](https://ci.appveyor.com/api/projects/status/0q4f69lqo6sw9108?svg=true)](https://ci.appveyor.com/project/HuguesDelorme/gmio) + + From 21eb0fcaecb406f029e55af304e5871d18230aa5 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 26 Jun 2015 09:59:29 +0200 Subject: [PATCH 08/13] Fix line break --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f8c7091..ba4b7e8 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ knowledge of the CeCILL-B license and that you accept its terms. Build status ============ -Travis (linux_x64) : [![Build Status](https://travis-ci.org/fougue/gmio.svg?branch=master)](https://travis-ci.org/fougue/gmio) +Travis (linux_x64) : [![Build Status](https://travis-ci.org/fougue/gmio.svg?branch=master)](https://travis-ci.org/fougue/gmio) AppVeyor (Windows) : [![Build status](https://ci.appveyor.com/api/projects/status/0q4f69lqo6sw9108?svg=true)](https://ci.appveyor.com/project/HuguesDelorme/gmio) From 66b4d9e93f250c9c1fde6c90f43a8b7274f6927a Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 26 Jun 2015 10:35:30 +0200 Subject: [PATCH 09/13] Add TRAVIS_STRICT_C90 param to travis build matrix --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f49b3d4..ae4607f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,16 +5,18 @@ compiler: env: matrix: - - LINUX=1 TRAVIS_TRAVIS_SHARED_LIBS=ON - - LINUX=1 TRAVIS_SHARED_LIBS=OFF + - LINUX=1 TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=OFF + - LINUX=1 TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF + - LINUX=1 TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON + - LINUX=1 TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=ON script: - mkdir debug && cd debug - - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_DEBUG_POSTFIX=_d -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install + - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_DEBUG_POSTFIX=_d -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DBUILD_STRICT_C90=$TRAVIS_STRICT_C90 -DCMAKE_INSTALL_PREFIX=../install - make - make install - - cd .. && mkdir release && cd release - - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=../install + - cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=$TRAVIS_SHARED_LIBS -DBUILD_STRICT_C90=$TRAVIS_STRICT_C90 -DCMAKE_INSTALL_PREFIX=../install - make install From a6c20ddc20c030c15ee3b457a43a6cdcca9f74eb Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 26 Jun 2015 12:40:29 +0200 Subject: [PATCH 10/13] Reorganize REAME.md --- README.md | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index ba4b7e8..4cf34bb 100644 --- a/README.md +++ b/README.md @@ -14,13 +14,17 @@ Main highlights: * Buffering of input/ouput for efficient device usage * Available under the CeCILL-B license, which is fully BSD compatible -Current version only supports STL file format (STereoLithography). Support of -STL is complete: + +Supported CAD files format +========================== + +Current version only supports the STL file format (STereoLithography), but support is complete : * Binary(little/big endian) and ASCII formats * Header data and "attribute byte count" for binary format * Name of solid for ASCII format * Detection of the input data format + * Ability to specify the text formatting to represent float values (ASCII formats) In addition, the STL module has the following advatanges: @@ -77,25 +81,6 @@ modify and/ or redistribute the software under the terms of the CeCILL-B license as circulated by CEA, CNRS and INRIA at the following URL http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -As a counterpart to the access to the source code and rights to copy, -modify and redistribute granted by the license, users are provided only -with a limited warranty and the software's author, the holder of the -economic rights, and the successive licensors have only limited -liability. - -In this respect, the user's attention is drawn to the risks associated -with loading, using, modifying and/or developing or reproducing the -software by the user in light of its specific status of free software, -that may mean that it is complicated to manipulate, and that also -therefore means that it is reserved for developers and experienced -professionals having in-depth computer knowledge. Users are therefore -encouraged to load and test the software's suitability as regards their -requirements in conditions enabling the security of their systems and/or -data to be ensured and, more generally, to use and operate it in the -same conditions as regards security. - -The fact that you are presently reading this means that you have had -knowledge of the CeCILL-B license and that you accept its terms. Build status ============ From 9536dc133be26f8e885f4f7808da8732c75e32b0 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 26 Jun 2015 12:43:49 +0200 Subject: [PATCH 11/13] travis: add clang compiler --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ae4607f..cbb7891 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: cpp compiler: - gcc + - clang env: matrix: From 54f62d345ea8b63a7b413d0de4fd753bcc5fdf53 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 26 Jun 2015 12:46:49 +0200 Subject: [PATCH 12/13] travis: just indent matrix to feel like a table --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbb7891..adbf3de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ compiler: env: matrix: - - LINUX=1 TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=OFF + - LINUX=1 TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=OFF - LINUX=1 TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF - - LINUX=1 TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON + - LINUX=1 TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON - LINUX=1 TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=ON script: From 1941a24265ae5175e0ed67802cbbe450b0138e2a Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Fri, 26 Jun 2015 13:18:11 +0200 Subject: [PATCH 13/13] travis: try build on OSX --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index adbf3de..52b477b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ env: - LINUX=1 TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF - LINUX=1 TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON - LINUX=1 TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=ON + - OSX=1 TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF script: - mkdir debug && cd debug