YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add autogen to tvos and watchos builds scripts

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-06-11 19:11:44 +02:00 committed by Ugljesa Jovanovic
parent a654481ba5
commit 1a484bfb55
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
6 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.travis.yml
View File

@ -66,19 +66,19 @@ matrix:
script: script:
- 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-pure.sh; fi' - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash ./macBuild-pure.sh; fi'
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-pure.sh; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./macBuildAndPublish-pure.sh; fi'
# - os: windows - os: windows
# language: shell language: shell
# jdk: openjdk12 jdk: openjdk12
# env: env:
# - GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/" - GRAVIS="https://raw.githubusercontent.com/DanySK/Gravis-CI/master/"
# - JAVA_OPTS=-Xmx2g - JAVA_OPTS=-Xmx2g
# - JDK="adopt-openj9@1.11" - JDK="adopt-openj9@1.11"
# before_install: before_install:
# - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh - curl "${GRAVIS}.install-jdk-travis.sh" --output ~/.install-jdk-travis.sh
# - source ~/.install-jdk-travis.sh - source ~/.install-jdk-travis.sh
# script: script:
# - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./gradlew build ; fi' - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then ./windowsBuild.sh; fi'
# - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./gradlew build publishMingwx64PublicationToSnapshotRepository; fi' - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./windowsBuildAndPublish.sh; fi'
cache: cache:
directories: directories:
- $HOME/.m2/ - $HOME/.m2/

1
macBuildAndPublish-tvos.sh
View File

@ -4,7 +4,6 @@ set -e
./gradlew multiplatform-crypto-api:build ./gradlew multiplatform-crypto-api:build
#now let's build linux deps #now let's build linux deps
cd sodiumWrapper cd sodiumWrapper
./makeMacosX86-64.sh
./makeTvos.sh ./makeTvos.sh
#now we can do the delegated build of ios and macos libraries #now we can do the delegated build of ios and macos libraries
cd .. cd ..

2
sodiumWrapper/configureMacos64.sh
View File

@ -11,6 +11,4 @@ cd libsodium
./autogen.sh -s -f ./autogen.sh -s -f
#TODO set up konan apple clang
./configure --prefix=$PREFIX "$@" ./configure --prefix=$PREFIX "$@"

3
sodiumWrapper/makeTvos.sh
View File

@ -1,4 +1,7 @@
cd libsodium cd libsodium
./autogen.sh -s -f
./configure --prefix=$PREFIX "$@"
./dist-build/tvos.sh ./dist-build/tvos.sh
mkdir ../static-tvos mkdir ../static-tvos
cp -R ./libsodium-tvos/lib ../static-tvos/lib cp -R ./libsodium-tvos/lib ../static-tvos/lib

3
sodiumWrapper/makeWatchos.sh
View File

@ -1,4 +1,7 @@
cd libsodium cd libsodium
./autogen.sh -s -f
./configure --prefix=$PREFIX "$@"
./dist-build/watchos.sh ./dist-build/watchos.sh
mkdir ../static-watchos mkdir ../static-watchos
cp -R ./libsodium-watchos/lib ../static-watchos/lib cp -R ./libsodium-watchos/lib ../static-watchos/lib

10
windowsBuildAndPublish.sh
View File

@ -3,16 +3,8 @@ set -e
#this will hopefully download all konan dependancies that we use in the build scripts #this will hopefully download all konan dependancies that we use in the build scripts
./gradlew multiplatform-crypto-api:build ./gradlew multiplatform-crypto-api:build
#now let's build linux deps #now let's build linux deps
export CLANG_BIN=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin
cd sodiumWrapper cd sodiumWrapper
./makeLinuxX86-64.sh ./makeMingwX86-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 #now we can do the delegated build
cd .. cd ..
./gradlew multiplatform-crypto-delegated:build ./gradlew multiplatform-crypto-delegated:build