From 1a484bfb55e7b6c6c5d0d0ad51d504466dc630fb Mon Sep 17 00:00:00 2001
From: Ugljesa Jovanovic <ionspinf@gmail.com>
Date: Thu, 11 Jun 2020 19:11:44 +0200
Subject: [PATCH] Add autogen to tvos and watchos builds scripts

---
 .travis.yml                       | 26 +++++++++++++-------------
 macBuildAndPublish-tvos.sh        |  1 -
 sodiumWrapper/configureMacos64.sh |  2 --
 sodiumWrapper/makeTvos.sh         |  3 +++
 sodiumWrapper/makeWatchos.sh      |  3 +++
 windowsBuildAndPublish.sh         | 10 +---------
 6 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7f8c684..73addda 100644
--- a/.travis.yml
+++ b/.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/
diff --git a/macBuildAndPublish-tvos.sh b/macBuildAndPublish-tvos.sh
index 16c0d02..c331bb7 100644
--- a/macBuildAndPublish-tvos.sh
+++ b/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 ..
diff --git a/sodiumWrapper/configureMacos64.sh b/sodiumWrapper/configureMacos64.sh
index b5d7197..1ae7f69 100755
--- a/sodiumWrapper/configureMacos64.sh
+++ b/sodiumWrapper/configureMacos64.sh
@@ -11,6 +11,4 @@ cd libsodium
 
 ./autogen.sh -s -f
 
-#TODO set up konan apple clang
-
 ./configure --prefix=$PREFIX "$@"
diff --git a/sodiumWrapper/makeTvos.sh b/sodiumWrapper/makeTvos.sh
index cfcc4de..f49790f 100755
--- a/sodiumWrapper/makeTvos.sh
+++ b/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
diff --git a/sodiumWrapper/makeWatchos.sh b/sodiumWrapper/makeWatchos.sh
index 5390eb1..50d631a 100755
--- a/sodiumWrapper/makeWatchos.sh
+++ b/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
diff --git a/windowsBuildAndPublish.sh b/windowsBuildAndPublish.sh
index 3df17bf..9b36ebb 100644
--- a/windowsBuildAndPublish.sh
+++ b/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