Skip to content

Commit 99fe816

Browse files
Improve the script generating Javadocs: (#1014)
Clean and install the modules so that it works when the local repo does not contain the artifacts with a newly set version. Also rename `doNotBuildRustLib` property to more usual skip<action>: `skipRustLibBuild`
1 parent ba20911 commit 99fe816

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

exonum-java-binding/core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<packaging.native>${rust.build.directory}/${build.mode}/lib/native</packaging.native>
3737
<auto-value.version>1.6.5</auto-value.version>
3838
<!-- Skip building Rust library for tests -->
39-
<doNotBuildRustLib>false</doNotBuildRustLib>
39+
<skipRustLibBuild>false</skipRustLibBuild>
4040
<!-- This flag is empty for debug builds and equals to `release` otherwise -->
4141
<build.cargoFlag></build.cargoFlag>
4242
</properties>
@@ -221,7 +221,7 @@
221221
<argument>--color</argument>
222222
<argument>always</argument>
223223
</arguments>
224-
<skip>${doNotBuildRustLib}</skip>
224+
<skip>${skipRustLibBuild}</skip>
225225
</configuration>
226226
<goals>
227227
<goal>exec</goal>

exonum-java-binding/generate-javadocs.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
# Fail immediately in case of errors and/or unset variables
66
set -eu -o pipefail
77

8-
# Build the Javadocs
9-
mvn clean javadoc:aggregate -Dmaven.javadoc.skip=false \
8+
# Clean the project and install the artifacts in the local repository,
9+
# so that Javadocs can be generated for a subset of the modules — the published ones
10+
mvn clean install -DskipTests -DskipRustLibBuild
11+
12+
# Generate the aggregated Javadocs for the published modules
13+
mvn javadoc:aggregate -Dmaven.javadoc.skip=false \
1014
`# Include only the published artifacts. As package filtering wildcards are rather limited,\
1115
it is more convenient to specify the list of projects:` \
1216
--projects com.exonum.binding:exonum-java-binding-parent,common,core,testkit,time-oracle

exonum-java-binding/package_app.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function build-exonum-java() {
2222
-DskipTests \
2323
-Dbuild.mode=${BUILD_MODE} \
2424
-Dbuild.cargoFlag=${BUILD_CARGO_FLAG} \
25-
-DdoNotBuildRustLib \
25+
-DskipRustLibBuild \
2626
-Drust.libraryPath="${RUST_LIBRARY_PATH}"
2727
}
2828

0 commit comments

Comments
 (0)