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 074bbff Simplify binary distribution to store all results in one place
new 9973f54 Merge pull request #138 from atoulme/simplify_build
074bbff is described below
commit 074bbffaed54643620b5fabf69a009d67b03c259
Author: Antoine Toulme <anto...@lunar-ocean.com>
AuthorDate: Tue Jul 21 00:00:56 2020 -0700
Simplify binary distribution to store all results in one place
---
PACKAGES.md | 18 ----------
build.gradle | 2 +-
dist/build.gradle | 65 +++++-------------------------------
dist/docker/gossip.Dockerfile | 4 +--
dist/docker/relayer.Dockerfile | 4 +--
gossip/README.md => docs.md | 75 ++++++++++++++++++++++++++++++++++++++++++
hobbits-relayer/README.md | 66 -------------------------------------
7 files changed, 89 insertions(+), 145 deletions(-)
diff --git a/PACKAGES.md b/PACKAGES.md
deleted file mode 100644
index 20ae7a1..0000000
--- a/PACKAGES.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Module tuweni
-
-Apache Tuweni is a set of libraries and other tools to aid development of
blockchain and other decentralized software in Java and other JVM languages. It
includes a low-level bytes library, serialization and deserialization codecs
(e.g. RLP), various cryptography functions and primitives, and lots of other
helpful utilities.
-
-Learn more at [https://tuweni.apache.org].
-
-# License
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE
-file distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file
-to You under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the
-License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on
-an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the
-specific language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index e480ba6..96f4dd4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -646,7 +646,7 @@ dokka {
// List of files with module and package documentation
//
https://kotlinlang.org/docs/reference/kotlin-doc.html#module-and-package-documentation
- includes = ['PACKAGES.md']
+ includes = ['docs.md']
// Specifies the location of the project source code on the Web.
// If provided, Dokka generates "source" links for each declaration.
diff --git a/dist/build.gradle b/dist/build.gradle
index 1fd761c..9417f64 100644
--- a/dist/build.gradle
+++ b/dist/build.gradle
@@ -58,6 +58,12 @@ distributions {
into('site') {
from rootProject.dokka.outputDirectory
}
+ into('bin') {
+ from { project(':gossip').startScripts.outputs.files }
+ from { project(':hobbits-relayer').startScripts.outputs.files }
+ from { project(':eth-client-app').startScripts.outputs.files }
+ fileMode = 0755
+ }
}
}
sources {
@@ -87,46 +93,6 @@ distributions {
}
}
}
- gossip {
- distributionBaseName = 'tuweni-gossip'
- contents {
- mandatoryFiles(it)
- into('') {
- from ".."
- include 'gossip/README.md'
- }
- into('bin') {
- from { project(':gossip').startScripts.outputs.files }
- fileMode = 0755
- }
- into('lib') {
- def libs = []
- libs << project(':gossip').configurations.runtime
- from libs
- from project(':gossip').jar
- }
- }
- }
- relayer {
- distributionBaseName = 'tuweni-relayer'
- contents {
- mandatoryFiles(it)
- into('') {
- from ".."
- include 'hobbits-relayer/README.md'
- }
- into('bin') {
- from { project(':hobbits-relayer').startScripts.outputs.files }
- fileMode = 0755
- }
- into('lib') {
- def libs = []
- libs << project(':hobbits-relayer').configurations.runtime
- from libs
- from project(':hobbits-relayer').jar
- }
- }
- }
}
rootProject.subprojects.each {
@@ -144,10 +110,6 @@ distTar{ compression = Compression.GZIP }
sourcesDistTar{ compression = Compression.GZIP }
-gossipDistTar{ compression = Compression.GZIP }
-
-relayerDistTar{ compression = Compression.GZIP }
-
if (System.getenv('ENABLE_SIGNING') == 'true') {
signing {
useGpgCmd()
@@ -155,10 +117,6 @@ if (System.getenv('ENABLE_SIGNING') == 'true') {
sign distTar
sign sourcesDistZip
sign sourcesDistTar
- sign gossipDistZip
- sign gossipDistTar
- sign relayerDistZip
- sign relayerDistTar
}
}
@@ -167,13 +125,8 @@ task createChecksums(type: Checksum, dependsOn: [
'distTar',
'sourcesDistZip',
'sourcesDistTar',
- 'gossipDistZip',
- 'gossipDistTar',
- 'relayerDistZip',
- 'relayerDistTar'
]) {
- files = distZip.outputs.files + distTar.outputs.files +
sourcesDistZip.outputs.files + sourcesDistTar.outputs.files \
- + gossipDistZip.outputs.files + gossipDistTar.outputs.files +
relayerDistZip.outputs.files + relayerDistTar.outputs.files
+ files = distZip.outputs.files + distTar.outputs.files +
sourcesDistZip.outputs.files + sourcesDistTar.outputs.files
outputDir = new File(project.buildDir, "distributions")
algorithm = Checksum.Algorithm.SHA512
}
@@ -181,14 +134,14 @@ task createChecksums(type: Checksum, dependsOn: [
build.dependsOn('createChecksums')
task buildGossipImage(type: DockerBuildImage) {
- dependsOn gossipDistTar
+ dependsOn distTar
inputDir = projectDir
dockerFile = file("docker/gossip.Dockerfile")
tag = "apache-tuweni/gossip:$project.version"
}
task buildRelayerImage(type: DockerBuildImage) {
- dependsOn relayerDistTar
+ dependsOn distTar
inputDir = projectDir
dockerFile = file("docker/relayer.Dockerfile")
tag = "apache-tuweni/relayer:$project.version"
diff --git a/dist/docker/gossip.Dockerfile b/dist/docker/gossip.Dockerfile
index 9c434a7..e6558db 100644
--- a/dist/docker/gossip.Dockerfile
+++ b/dist/docker/gossip.Dockerfile
@@ -11,9 +11,9 @@
FROM openjdk:11.0.3-jre-stretch
-COPY build/distributions/tuweni-gossip-*.tgz /usr/gossip.tgz
+COPY build/distributions/tuweni-bin-*.tgz /usr/gossip.tgz
RUN cd /usr \
&& tar xzf gossip.tgz \
- && mv tuweni-gossip-* gossip
+ && mv tuweni-bin-*/gossip gossip
ENTRYPOINT ["/usr/gossip/bin/gossip"]
\ No newline at end of file
diff --git a/dist/docker/relayer.Dockerfile b/dist/docker/relayer.Dockerfile
index b471169..6791c16 100644
--- a/dist/docker/relayer.Dockerfile
+++ b/dist/docker/relayer.Dockerfile
@@ -11,9 +11,9 @@
FROM openjdk:11.0.3-jre-stretch
-COPY build/distributions/tuweni-relayer-*.tgz /usr/relayer.tgz
+COPY build/distributions/tuweni-bin-*.tgz /usr/relayer.tgz
RUN cd /usr \
&& tar xzf relayer.tgz \
- && mv tuweni-relayer-* relayer
+ && mv tuweni-relayer-*/relayer relayer
ENTRYPOINT ["/usr/relayer/bin/relayer"]
\ No newline at end of file
diff --git a/gossip/README.md b/docs.md
similarity index 61%
rename from gossip/README.md
rename to docs.md
index a1e7827..fddfce5 100644
--- a/gossip/README.md
+++ b/docs.md
@@ -1,3 +1,9 @@
+# Module tuweni
+
+Apache Tuweni is a set of libraries and other tools to aid development of
blockchain and other decentralized software in Java and other JVM languages. It
includes a low-level bytes library, serialization and deserialization codecs
(e.g. RLP), various cryptography functions and primitives, and lots of other
helpful utilities.
+
+Learn more at [https://tuweni.apache.org].
+
# Gossip application
This application creates a sample standalone application applying the Plumtree
gossip library.
@@ -89,3 +95,72 @@ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the
specific language governing permissions and limitations under the License.
+
+
+# Relayer application
+
+This application relays two hobbits endpoints.
+
+Usage:
+```bash
+$> bin/hobbits-relayer --help
+Usage: <main class> [-h] [-b=<bind>] [-t=<to>]
+ -b, --bind=<bind> Endpoint to bind to
+ -h, --help Prints usage prompt
+ -t, --to=<to> Endpoint to relay to
+```
+
+The application prints out messages to STDOUT.
+
+Sample use:
+
+Listen to a port
+```bash
+$> netcat -l -p 18000
+```
+
+Set up the relayer:
+```bash
+$> bin/hobbits-relayer -b tcp://localhost:10000 -t tcp://localhost:18000
+```
+
+Send a message:
+```bash
+$> cat message
+EWP 0.2 RPC 5 5
+hellohello
+$> cat message | netcat localhost 10000
+```
+
+The relayer will show the message:
+```bash
+EWP 0.2 RPC 5 5
+0x68656C6C6F
+0x68656C6C6F
+```
+
+The listener will show the message, received:
+```bash
+$> netcat -l -p 18000
+EWP 0.2 RPC 5 5
+hellohello
+```
+
+## More information
+
+- [Official website](https://tuweni.apache.org)
+- [GitHub project](https://github.com/apache/incubator-tuweni)
+
+
+# License
+
+Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE
+file distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file
+to You under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the
+License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on
+an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the
+specific language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/hobbits-relayer/README.md b/hobbits-relayer/README.md
deleted file mode 100644
index 257fe29..0000000
--- a/hobbits-relayer/README.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Relayer application
-
-This application relays two hobbits endpoints.
-
-Usage:
-```bash
-$> bin/hobbits-relayer --help
-Usage: <main class> [-h] [-b=<bind>] [-t=<to>]
- -b, --bind=<bind> Endpoint to bind to
- -h, --help Prints usage prompt
- -t, --to=<to> Endpoint to relay to
-```
-
-The application prints out messages to STDOUT.
-
-Sample use:
-
-Listen to a port
-```bash
-$> netcat -l -p 18000
-```
-
-Set up the relayer:
-```bash
-$> bin/hobbits-relayer -b tcp://localhost:10000 -t tcp://localhost:18000
-```
-
-Send a message:
-```bash
-$> cat message
-EWP 0.2 RPC 5 5
-hellohello
-$> cat message | netcat localhost 10000
-```
-
-The relayer will show the message:
-```bash
-EWP 0.2 RPC 5 5
-0x68656C6C6F
-0x68656C6C6F
-```
-
-The listener will show the message, received:
-```bash
-$> netcat -l -p 18000
-EWP 0.2 RPC 5 5
-hellohello
-```
-
-## More information
-
-- [Official website](https://tuweni.apache.org)
-- [GitHub project](https://github.com/apache/incubator-tuweni)
-
-# License
-
-Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE
-file distributed with this work for additional information regarding copyright
ownership. The ASF licenses this file
-to You under the Apache License, Version 2.0 (the "License"); you may not use
this file except in compliance with the
-License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on
-an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the
-specific language governing permissions and limitations under the License.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tuweni.apache.org
For additional commands, e-mail: commits-h...@tuweni.apache.org
