From a654481ba50567a09a3505878f1b170b4ed85259 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Thu, 11 Jun 2020 18:37:56 +0200 Subject: [PATCH] Fixed osx scripts, added windows script --- .travis.yml | 4 ++++ linuxBuildAndPublish.sh | 4 +++- macBuild-tvos.sh | 3 +-- macBuild-watchos.sh | 3 +-- macBuildAndPublish-pure.sh | 6 ------ macBuildAndPublish-tvos.sh | 2 +- macBuildAndPublish-watchos.sh | 3 +-- windowsBuild.sh | 13 +++++++++++++ windowsBuildAndPublish.sh | 24 ++++++++++++++++++++++++ 9 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 windowsBuild.sh create mode 100644 windowsBuildAndPublish.sh diff --git a/.travis.yml b/.travis.yml index 5a5c133..7f8c684 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ matrix: # - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./linuxBuildAndPublish.sh; fi' # OSX macos/ios - os: osx + name: osx-mac-ios osx_image: xcode11.4 language: java jdk: openjdk12 @@ -28,6 +29,7 @@ matrix: - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-mac-ios.sh; fi' # OSX watchos - os: osx + name: osx-watchos osx_image: xcode11.4 language: java jdk: openjdk12 @@ -40,6 +42,7 @@ matrix: - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-watchos.sh; fi' # OSX tvos - os: osx + name: osx-tvos osx_image: xcode11.4 language: java jdk: openjdk12 @@ -52,6 +55,7 @@ matrix: - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-tvos.sh; fi' # OSX pure - os: osx + name: osx-pure osx_image: xcode11.4 language: java jdk: openjdk12 diff --git a/linuxBuildAndPublish.sh b/linuxBuildAndPublish.sh index f576a78..3df17bf 100644 --- a/linuxBuildAndPublish.sh +++ b/linuxBuildAndPublish.sh @@ -18,5 +18,7 @@ cd .. ./gradlew multiplatform-crypto-delegated:build #and finally pure build ./gradlew multiplatform-crypto:build -./gradlew publishJvmPublicationToSnapshotRepository publishJsPublicationToSnapshotRepository publishKotlinMultiplatformPublicationToSnapshotRepository publishLinuxX64PublicationToSnapshotRepository publishLinuxArm64PublicationToSnapshotRepository publishMetadataPublicationToSnapshotRepository +./gradlew publishJvmPublicationToSnapshotRepository publishJsPublicationToSnapshotRepository \ +publishKotlinMultiplatformPublicationToSnapshotRepository publishLinuxX64PublicationToSnapshotRepository \ +publishLinuxArm64PublicationToSnapshotRepository publishMetadataPublicationToSnapshotRepository set +e \ No newline at end of file diff --git a/macBuild-tvos.sh b/macBuild-tvos.sh index cc0069e..d07e1d7 100644 --- a/macBuild-tvos.sh +++ b/macBuild-tvos.sh @@ -4,8 +4,7 @@ set -e ./gradlew multiplatform-crypto-api:build #now let's build linux deps cd sodiumWrapper -./makeMacosX86-64.sh -./makeIos.sh +./makeTvos.sh #now we can do the delegated build of ios and macos libraries cd .. ./gradlew multiplatform-crypto-delegated:tvosArm64MainKlibrary multiplatform-crypto-delegated:tvosArm64TestKlibrary \ diff --git a/macBuild-watchos.sh b/macBuild-watchos.sh index 17f8442..1741885 100644 --- a/macBuild-watchos.sh +++ b/macBuild-watchos.sh @@ -4,8 +4,7 @@ set -e ./gradlew multiplatform-crypto-api:build #now let's build linux deps cd sodiumWrapper -./makeMacosX86-64.sh -./makeIos.sh +./makeWatchos.sh #now we can do the delegated build of ios and macos libraries cd .. ./gradlew multiplatform-crypto-delegated:watchosArm32MainKlibrary multiplatform-crypto-delegated:watchosArm32TestKlibrary \ diff --git a/macBuildAndPublish-pure.sh b/macBuildAndPublish-pure.sh index e4fec5e..c456dfa 100644 --- a/macBuildAndPublish-pure.sh +++ b/macBuildAndPublish-pure.sh @@ -2,12 +2,6 @@ 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 \ diff --git a/macBuildAndPublish-tvos.sh b/macBuildAndPublish-tvos.sh index c1b5636..16c0d02 100644 --- a/macBuildAndPublish-tvos.sh +++ b/macBuildAndPublish-tvos.sh @@ -5,7 +5,7 @@ set -e #now let's build linux deps cd sodiumWrapper ./makeMacosX86-64.sh -./makeIos.sh +./makeTvos.sh #now we can do the delegated build of ios and macos libraries cd .. ./gradlew multiplatform-crypto-delegated:publishTvosArm64PublicationToMavenRepository \ diff --git a/macBuildAndPublish-watchos.sh b/macBuildAndPublish-watchos.sh index fb2531d..ed8191c 100644 --- a/macBuildAndPublish-watchos.sh +++ b/macBuildAndPublish-watchos.sh @@ -4,8 +4,7 @@ set -e ./gradlew multiplatform-crypto-api:build #now let's build linux deps cd sodiumWrapper -./makeMacosX86-64.sh -./makeIos.sh +./makeWatchos.sh #now we can do the delegated build of ios and macos libraries cd .. ./gradlew multiplatform-crypto-delegated:publishWatchosArm32PublicationToMavenRepository \ diff --git a/windowsBuild.sh b/windowsBuild.sh new file mode 100644 index 0000000..afaadcf --- /dev/null +++ b/windowsBuild.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 +cd sodiumWrapper +./makeMingwX86-64.sh +#now we can do the delegated build +cd .. +./gradlew multiplatform-crypto-delegated:build +#and finally pure build +./gradlew multiplatform-crypto:build +set +e + diff --git a/windowsBuildAndPublish.sh b/windowsBuildAndPublish.sh new file mode 100644 index 0000000..3df17bf --- /dev/null +++ b/windowsBuildAndPublish.sh @@ -0,0 +1,24 @@ +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 +export CLANG_BIN=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin +cd sodiumWrapper +./makeLinuxX86-64.sh +#Workaround for travis using wrong ld +if [ "$TRAVIS" = "true" ] +then + sudo mv /usr/bin/ld /usr/bin/ld.bck + sudo ln -s $CLANG_BIN/ld.lld /usr/bin/ld +fi +./makeLinuxArm64.sh +#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 +set +e \ No newline at end of file