diff --git a/LICENSE-BOOST b/LICENSE-BOOST
new file mode 100644
index 0000000..127a5bc
--- /dev/null
+++ b/LICENSE-BOOST
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index fe1c1ca..4f3eb22 100644
--- a/README.md
+++ b/README.md
@@ -279,7 +279,7 @@ under the Apache 2.0 license.
Licensed under either of Apache License, Version
-2.0 or MIT license at your option.
+2.0 or MIT license or BOOST license .
@@ -287,5 +287,5 @@ Licensed under either of Apache License, Version
Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in this repository by you, as defined in the Apache-2.0 license,
-shall be dual licensed as above, without any additional terms or conditions.
+shall be triple licensed as above, without any additional terms or conditions.
diff --git a/script/amalgamate.py b/script/amalgamate.py
index 6a25459..ced3f6b 100644
--- a/script/amalgamate.py
+++ b/script/amalgamate.py
@@ -10,10 +10,10 @@ for filename in ['AUTHORS', 'CONTRIBUTORS']:
text += '// fast_float by ' + line
if filename == 'CONTRIBUTORS':
text += '// with contributions from ' + line
- processed_files[filename] = text + '//\n'
+ processed_files[filename] = text + '//\n//\n'
# licenses
-for filename in ['LICENSE-MIT', 'LICENSE-APACHE']:
+for filename in ['LICENSE-MIT', 'LICENSE-APACHE', 'LICENSE-BOOST']:
lines = []
with open(filename, encoding='utf8') as f:
lines = f.readlines()
@@ -44,14 +44,20 @@ for filename in [ 'constexpr_feature_detect.h', 'float_common.h', 'fast_float.h'
import argparse
parser = argparse.ArgumentParser(description='Amalgamate fast_float.')
-parser.add_argument('--license', default='DUAL', choices=['DUAL', 'MIT', 'APACHE'], help='choose license')
+parser.add_argument('--license', default='TRIPLE', choices=['DUAL', 'TRIPLE', 'MIT', 'APACHE', 'BOOST'], help='choose license')
parser.add_argument('--output', default='', help='output file (stdout if none')
args = parser.parse_args()
def license_content(license_arg):
result = []
-
+ if license_arg == 'TRIPLE':
+ result += [
+ '// Licensed under the Apache License, Version 2.0, or the\n',
+ '// MIT License or the Boost License. This file may not be copied,\n',
+ '// modified, or distributed except according to those terms.\n',
+ '//\n'
+ ]
if license_arg == 'DUAL':
result += [
'// Licensed under the Apache License, Version 2.0, or the\n',
@@ -60,14 +66,18 @@ def license_content(license_arg):
'//\n'
]
- if license_arg in ('DUAL', 'MIT'):
+ if license_arg in ('DUAL', 'TRIPLE', 'MIT'):
result.append('// MIT License Notice\n//\n')
result.append(processed_files['LICENSE-MIT'])
result.append('//\n')
- if license_arg in ('DUAL', 'APACHE'):
+ if license_arg in ('DUAL', 'TRIPLE', 'APACHE'):
result.append('// Apache License (Version 2.0) Notice\n//\n')
result.append(processed_files['LICENSE-APACHE'])
result.append('//\n')
+ if license_arg in ('TRIPLE', 'BOOST'):
+ result.append('// BOOST License Notice\n//\n')
+ result.append(processed_files['LICENSE-BOOST'])
+ result.append('//\n')
return result