Add autogen to tvos and watchos builds scripts

.travis.yml

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

macBuildAndPublish-tvos.sh

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

sodiumWrapper/configureMacos64.sh

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

sodiumWrapper/makeTvos.sh

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

sodiumWrapper/makeWatchos.sh

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

windowsBuildAndPublish.sh

@@ -3,16 +3,8 @@ set -e
 #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
+./makeMingwX86-64.sh
 #now we can do the delegated build
 cd ..
 ./gradlew multiplatform-crypto-delegated:build