Skip to content

Commit

Permalink
switch Julia wrapper to MIT license
Browse files Browse the repository at this point in the history
* Explain licensing terms of Triangle similar to the cases of FFTW and TetGen
  • Loading branch information
j-fu committed Oct 7, 2021
1 parent 829e591 commit 9d76dbd
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 58 deletions.
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2019 - 2021 Jürgen Fuhrmann

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
55 changes: 0 additions & 55 deletions LICENSE.md

This file was deleted.

4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "Triangulate"
uuid = "f7e6ffb2-c36d-4f8f-a77e-16e897189344"
authors = ["Juergen Fuhrmann <[email protected]>"]
version = "2.0.2"
version = "2.1.0"

[deps]
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
Expand All @@ -12,5 +12,5 @@ Triangle_jll = "5639c1d2-226c-5e70-8d55-b3095415a16a"

[compat]
DocStringExtensions = "^0.8.0"
Triangle_jll = "1.6.0"
julia = "^1.3"
Triangle_jll = "1.6"
27 changes: 26 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,38 @@ Triangulate

Julia wrapper for Jonathan Richard Shewchuk's Triangle mesh generator. The package tries to provide a 1:1 mapping of Triangle's functionality to Julia.

Useful information about Triangle:

## Useful information about Triangle:
- Triangle home page [https://www.cs.cmu.edu/~quake/triangle.html](https://www.cs.cmu.edu/~quake/triangle.html)
with instructions for using Triangle
- [Research credit, references, and online papers](https://www.cs.cmu.edu/~quake/triangle.research.html)
- [Troubleshooting](https://www.cs.cmu.edu/~quake/triangle.trouble.html)
- [Command line switches](https://www.cs.cmu.edu/~quake/triangle.switch.html)


## Licensing

When installing Triangulate.jl, a compiled library version of the Triangle library will be downloaded from the [Triangle_jll.jl](https://github.com/JuliaBinaryWrappers/Triangle_jll.jl) repository. This library is bound to a BSD License with Commercial Use Restriction, but the bindings to the library in this package, Triangulate.jl, are licensed under MIT. This means that code using the Triangle library via the Triangulate.jl bindings is subject to Triangle's licensing terms reproduced here:

````
These programs may be freely redistributed under the condition that the
copyright notices (including the copy of this notice in the code comments
and the copyright notice printed when the `-h' switch is selected) are
not removed, and no compensation is received. Private, research, and
institutional use is free. You may distribute modified versions of this
code UNDER THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT
IN THE SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH
SOURCE AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND
CLEAR NOTICE IS GIVEN OF THE MODIFICATIONS. Distribution of this code as
part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT
WITH THE AUTHOR. (If you are not directly supplying this code to a
customer, and you are instead telling them how they can obtain it for
free, then you are not required to make any arrangement with me.)
````



## Acknowledgement
This package uses ideas from [TriangleMesh.jl](https://github.com/konsim83/TriangleMesh.jl)
and [Triangle.jl](https://github.com/cvdlab/Triangle.jl).

Expand Down

0 comments on commit 9d76dbd

Please sign in to comment.