From abcb25e3338f6cecc184782e990fa84894c7b78e Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Fri, 23 Oct 2020 11:27:26 +0200 Subject: [PATCH] Use make directly when publishing, also clean before building --- windowsBuildAndPublish-delegated.sh | 8 ++++---- windowsBuildAndPublish-pure.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/windowsBuildAndPublish-delegated.sh b/windowsBuildAndPublish-delegated.sh index 6432351..a6a9c0b 100755 --- a/windowsBuildAndPublish-delegated.sh +++ b/windowsBuildAndPublish-delegated.sh @@ -1,15 +1,15 @@ set -e #!/bin/sh #this will hopefully download all konan dependancies that we use in the build scripts - +./gradlew clean ./gradlew multiplatform-crypto-api:build cd sodiumWrapper echo "Starting mingw libsodium build" ./configureMingw64.sh echo "Configure done" -$GNU_MAKE -j4 -C libsodium clean -$GNU_MAKE -j4 -C libsodium -$GNU_MAKE -j4 -C libsodium install +make -j4 -C libsodium clean +make -j4 -C libsodium +make -j4 -C libsodium install echo "completed libsodium build" #now we can do the delegated build cd .. diff --git a/windowsBuildAndPublish-pure.sh b/windowsBuildAndPublish-pure.sh index f1f2c00..6340b8d 100755 --- a/windowsBuildAndPublish-pure.sh +++ b/windowsBuildAndPublish-pure.sh @@ -1,8 +1,8 @@ set -e #!/bin/sh #this will hopefully download all konan dependancies that we use in the build scripts - +./gradlew clean ./gradlew multiplatform-crypto-api:build ./gradlew multiplatform-crypto:build ./gradlew multiplatform-crypto:publishMingwX64PublicationToSnapshotRepository -set +e \ No newline at end of file +set +e