Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix script to work when SDK is located anywhere.

Browse source
This commit is contained in:
Benoit Marty 2023-12-13 17:05:00 +01:00 • committed by Benoit Marty
parent 5cf78b696b
commit 407b4bd3c7
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tools/sdk/build_rust_sdk.sh
View file

@ -8,6 +8,7 @@ read -p "Do you want to build the Rust SDK from local source (yes/no) default to
buildLocal=${buildLocal:-yes} buildLocal=${buildLocal:-yes}
date=$(gdate +%Y%m%d%H%M%S) date=$(gdate +%Y%m%d%H%M%S)
elementPwd=`pwd`
# Ask for the Rust SDK local source path # Ask for the Rust SDK local source path
# if folder rustSdk/ exists, use it as default # if folder rustSdk/ exists, use it as default
@ -28,7 +29,7 @@ else
cd matrix-rust-sdk-$date cd matrix-rust-sdk-$date
git checkout ${rustSdkBranch} git checkout ${rustSdkBranch}
rustSdkPath=$(pwd) rustSdkPath=$(pwd)
cd ../element-x-android cd ${elementPwd}
fi fi
@ -46,6 +47,8 @@ fi
read -p "Do you want to build the app after (yes/no) default to yes? " buildApp read -p "Do you want to build the app after (yes/no) default to yes? " buildApp
buildApp=${buildApp:-yes} buildApp=${buildApp:-yes}
cd ${elementPwd}
# If folder ../matrix-rust-components-kotlin does not exist, clone the repo # If folder ../matrix-rust-components-kotlin does not exist, clone the repo
if [ ! -d "../matrix-rust-components-kotlin" ]; then if [ ! -d "../matrix-rust-components-kotlin" ]; then
printf "\nFolder ../matrix-rust-components-kotlin does not exist. Cloning the repository into ../matrix-rust-components-kotlin.\n\n" printf "\nFolder ../matrix-rust-components-kotlin does not exist. Cloning the repository into ../matrix-rust-components-kotlin.\n\n"
@ -59,9 +62,9 @@ git checkout main
git pull git pull
printf "\nBuilding the SDK for aarch64-linux-android...\n\n" printf "\nBuilding the SDK for aarch64-linux-android...\n\n"
./scripts/build.sh -p ${rustSdkPath} -m sdk -t aarch64-linux-android -o ../element-x-android/libraries/rustsdk ./scripts/build.sh -p ${rustSdkPath} -m sdk -t aarch64-linux-android -o ${elementPwd}/libraries/rustsdk
cd ../element-x-android cd ${elementPwd}
mv ./libraries/rustsdk/sdk-android-debug.aar ./libraries/rustsdk/matrix-rust-sdk.aar mv ./libraries/rustsdk/sdk-android-debug.aar ./libraries/rustsdk/matrix-rust-sdk.aar
mkdir -p ./libraries/rustsdk/sdks mkdir -p ./libraries/rustsdk/sdks
cp ./libraries/rustsdk/matrix-rust-sdk.aar ./libraries/rustsdk/sdks/matrix-rust-sdk-${date}.aar cp ./libraries/rustsdk/matrix-rust-sdk.aar ./libraries/rustsdk/sdks/matrix-rust-sdk-${date}.aar