From f64e85e8a12a00c371e737cd6daaae522f9ca111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Sun, 8 Jan 2023 17:49:58 +0100
Subject: [PATCH] Install Wine and Mono
---
install.sh | 28 ++++++++--------------------
test.sh | 23 +++++++----------------
2 files changed, 15 insertions(+), 36 deletions(-)
diff --git a/install.sh b/install.sh
index ab54d30..f12b0bb 100755
--- a/install.sh
+++ b/install.sh
@@ -36,25 +36,13 @@ apt-get clean
rm -rf /var/lib/apt/lists/*
################
-# Android Part #
+# Wine Part #
################
-# Install Android SDK Manager
-wget --no-verbose -O cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
-unzip cmdline-tools.zip
-rm cmdline-tools.zip
-mkdir -p ${ANDROID_HOME}/cmdline-tools
-mv cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest
-
-# Accept all those nasty EULAs
-mkdir -p ${ANDROID_HOME}/licenses/
-printf "\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > ${ANDROID_HOME}/licenses/android-sdk-license
-printf "\n84831b9409646a918e30573bab4c9c91346d8abd" > ${ANDROID_HOME}/licenses/android-sdk-preview-license
-printf "\n79120722343a6f314e0719f863036c702b0e6b2a\n84831b9409646a918e30573bab4c9c91346d8abd" > ${ANDROID_HOME}/licenses/android-sdk-preview-license-old
-
-# Install platform-tools, build-tools and platform to prevent re-download each time
-mkdir /root/.android
-touch /root/.android/repositories.cfg
-echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools"
-echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "build-tools;30.0.3"
-echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platforms;android-30"
+# Install Wine
+dpkg --add-architecture i386
+mkdir -pm755 /etc/apt/keyrings
+wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key
+wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/focal/winehq-focal.sources
+apt-get update
+apt-get install -y winehq-stable
diff --git a/test.sh b/test.sh
index fe031fc..cf62e1e 100755
--- a/test.sh
+++ b/test.sh
@@ -2,24 +2,15 @@
set -e
set -x
+# Would be nice to install this in install.sh, but it looks like this is installed for the current
+# user only in ~/.wine/drive_c/... and is not persisted in the build machine.
+wget https://dl.winehq.org/wine/wine-mono/7.4.0/wine-mono-7.4.0-x86.msi
+wine msiexec /i wine-mono-7.4.0-x86.msi
+
echo "Testing Briar Desktop"
git clone --recurse-submodules https://code.briarproject.org/briar/briar-desktop.git briar-desktop
cd briar-desktop
-./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-11-openjdk-amd64 --no-daemon kaptKotlin
-./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 --no-daemon -x kaptKotlin packageDeb
+git checkout windows-packaging
+./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 --no-daemon pinpitPackageDefault
cd ..
echo "Building Briar Desktop was successful"
-
-echo "Testing Briar Android..."
-git clone --depth 1 https://code.briarproject.org/briar/briar.git briar
-cd briar
-./gradlew --no-daemon animalSnifferMain animalSnifferTest test
-cd ..
-echo "Building Briar Android was successful"
-
-echo "Testing Briar Mailbox..."
-git clone --depth 1 https://code.briarproject.org/briar/briar-mailbox.git briar-mailbox
-cd briar-mailbox
-./gradlew --no-daemon check lint
-cd ..
-echo "Building Briar Mailbox was successful"
--
GitLab