From 376283b7364e1a31bbb0237b4eb23cc8b09d4153 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Thu, 11 Jun 2020 17:46:26 +0200 Subject: [PATCH] Split mac builds into different scripts --- macBuild-mac-ios.sh | 16 ++++++++++++++++ macBuild-pure.sh | 5 +++++ macBuild-tvos.sh | 13 +++++++++++++ macBuild-watchos.sh | 14 ++++++++++++++ macBuildAndPublish-mac-ios.sh | 15 +++++++++++++++ macBuildAndPublish-pure.sh | 20 ++++++++++++++++++++ macBuildAndPublish-tvos.sh | 13 +++++++++++++ macBuildAndPublish-watchos.sh | 14 ++++++++++++++ macBuildAndPublish.sh | 17 ----------------- 9 files changed, 110 insertions(+), 17 deletions(-) create mode 100644 macBuild-mac-ios.sh create mode 100644 macBuild-pure.sh create mode 100644 macBuild-tvos.sh create mode 100644 macBuild-watchos.sh create mode 100644 macBuildAndPublish-mac-ios.sh create mode 100644 macBuildAndPublish-pure.sh create mode 100644 macBuildAndPublish-tvos.sh create mode 100644 macBuildAndPublish-watchos.sh delete mode 100644 macBuildAndPublish.sh diff --git a/macBuild-mac-ios.sh b/macBuild-mac-ios.sh new file mode 100644 index 0000000..0e11f08 --- /dev/null +++ b/macBuild-mac-ios.sh @@ -0,0 +1,16 @@ +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 +./makeMacosX86-64.sh +./makeIos.sh +#now we can do the delegated build of ios and macos libraries +cd .. +./gradlew multiplatform-crypto-delegated:iosArm32MainKlibrary multiplatform-crypto-delegated:iosArm32TestKlibrary \ +multiplatform-crypto-delegated:iosArm64MainKlibrary multiplatform-crypto-delegated:iosArm64TestKlibrary \ +multiplatform-crypto-delegated:iosX64MainKlibrary multiplatform-crypto-delegated:iosX64TestKlibrary \ +multiplatform-crypto-delegated:macosX64MainKlibrary multiplatform-crypto-delegated:macosX64TestKlibrary +set +e + diff --git a/macBuild-pure.sh b/macBuild-pure.sh new file mode 100644 index 0000000..37dfce7 --- /dev/null +++ b/macBuild-pure.sh @@ -0,0 +1,5 @@ +set -e +#!/bin/sh +./gradlew multiplatform-crypto-api:build +./gradlew multiplatform-crypto:build +set +e \ No newline at end of file diff --git a/macBuild-tvos.sh b/macBuild-tvos.sh new file mode 100644 index 0000000..cc0069e --- /dev/null +++ b/macBuild-tvos.sh @@ -0,0 +1,13 @@ +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 +./makeMacosX86-64.sh +./makeIos.sh +#now we can do the delegated build of ios and macos libraries +cd .. +./gradlew multiplatform-crypto-delegated:tvosArm64MainKlibrary multiplatform-crypto-delegated:tvosArm64TestKlibrary \ +multiplatform-crypto-delegated:tvosX64MainKlibrary multiplatform-crypto-delegated:tvosX64TestKlibrary +set +e \ No newline at end of file diff --git a/macBuild-watchos.sh b/macBuild-watchos.sh new file mode 100644 index 0000000..17f8442 --- /dev/null +++ b/macBuild-watchos.sh @@ -0,0 +1,14 @@ +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 +./makeMacosX86-64.sh +./makeIos.sh +#now we can do the delegated build of ios and macos libraries +cd .. +./gradlew multiplatform-crypto-delegated:watchosArm32MainKlibrary multiplatform-crypto-delegated:watchosArm32TestKlibrary \ +multiplatform-crypto-delegated:watchosArm64MainKlibrary multiplatform-crypto-delegated:watchosArm64TestKlibrary \ +multiplatform-crypto-delegated:watchosX86MainKlibrary multiplatform-crypto-delegated:watchosX86TestKlibrary +set +e \ No newline at end of file diff --git a/macBuildAndPublish-mac-ios.sh b/macBuildAndPublish-mac-ios.sh new file mode 100644 index 0000000..aba1065 --- /dev/null +++ b/macBuildAndPublish-mac-ios.sh @@ -0,0 +1,15 @@ +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 +./makeMacosX86-64.sh +./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 +set +e diff --git a/macBuildAndPublish-pure.sh b/macBuildAndPublish-pure.sh new file mode 100644 index 0000000..e4fec5e --- /dev/null +++ b/macBuildAndPublish-pure.sh @@ -0,0 +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 +./makeMacosX86-64.sh +./makeIos.sh +#now we can do the delegated build of ios and macos libraries +cd .. +./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 +set +e diff --git a/macBuildAndPublish-tvos.sh b/macBuildAndPublish-tvos.sh new file mode 100644 index 0000000..c1b5636 --- /dev/null +++ b/macBuildAndPublish-tvos.sh @@ -0,0 +1,13 @@ +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 +./makeMacosX86-64.sh +./makeIos.sh +#now we can do the delegated build of ios and macos libraries +cd .. +./gradlew multiplatform-crypto-delegated:publishTvosArm64PublicationToMavenRepository \ +multiplatform-crypto-delegated:publishTvosX64PublicationToMavenRepository +set +e diff --git a/macBuildAndPublish-watchos.sh b/macBuildAndPublish-watchos.sh new file mode 100644 index 0000000..fb2531d --- /dev/null +++ b/macBuildAndPublish-watchos.sh @@ -0,0 +1,14 @@ +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 +./makeMacosX86-64.sh +./makeIos.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 +set +e diff --git a/macBuildAndPublish.sh b/macBuildAndPublish.sh deleted file mode 100644 index f3493d5..0000000 --- a/macBuildAndPublish.sh +++ /dev/null @@ -1,17 +0,0 @@ -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 -./makeMacosX86-64.sh -./makeIos.sh -./makeTvos.sh -./makeWatchos.sh -#now we can do the delegated build -cd .. -./gradlew multiplatform-crypto-delegated:build -#and finally pure build -./gradlew multiplatform-crypto:build -./gradlew build publishIos64ArmPublicationToSnapshotRepository publishIosPublicationToSnapshotRepository publishMacosX64PublicationToSnapshotRepository publishIos32ArmPublicationToSnapshotRepository -set +e \ No newline at end of file