From f309f7ffaf9531e75d820f000ae1d8a9369e30cf Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Sat, 13 Jun 2020 09:51:29 +0200 Subject: [PATCH] Cleanup, build executable sample on windows --- macBuildAndPublish-mac-ios.sh | 8 ++++---- macBuildAndPublish-pure.sh | 18 +++++++++--------- macBuildAndPublish-tvos.sh | 4 ++-- macBuildAndPublish-watchos.sh | 6 +++--- macPublishToMaven.sh | 1 - sample/build.gradle.kts | 3 +-- windowsBuild.sh | 2 +- windowsBuildAndPublish.sh | 14 +++++++++----- 8 files changed, 29 insertions(+), 27 deletions(-) delete mode 100755 macPublishToMaven.sh diff --git a/macBuildAndPublish-mac-ios.sh b/macBuildAndPublish-mac-ios.sh index fd8aacd..3c9da6a 100755 --- a/macBuildAndPublish-mac-ios.sh +++ b/macBuildAndPublish-mac-ios.sh @@ -8,8 +8,8 @@ cd sodiumWrapper ./makeIos.sh #now we can do the delegated build of ios and macos libraries cd .. -./gradlew multiplatform-crypto-delegated:publishIosArm32PublicationToMavenRepository \ -multiplatform-crypto-delegated:publishIosArm64PublicationToMavenRepository \ -multiplatform-crypto-delegated:publishIosX64PublicationToMavenRepository \ -multiplatform-crypto-delegated:publishMacosX64PublicationToMavenRepository +./gradlew multiplatform-crypto-delegated:publishIosArm32PublicationToSnapshotRepository \ +multiplatform-crypto-delegated:publishIosArm64PublicationToSnapshotRepository \ +multiplatform-crypto-delegated:publishIosX64PublicationToSnapshotRepository \ +multiplatform-crypto-delegated:publishMacosX64PublicationToSnapshotRepository set +e diff --git a/macBuildAndPublish-pure.sh b/macBuildAndPublish-pure.sh index c456dfa..fe9bac0 100755 --- a/macBuildAndPublish-pure.sh +++ b/macBuildAndPublish-pure.sh @@ -2,13 +2,13 @@ set -e #!/bin/sh #this will hopefully download all konan dependancies that we use in the build scripts ./gradlew multiplatform-crypto-api:build -./gradlew multiplatform-crypto:publishIosArm32PublicationToMavenRepository \ -multiplatform-crypto:publishIosArm64PublicationToMavenRepository \ -multiplatform-crypto:publishIosX64PublicationToMavenRepository \ -multiplatform-crypto:publishMacosX64PublicationToMavenRepository \ -multiplatform-crypto:publishTvosArm64PublicationToMavenRepository \ -multiplatform-crypto:publishTvosX64PublicationToMavenRepository \ -multiplatform-crypto:publishWatchosArm32PublicationToMavenRepository \ -multiplatform-crypto:publishWatchosArm64PublicationToMavenRepository \ -multiplatform-crypto:publishWatchosX86PublicationToMavenRepository +./gradlew multiplatform-crypto:publishIosArm32PublicationToSnapshotRepository \ +multiplatform-crypto:publishIosArm64PublicationToSnapshotRepository \ +multiplatform-crypto:publishIosX64PublicationToSnapshotRepository \ +multiplatform-crypto:publishMacosX64PublicationToSnapshotRepository \ +multiplatform-crypto:publishTvosArm64PublicationToSnapshotRepository \ +multiplatform-crypto:publishTvosX64PublicationToSnapshotRepository \ +multiplatform-crypto:publishWatchosArm32PublicationToSnapshotRepository \ +multiplatform-crypto:publishWatchosArm64PublicationToSnapshotRepository \ +multiplatform-crypto:publishWatchosX86PublicationToSnapshotRepository set +e diff --git a/macBuildAndPublish-tvos.sh b/macBuildAndPublish-tvos.sh index c331bb7..90ab267 100755 --- a/macBuildAndPublish-tvos.sh +++ b/macBuildAndPublish-tvos.sh @@ -7,6 +7,6 @@ cd sodiumWrapper ./makeTvos.sh #now we can do the delegated build of ios and macos libraries cd .. -./gradlew multiplatform-crypto-delegated:publishTvosArm64PublicationToMavenRepository \ -multiplatform-crypto-delegated:publishTvosX64PublicationToMavenRepository +./gradlew multiplatform-crypto-delegated:publishTvosArm64PublicationToSnapshotRepository \ +multiplatform-crypto-delegated:publishTvosX64PublicationToSnapshotRepository set +e diff --git a/macBuildAndPublish-watchos.sh b/macBuildAndPublish-watchos.sh index ed8191c..eee58f8 100755 --- a/macBuildAndPublish-watchos.sh +++ b/macBuildAndPublish-watchos.sh @@ -7,7 +7,7 @@ cd sodiumWrapper ./makeWatchos.sh #now we can do the delegated build of ios and macos libraries cd .. -./gradlew multiplatform-crypto-delegated:publishWatchosArm32PublicationToMavenRepository \ -multiplatform-crypto-delegated:publishWatchosArm64PublicationToMavenRepository \ -multiplatform-crypto-delegated:publishWatchosX86PublicationToMavenRepository +./gradlew multiplatform-crypto-delegated:publishWatchosArm32PublicationToSnapshotRepository \ +multiplatform-crypto-delegated:publishWatchosArm64PublicationToSnapshotRepository \ +multiplatform-crypto-delegated:publishWatchosX86PublicationToSnapshotRepository set +e diff --git a/macPublishToMaven.sh b/macPublishToMaven.sh deleted file mode 100755 index 6c68051..0000000 --- a/macPublishToMaven.sh +++ /dev/null @@ -1 +0,0 @@ -./gradlew publishAllPublicationsToMavenRepository -x publishMetadataPublicationToMavenRepository -x publishKotlinMultiplatformPublicationToMavenRepository diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 7cd8aaf..5c236cc 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -131,8 +131,7 @@ kotlin { mingwX64() { binaries { - staticLib { - + executable { } } } diff --git a/windowsBuild.sh b/windowsBuild.sh index 74773df..25b3888 100755 --- a/windowsBuild.sh +++ b/windowsBuild.sh @@ -1,4 +1,4 @@ -set +daae +set -e #!/bin/sh #this will hopefully download all konan dependancies that we use in the build scripts diff --git a/windowsBuildAndPublish.sh b/windowsBuildAndPublish.sh index 9b36ebb..4901f8b 100755 --- a/windowsBuildAndPublish.sh +++ b/windowsBuildAndPublish.sh @@ -1,16 +1,20 @@ set -e #!/bin/sh #this will hopefully download all konan dependancies that we use in the build scripts + ./gradlew multiplatform-crypto-api:build -#now let's build linux deps cd sodiumWrapper -./makeMingwX86-64.sh +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 +echo "completed libsodium build" #now we can do the delegated build cd .. ./gradlew multiplatform-crypto-delegated:build #and finally pure build ./gradlew multiplatform-crypto:build -./gradlew publishJvmPublicationToSnapshotRepository publishJsPublicationToSnapshotRepository \ -publishKotlinMultiplatformPublicationToSnapshotRepository publishLinuxX64PublicationToSnapshotRepository \ -publishLinuxArm64PublicationToSnapshotRepository publishMetadataPublicationToSnapshotRepository +./gradlew publishMingwX64PublicationToSnapshotMavenRepository set +e \ No newline at end of file