You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuweni.apache.org by to...@apache.org on 2020/02/13 06:15:47 UTC
[incubator-tuweni] branch master updated: exclude
eth2-reference-tests from dist
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
The following commit(s) were added to refs/heads/master by this push:
new e90170d exclude eth2-reference-tests from dist
e90170d is described below
commit e90170ded031768fcfd1d20760c137f9a16252ed
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Wed Feb 12 22:15:04 2020 -0800
exclude eth2-reference-tests from dist
---
LICENSE | 23 +++++++++++++++++++++++
build.gradle | 9 +++++++--
dist/build.gradle | 2 +-
3 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/LICENSE b/LICENSE
index 54513df..d12070a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -329,6 +329,29 @@ For more information, please see
<http://creativecommons.org/publicdomain/zero/1.0/>
------------------------------------------------------------------------------------
+This product includes code (eth2-reference-tests/src/test/resources) from Ethereum 2.0 reference tests: https://github.com/ethereum/eth2.0-spec-tests
+This code is licensed under the MIT license:
+
+Copyright (c) 2019
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------------------------------
This product includes code (eth-reference-tests/src/test/resources/tests) from Ethereum reference tests: https://github.com/ethereum/tests
This code is licensed under the MIT license:
Copyright 2014 Ethereum Foundation
diff --git a/build.gradle b/build.gradle
index eaefd42..b539938 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,6 +45,10 @@ if (!file("${rootDir}/eth-reference-tests/src/test/resources/eth2.0-tests/README
throw new GradleException("eth-reference-tests/src/test/resources/eth2.0-tests/README.md missing: please clone submodules (git submodule update --init --recursive)")
}
+if (!file("${rootDir}/eth2-reference-tests/src/test/resources").exists()) {
+ throw new GradleException("${rootDir}/eth2-reference-tests/src/test/resources missing: please clone submodules (git submodule update --init --recursive)")
+}
+
//////
// Version numbering
@@ -326,7 +330,7 @@ allprojects {
}
}
- if (project.name != 'eth-reference-tests' && project.name != 'dist') {
+ if (project.name != 'eth-reference-tests' && project.name != 'eth2-reference-tests' && project.name != 'dist') {
artifacts {
archives sourcesJar
@@ -537,6 +541,7 @@ dependencies {
subprojects.each { p ->
switch (p.name) {
case 'eth-reference-tests':
+ case 'eth2-reference-tests':
// ignore
break
case 'crypto':
@@ -553,7 +558,7 @@ dependencies {
jar {
subprojects.each { subproject ->
- if (subproject.name != 'eth-reference-tests') {
+ if (subproject.name != 'eth-reference-tests' && subproject.name != 'eth2-reference-tests') {
from subproject.configurations.archives.collect { it.path.endsWith('.jar') }.files.collect { zipTree(it) }
}
}
diff --git a/dist/build.gradle b/dist/build.gradle
index 98f7300..62277d4 100644
--- a/dist/build.gradle
+++ b/dist/build.gradle
@@ -44,7 +44,7 @@ distributions {
def libs = []
def sources = []
rootProject.subprojects.each { s ->
- if (s.name != 'eth-reference-tests' && s.name != 'dist') {
+ if (s.name != 'eth-reference-tests' && s.name != 'eth2-reference-tests' && s.name != 'dist') {
libs << s.signArchives.signatureFiles[0]
sources << s.signArchives.signatureFiles[1]
docs << s.signArchives.signatureFiles[2]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org