Skip to content

Commit bef97c2

Browse files
committed
Merge repos, change copyright update tools for work with ports.
1 parent 2e6c0ce commit bef97c2

File tree

104 files changed

+202
-1174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+202
-1174
lines changed

.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ release_build
2121
/lib
2222
/install
2323

24+
# CMake
25+
CMakeCache.txt
26+
CMakeFiles
27+
CMakeScripts
28+
Testing
29+
Makefile
30+
cmake_install.cmake
31+
install_manifest.txt
32+
compile_commands.json
33+
CTestTestfile.cmake
34+
2435
# Avoid ignoring build hooks
2536
!hooks/build
2637
!tools/base/hooks/build

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ option(OPTION_BUILD_LOADERS "Build loaders." ON)
8080
option(OPTION_BUILD_SCRIPTS "Build scripts." ON)
8181
option(OPTION_BUILD_SERIALS "Build serials." ON)
8282
option(OPTION_BUILD_DETOURS "Build detours." ON)
83+
option(OPTION_BUILD_PORTS "Build ports." OFF)
8384
option(OPTION_FORK_SAFE "Enable fork safety." OFF)
8485
option(OPTION_THREAD_SAFE "Enable thread safety." OFF)
8586

CONTRIBUTORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
Federico Agustin Alvarez Calzada <[email protected]>
33
Gil Arasa Verge <[email protected]>
44
Alberto Fulcini <[email protected]>
5+
Maximilian Wittmer <[email protected]>

COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2016 - 2019 Vicente Eduardo Ferrer Garcia <[email protected]>
1+
Copyright (C) 2016-2019 Vicente Eduardo Ferrer Garcia <[email protected]>
22

33
All Rights Reserved.
44
This work is protected by copyright laws and international treaties.

NOTICE.md

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ All external code and licenses used by **METACALL** are always wrapped into plug
2020
- [2.1 RapidJSON](#21-rapidjson)
2121
- [3. Detours](#3-detours)
2222
- [3.1 FuncHook](#31-funchook)
23+
- [4. Ports](#4-ports)
24+
- [4.1 Swig](#41-swig)
2325

2426
<!-- /TOC -->
2527

@@ -28,58 +30,74 @@ All external code and licenses used by **METACALL** are always wrapped into plug
2830
### 1.1 Python
2931

3032
| Software | License |
31-
| :--------: | ---------------------------------------------------------------------------- |
33+
| :--------: | :--------------------------------------------------------------------------: |
3234
| **Python** | [Python Software Foundation License](https://docs.python.org/3/license.html) |
3335

3436
### 1.2 NodeJS
3537

3638
| Software | License |
37-
| :--------: | ----------------------------------------------------------------- |
39+
| :--------: | :---------------------------------------------------------------: |
3840
| **NodeJS** | [MIT License](https://github.com/nodejs/node/blob/master/LICENSE) |
3941

4042
### 1.3 JavaScript (V8)
4143

4244
| Software | License |
43-
| :------: | -------------------------------------------------------------------- |
45+
| :------: | :------------------------------------------------------------------: |
4446
| **V8** | [BSD 3-clause License](https://github.com/v8/v8/blob/master/LICENSE) |
4547

4648
### 1.4 C# #
4749

4850
| Software | License |
49-
| ----------- | ----------------------------------------------------------------------------- |
51+
| :---------: | :---------------------------------------------------------------------------: |
5052
| **NetCore** | [MIT License License](https://github.com/dotnet/core/blob/master/LICENSE.TXT) |
5153

5254
### 1.5 Ruby
5355

5456
| Software | License |
55-
| -------- | ------------------------------------------------------------------------------------- |
57+
| :------: | :-----------------------------------------------------------------------------------: |
5658
| **Ruby** | [BSD 2-clause License - Ruby License](https://www.ruby-lang.org/en/about/license.txt) |
5759

5860
### 1.6 C/C++
5961

6062
| Software | License |
61-
| -------------------- | ------------------------------------------------------------------------------------------- |
63+
| :------------------: | :-----------------------------------------------------------------------------------------: |
6264
| **Clang** - **LLVM** | [University of Illinois/NCSA Open Source License](http://releases.llvm.org/2.8/LICENSE.TXT) |
6365
| **LibFFI** | [MIT License](https://github.com/libffi/libffi/blob/master/LICENSE) |
6466

6567
### 1.6 JavaScript (SpiderMonkey)
6668

6769
| Software | License |
68-
| ---------------- | --------------------------------------------------------------------------------- |
70+
| :--------------: | :-------------------------------------------------------------------------------: |
6971
| **SpiderMonkey** | [Mozilla Public License 2.0](https://www.mozilla.org/en-US/foundation/licensing/) |
7072

7173
## 2. Serials
7274

7375
### 2.1 RapidJSON
7476

7577
| Software | License |
76-
| ------------- | --------------------------------------------------------------------------- |
78+
| :-----------: | :-------------------------------------------------------------------------: |
7779
| **RapidJSON** | [MIT License](https://github.com/Tencent/rapidjson/blob/master/license.txt) |
7880

7981
## 3. Detours
8082

8183
### 3.1 FuncHook
8284

8385
| Software | License |
84-
| ------------ | --------------------------------------------------------------------------------------------------- |
86+
| :----------: | :-------------------------------------------------------------------------------------------------: |
8587
| **FuncHook** | [GPLv2 or later with a GPL linking exception](https://github.com/kubo/funchook/blob/master/LICENSE) |
88+
89+
## 4. Ports
90+
91+
### 4.1 Swig
92+
93+
| Software | License |
94+
| :------: | :-----: |
95+
| **SWIG** | **** |
96+
97+
>When SWIG is used as it is distributed by the SWIG developers, its output is not governed by SWIG's license (including the GPL). SWIG's output contains code from three sources:
98+
>
99+
> - code generated by SWIG, which is not governed by copyright;
100+
> - code copied from the SWIG library which is permissively licensed to be redistributed without restriction;
101+
> - code derived from the user's input, which may be governed by the license of the code supplied by the user.
102+
>
103+
>So, while the input supplied to SWIG may affect the license of SWIG's output (e.g. if the input code is licensed under a copyleft or proprietary license), SWIG's license does not affect the license of the output. This is consistent with the FSF's FAQ entries on this subject ([GPLOutput](http://www.gnu.org/licenses/gpl-faq.html#GPLOutput) and [WhatCaseIsOutputGPL](http://www.gnu.org/licenses/gpl-faq.html#WhatCaseIsOutputGPL)), because the SWIG code copied into the output by SWIG is not GPL-licensed.

cmake/.github/CODE_OF_CONDUCT.md

Lines changed: 0 additions & 76 deletions
This file was deleted.

cmake/.github/CONTRIBUTING.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

cmake/.github/ISSUE_TEMPLATE.md

Whitespace-only changes.

cmake/.github/PULL_REQUEST_TEMPLATE.md

Whitespace-only changes.

cmake/.gitignore

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)