Browse Source

Updated license information

Eyck Jentzsch 2 months ago
parent
commit
4236d23fee
5 changed files with 58 additions and 67 deletions
  1. 5
    24
      LICENSE
  2. 11
    28
      incl/scc/configurable_tracer.h
  3. 14
    5
      incl/scc/tracer_base.h
  4. 14
    5
      incl/scc/value_registry.h
  5. 14
    5
      incl/util/io-redirector.h

+ 5
- 24
LICENSE View File

@@ -175,27 +175,8 @@
175 175
 
176 176
    END OF TERMS AND CONDITIONS
177 177
 
178
-   APPENDIX: How to apply the Apache License to your work.
179
-
180
-      To apply the Apache License to your work, attach the following
181
-      boilerplate notice, with the fields enclosed by brackets "{}"
182
-      replaced with your own identifying information. (Don't include
183
-      the brackets!)  The text should be enclosed in the appropriate
184
-      comment syntax for the file format. We also recommend that a
185
-      file or class name and description of purpose be included on the
186
-      same "printed page" as the copyright notice for easier
187
-      identification within third-party archives.
188
-
189
-   Copyright {yyyy} {name of copyright owner}
190
-
191
-   Licensed under the Apache License, Version 2.0 (the "License");
192
-   you may not use this file except in compliance with the License.
193
-   You may obtain a copy of the License at
194
-
195
-       http://www.apache.org/licenses/LICENSE-2.0
196
-
197
-   Unless required by applicable law or agreed to in writing, software
198
-   distributed under the License is distributed on an "AS IS" BASIS,
199
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
-   See the License for the specific language governing permissions and
201
-   limitations under the License.
178
+External contribited parts might be license under a different license:
179
+* spdlog under MIT License
180
+* fmt under MIT License
181
+* Json-cpp under MIT License
182
+* bit_field under BSD 3-clause

+ 11
- 28
incl/scc/configurable_tracer.h View File

@@ -1,35 +1,18 @@
1 1
 /*******************************************************************************
2
- * Copyright (C) 2018, MINRES Technologies GmbH
3
- * All rights reserved.
2
+ * Copyright 2017, 2018 MINRES Technologies GmbH
4 3
  *
5
- * Redistribution and use in source and binary forms, with or without
6
- * modification, are permitted provided that the following conditions are met:
4
+ * Licensed under the Apache License, Version 2.0 (the "License");
5
+ * you may not use this file except in compliance with the License.
6
+ * You may obtain a copy of the License at
7 7
  *
8
- * 1. Redistributions of source code must retain the above copyright notice,
9
- *    this list of conditions and the following disclaimer.
8
+ *     http://www.apache.org/licenses/LICENSE-2.0
10 9
  *
11
- * 2. Redistributions in binary form must reproduce the above copyright notice,
12
- *    this list of conditions and the following disclaimer in the documentation
13
- *    and/or other materials provided with the distribution.
14
- *
15
- * 3. Neither the name of the copyright holder nor the names of its contributors
16
- *    may be used to endorse or promote products derived from this software
17
- *    without specific prior written permission.
18
- *
19
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29
- * POSSIBILITY OF SUCH DAMAGE.
30
- * Contributors:
31
- *       eyck@minres.com - initial API and implementation
32
- ******************************************************************************/
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ *******************************************************************************/
33 16
 
34 17
 #ifndef _SCC_CONFIGURABLE_TRACER_H_
35 18
 #define _SCC_CONFIGURABLE_TRACER_H_

+ 14
- 5
incl/scc/tracer_base.h View File

@@ -1,9 +1,18 @@
1
-/*
2
- * tracer_base.h
1
+/*******************************************************************************
2
+ * Copyright 2019 MINRES Technologies GmbH
3 3
  *
4
- *  Created on: 30.12.2018
5
- *      Author: eyck
6
- */
4
+ * Licensed under the Apache License, Version 2.0 (the "License");
5
+ * you may not use this file except in compliance with the License.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ *     http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ *******************************************************************************/
7 16
 
8 17
 #ifndef _SCC_TRACER_BASE_H_
9 18
 #define _SCC_TRACER_BASE_H_

+ 14
- 5
incl/scc/value_registry.h View File

@@ -1,9 +1,18 @@
1
-/*
2
- * value_registry.h
1
+/*******************************************************************************
2
+ * Copyright 2019 MINRES Technologies GmbH
3 3
  *
4
- *  Created on: 30.12.2018
5
- *      Author: eyck
6
- */
4
+ * Licensed under the Apache License, Version 2.0 (the "License");
5
+ * you may not use this file except in compliance with the License.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ *     http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ *******************************************************************************/
7 16
 
8 17
 #ifndef _SCC_VALUE_REGISTRY_H_
9 18
 #define _SCC_VALUE_REGISTRY_H_

+ 14
- 5
incl/util/io-redirector.h View File

@@ -1,9 +1,18 @@
1
-/*
2
- * io-redirector.h
1
+/*******************************************************************************
2
+ * Copyright 2019 MINRES Technologies GmbH
3 3
  *
4
- *  Created on: 31.12.2018
5
- *      Author: eyck
6
- */
4
+ * Licensed under the Apache License, Version 2.0 (the "License");
5
+ * you may not use this file except in compliance with the License.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ *     http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ *******************************************************************************/
7 16
 
8 17
 #ifndef _UTIL_IO_REDIRECTOR_H_
9 18
 #define _UTIL_IO_REDIRECTOR_H_