Skip to content

Commit

Permalink
Replace profile with property define
Browse files Browse the repository at this point in the history
  • Loading branch information
sebbASF committed Oct 30, 2023
1 parent 770a959 commit fdb431d
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions src/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/docker/build_linux32.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit fdb431d

Please sign in to comment.