Skip to content

Commit 72ea871

Browse files
skletsundmitry-timofeev
authored andcommitted
Use core protobuf files from the source [ECR-3472] (#1177)
Protobuf specification files are now taken from a separate repository that is incorporated into the main project as a git submodule. git submodule init и git submodule update should be executed in order to fetch the content of the submodule. See: exonum/exonum#1505
1 parent 494229b commit 72ea871

File tree

9 files changed

+11
-348
lines changed

9 files changed

+11
-348
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "exonum-java-binding/common/src/main/proto"]
2+
path = exonum-java-binding/common/src/main/proto
3+
url = https://github.com/exonum/exonum-proto-sources.git

CONTRIBUTING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ You need to install the following dependencies:
2323
To install a specific Rust version, use `rustup install 1.36.0` command.
2424
* The [system dependencies](https://exonum.com/doc/version/0.12/get-started/install/) of Exonum.
2525
You do _not_ need to manually fetch and compile Exonum.
26+
2627
__Important__: On Mac OS it is necessary to install RocksDB
2728
package and to set the environment variable `ROCKSDB_LIB_DIR`.
2829
To install the package via Homebrew:
@@ -36,6 +37,11 @@ You need to install the following dependencies:
3637
Also on Mac you need a [`coreutils`](https://formulae.brew.sh/formula/coreutils) package installed.
3738

3839
### Building
40+
__Important__: Keep in mind that project contains git submodules and extra steps are required
41+
to init and/or update them:
42+
* `git submodule update --init` before the first build
43+
* `git submodule update` when the submodule revision changes.
44+
3945
Set required environment variables, once in a shell you use to build the project:
4046
```$sh
4147
$ source exonum-java-binding/tests_profile

exonum-java-binding/common/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
</goals>
148148
<configuration>
149149
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
150+
<protoSourceRoot>${basedir}/src/main/proto/src</protoSourceRoot>
150151
</configuration>
151152
</execution>
152153
</executions>
Submodule proto added at 1c0eb41

exonum-java-binding/common/src/main/proto/blockchain.proto

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

exonum-java-binding/common/src/main/proto/common.proto

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

exonum-java-binding/common/src/main/proto/consensus.proto

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

exonum-java-binding/common/src/main/proto/runtime.proto

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

exonum-java-binding/common/src/main/proto/types.proto

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

0 commit comments

Comments
 (0)