From a433b65ae19b38aa6bfeaa0d7a1a99ce6f2bb450 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Thu, 19 Jan 2023 16:57:53 -0800 Subject: [PATCH] Final Windows and Linux Fixes. Initial Android Script --- libcwtch.v1.10.2-android.script | 74 +++++++++++++++++++++++++++++++++ libcwtch.v1.10.2-linux.script | 2 +- libcwtch.v1.10.2-windows.script | 2 +- 3 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 libcwtch.v1.10.2-android.script diff --git a/libcwtch.v1.10.2-android.script b/libcwtch.v1.10.2-android.script new file mode 100644 index 0000000..878636a --- /dev/null +++ b/libcwtch.v1.10.2-android.script @@ -0,0 +1,74 @@ +# Note: This is currently incomplete. Build +# Mount Virtual Disk for More Space +@!setup-secondary +cd /mount +mkdir gopath +# Downloading Go +wget https://go.dev/dl/go1.19.3.linux-amd64.tar.gz +@!check go1.19.3.linux-amd64.tar.gz 1bf389df6d7efa6b54b04332c70356ee0d133753b1e58753e80ebafcff0f559c61223ddad3f5d024f0c538dbbd7d6ac92abb6b022f6a171a91a5ef39b0d82c9b +tar -xzf go1.19.3.linux-amd64.tar.gz +apt update -qq +apt install -qq -y --no-install-recommends strace netcat git wget libc6-dev make gcc unzip + +# Install JDK8 +wget https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u342-b07/OpenJDK8U-jdk_x64_linux_8u342b07.tar.gz +@!check OpenJDK8U-jdk_x64_linux_8u342b07.tar.gz 9a871e4dd2698ae8f4063aad7998414a7472926fbe46b3c89567d86338427bb85acb7e390e88c3c311cd5e631051b358530352fc6e7d65e9ea6c8cff0e72bc09 +tar -xzf OpenJDK8U-jdk_x64_linux_8u342b07.tar.gz +export JAVA_HOME=/mount/openjdk-8u342-b07/ +export PATH="/mount/openjdk-8u342-b07/bin/:$PATH" + +# Setup Android SDK +mkdir android-sdk +cd android-sdk +mkdir .android +wget -q -O sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip +unzip -q sdk.zip +rm sdk.zip +export ANDROID_SDK=/mount/android-sdk +export ANDROID_HOME=/mount/android-sdk +yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses +$ANDROID_HOME/tools/bin/sdkmanager --update +$ANDROID_HOME/tools/bin/sdkmanager "build-tools;30.0.2" "platforms;android-31" "platform-tools" +$ANDROID_HOME/tools/bin/sdkmanager "ndk;21.0.6113669" +export NDK_VER="21.0.6113669" +@%ln -sf $ANDROID_HOME/ndk/$NDK_VER $ANDROID_HOME/ndk-bundle +echo 'hosts: files dns' > /etc/nsswitch.conf + +# Setup Go +ln -s /mount/go /usr/local/go +ln -s /mount/gopath /gomobile +export GOROOT="/usr/local/go" +export GOPATH="/gomobile" +export GOCACHE="/tmp/gocache" +export PATH="$GOPATH/bin:/usr/local/go/bin:$PATH" +go version + +# Building gomobile +export GOMOBILEHASH="43a0384520996c8376bfb8637390f12b44773e65" +mkdir -p $GOPATH/src/golang.org/x +mkdir -p $GOPATH/bin/ +mkdir -p $GOPATH/pkg/ +cd $GOPATH/src/golang.org/x +git clone https://github.com/golang/mobile.git +cd mobile +git checkout $GOMOBILEHASH +go install golang.org/x/mobile/cmd/gomobile@$GOMOBILEHASH +go install golang.org/x/mobile/cmd/gobind@$GOMOBILEHASH +gomobile clean + +# Building libCwtch.so +cd /mount +git clone https://git.openprivacy.ca/cwtch.im/libcwtch-go +mkdir /drone +ln -s /mount/libcwtch-go /drone/src +cd /drone/src +git fetch --tags +git checkout tags/v1.10.2 -b v1.10.2 +echo `git describe --tags` > VERSION + +go mod download +gomobile init +@%make android +@!extract cwtch.aar +sha512sum cwtch.aar +@!check cwtch.aar a980cab003496fb839448dba3541c26daa71eca494696c36d87d15a38c73a14142f43e884fd010ce8d19e300e336e90457862f44f9211a7d1461d7fb0fce8a2f \ No newline at end of file diff --git a/libcwtch.v1.10.2-linux.script b/libcwtch.v1.10.2-linux.script index 0122b60..5808d11 100644 --- a/libcwtch.v1.10.2-linux.script +++ b/libcwtch.v1.10.2-linux.script @@ -19,9 +19,9 @@ export PATH="/usr/local/go/bin/:$PATH" go version # Building libCwtch.so git clone https://git.openprivacy.ca/cwtch.im/libcwtch-go +cd libcwtch-go git fetch --tags git checkout tags/v1.10.2 -b v1.10.2 -cd libcwtch-go echo `git describe --tags` > VERSION go mod download make linux diff --git a/libcwtch.v1.10.2-windows.script b/libcwtch.v1.10.2-windows.script index fb5cf35..5dac30a 100644 --- a/libcwtch.v1.10.2-windows.script +++ b/libcwtch.v1.10.2-windows.script @@ -19,8 +19,8 @@ export PATH="/usr/local/go/bin/:$PATH" go version # Building libCwtch.dll git clone https://git.openprivacy.ca/cwtch.im/libcwtch-go -git fetch --tags cd libcwtch-go +git fetch --tags git checkout tags/v1.10.2 -b v1.10.2 echo `git describe --tags` > VERSION go mod download