This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch profiletidy
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/profiletidy by this push:
new fdb431d5 Replace profile with property define
fdb431d5 is described below
commit fdb431d5a9811f95987a2eca3d2e7761b1528713
Author: Sebb <[email protected]>
AuthorDate: Mon Oct 30 15:52:33 2023 +0000
Replace profile with property define
---
src/docker/build.sh | 12 ++++++------
src/docker/build_linux32.sh | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/docker/build.sh b/src/docker/build.sh
index 0424f1eb..33717b27 100755
--- a/src/docker/build.sh
+++ b/src/docker/build.sh
@@ -28,17 +28,17 @@ cp /usr/include/x86_64-linux-gnu/openssl/opensslconf.h
/usr/include/openssl
mvn -V package -Drat.skip
# use process-classes rather than package to speed up builds
-mvn -DskipTests -Drat.skip process-classes -P linux-aarch64
-mvn -DskipTests -Drat.skip process-classes -P win64
-mvn -DskipTests -Drat.skip process-classes -P linux64
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=linux-aarch64
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=win64
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=linux64
# Ensure the correct config file is installed
cp /usr/include/i386-linux-gnu/openssl/opensslconf.h /usr/include/openssl
# Run the 32-bit builds.
-mvn -DskipTests -Drat.skip process-classes -P linux-armhf
-mvn -DskipTests -Drat.skip process-classes -P linux-arm
-mvn -DskipTests -Drat.skip process-classes -P win32
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=linux-armhf
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=linux-arm
+mvn -DskipTests -Drat.skip process-classes -Dtarget.name=win32
# see separate script for optional linux32 build
diff --git a/src/docker/build_linux32.sh b/src/docker/build_linux32.sh
index 4077bea3..1d14ca9d 100755
--- a/src/docker/build_linux32.sh
+++ b/src/docker/build_linux32.sh
@@ -29,7 +29,7 @@ cp /usr/include/i386-linux-gnu/openssl/opensslconf.h
/usr/include/openssl
# Needed for linux32, but causes linux 64 builds to fail
apt-get --assume-yes install g++-multilib
-mvn -DskipTests package -P linux32
+mvn -DskipTests package -Dtarget.name=linux32
# Show generated files
find target/classes/org/apache/commons/crypto/native -type f -ls