Skip to content

Commit

Permalink
[SCons] Reformat libexecstream license and add to merged license file
Browse files Browse the repository at this point in the history
  • Loading branch information
speth committed Jun 24, 2016
1 parent e71f22a commit c557fa8
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 74 deletions.
3 changes: 2 additions & 1 deletion ext/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ from buildutils import *
Import('env', 'build', 'install', 'libraryTargets')
localenv = env.Clone()

license_files = [('Cantera', '#License.txt')]
license_files = [('Cantera', '#License.txt'),
('Libexecstream', 'libexecstream/doc/license.txt')]

def prep_default(env):
localenv = env.Clone()
Expand Down
73 changes: 0 additions & 73 deletions ext/libexecstream/doc/license.html

This file was deleted.

32 changes: 32 additions & 0 deletions ext/libexecstream/doc/license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
The libexecstream library license

Libexecsteam copyright Artem Khodush, 2004.

License

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

3. The name of the author may not be used to endorse or promote
products derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

0 comments on commit c557fa8

Please sign in to comment.