summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcan eldem <eldemcan@gmail.com>2020-09-02 17:11:50 +0100
committercan eldem <eldemcan@gmail.com>2020-09-02 18:28:07 +0100
commit9416a9ea14e4950ce183e20019419093dfd9e21b (patch)
tree3c6d6e49b58b5a959f0c86e25f26c19f8b7f6097
parent178dc1c91f9e43ee061825d1284bca694d6bbc65 (diff)
Update conan fixtures
-rw-r--r--spec/fixtures/expected/c/conan/v1.0.json33
-rw-r--r--spec/fixtures/expected/c/conan/v1.1.json47
-rw-r--r--spec/fixtures/expected/c/conan/v2.0.json36
-rw-r--r--spec/fixtures/expected/c/conan/v2.1.json30
4 files changed, 143 insertions, 3 deletions
diff --git a/spec/fixtures/expected/c/conan/v1.0.json b/spec/fixtures/expected/c/conan/v1.0.json
index 20d3c37..d46eab1 100644
--- a/spec/fixtures/expected/c/conan/v1.0.json
+++ b/spec/fixtures/expected/c/conan/v1.0.json
@@ -2,12 +2,45 @@
"licenses": [
{
"count": 1,
+ "name": "Apache 2.0"
+ },
+ {
+ "count": 1,
+ "name": "GPL-2.0-or-later"
+ },
+ {
+ "count": 1,
"name": "New BSD"
}
],
"dependencies": [
{
"license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "jerryscript",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
+ "name": "GPL-2.0-or-later"
+ },
+ "dependency": {
+ "name": "wolfssl",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "license": {
"name": "New BSD",
"url": "http://opensource.org/licenses/BSD-3-Clause"
},
diff --git a/spec/fixtures/expected/c/conan/v1.1.json b/spec/fixtures/expected/c/conan/v1.1.json
index b4fa0cf..ec96702 100644
--- a/spec/fixtures/expected/c/conan/v1.1.json
+++ b/spec/fixtures/expected/c/conan/v1.1.json
@@ -3,6 +3,14 @@
"licenses": [
{
"count": 1,
+ "name": "Apache 2.0"
+ },
+ {
+ "count": 1,
+ "name": "GPL-2.0-or-later"
+ },
+ {
+ "count": 1,
"name": "New BSD"
}
],
@@ -10,6 +18,43 @@
{
"licenses": [
{
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ }
+ ],
+ "license": {
+ "name": "Apache 2.0",
+ "url": "http://www.apache.org/licenses/LICENSE-2.0.txt"
+ },
+ "dependency": {
+ "name": "jerryscript",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "licenses": [
+ {
+ "name": "GPL-2.0-or-later",
+ "url": ""
+ }
+ ],
+ "license": {
+ "name": "GPL-2.0-or-later"
+ },
+ "dependency": {
+ "name": "wolfssl",
+ "description": "",
+ "pathes": [
+ "."
+ ]
+ }
+ },
+ {
+ "licenses": [
+ {
"name": "New BSD",
"url": "http://opensource.org/licenses/BSD-3-Clause"
}
@@ -27,4 +72,4 @@
}
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/c/conan/v2.0.json b/spec/fixtures/expected/c/conan/v2.0.json
index 33d4475..0b90a4d 100644
--- a/spec/fixtures/expected/c/conan/v2.0.json
+++ b/spec/fixtures/expected/c/conan/v2.0.json
@@ -2,14 +2,48 @@
"version": "2.0",
"licenses": [
{
+ "id": "Apache-2.0",
+ "name": "Apache License 2.0",
+ "url": "https://opensource.org/licenses/Apache-2.0",
+ "count": 1
+ },
+ {
"id": "BSD-3-Clause",
"name": "BSD 3-Clause \"New\" or \"Revised\" License",
"url": "https://opensource.org/licenses/BSD-3-Clause",
"count": 1
+ },
+ {
+ "id": "GPL-2.0-or-later",
+ "name": "GNU General Public License v2.0 or later",
+ "url": "https://opensource.org/licenses/GPL-2.0",
+ "count": 1
}
],
"dependencies": [
{
+ "name": "jerryscript",
+ "url": "",
+ "description": "",
+ "paths": [
+ "."
+ ],
+ "licenses": [
+ "Apache-2.0"
+ ]
+ },
+ {
+ "name": "wolfssl",
+ "url": "",
+ "description": "",
+ "paths": [
+ "."
+ ],
+ "licenses": [
+ "GPL-2.0-or-later"
+ ]
+ },
+ {
"name": "zstd",
"url": "",
"description": "",
@@ -21,4 +55,4 @@
]
}
]
-}
+} \ No newline at end of file
diff --git a/spec/fixtures/expected/c/conan/v2.1.json b/spec/fixtures/expected/c/conan/v2.1.json
index b4da7e4..7c0c5ed 100644
--- a/spec/fixtures/expected/c/conan/v2.1.json
+++ b/spec/fixtures/expected/c/conan/v2.1.json
@@ -2,13 +2,41 @@
"version": "2.1",
"licenses": [
{
+ "id": "Apache-2.0",
+ "name": "Apache License 2.0",
+ "url": "https://opensource.org/licenses/Apache-2.0"
+ },
+ {
"id": "BSD-3-Clause",
"name": "BSD 3-Clause \"New\" or \"Revised\" License",
"url": "https://opensource.org/licenses/BSD-3-Clause"
+ },
+ {
+ "id": "GPL-2.0-or-later",
+ "name": "GNU General Public License v2.0 or later",
+ "url": "https://opensource.org/licenses/GPL-2.0"
}
],
"dependencies": [
{
+ "name": "jerryscript",
+ "version": "2.2.0",
+ "package_manager": "conan",
+ "path": "conanfile.txt",
+ "licenses": [
+ "Apache-2.0"
+ ]
+ },
+ {
+ "name": "wolfssl",
+ "version": "4.4.0",
+ "package_manager": "conan",
+ "path": "conanfile.txt",
+ "licenses": [
+ "GPL-2.0-or-later"
+ ]
+ },
+ {
"name": "zstd",
"version": "1.4.4",
"package_manager": "conan",
@@ -18,4 +46,4 @@
]
}
]
-}
+} \ No newline at end of file