From b7131086795d8dda4b6413fa67d8c3b895416405 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Mon, 3 Jul 2023 10:52:01 -0500 Subject: [PATCH 1/2] update docs to make it more clear that you have to run prebuild.sh fix markdown --- docs/building.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/building.md b/docs/building.md index 6e71727ef..f4b288509 100644 --- a/docs/building.md +++ b/docs/building.md @@ -31,7 +31,7 @@ Make a Pixel 4 (API 30) x86_64 emulator with 2GB of storage space for emulation ### Scripted setup -[`scripts/setup.sh`](./../scripts/setup.sh) is provided as a tool to set up installation for building: download the script and run it anywhere. This script should skip the entire [Manual setup](#manual-setup) section below and prepare you for [running](#Running). +[`scripts/setup.sh`](./../scripts/setup.sh) is provided as a tool to set up installation for building: download the script and run it anywhere. This script should skip the entire [Manual setup](#manual-setup) section below and prepare you to [run the prebuild script](#run-prebuild-script), [build the plugins](#Build-plugins), and [run](#Running). ### Manual setup > If you used the `setup.sh` script, skip to [running](#Running) @@ -98,20 +98,21 @@ cd .. ``` or manually by creating the files referenced in that script with the specified content. -### Building plugins for Android +### Build plugins +#### Building plugins for Android > Warning: This will take a long time, please be patient ``` cd scripts/android ./build_all.sh ``` -### Building plugins for Linux +#### Building plugins for Linux ``` cd scripts/linux ./build_all.sh ``` -### Building plugins for Windows +#### Building plugins for Windows ``` cd scripts/windows ./deps.sh From 5fd95a066169ff2f3ab6bd8f30a3da8f72dd0cc4 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Mon, 3 Jul 2023 10:59:34 -0500 Subject: [PATCH 2/2] flutter 3.7.12->3.10.0, run prebuild.sh, build the plugins 3.10.0->3.10.3 --- scripts/setup.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 529d2d7ec..93e6a2205 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,5 +1,7 @@ #!/bin/bash +export SCRIPTS=$(pwd) + sudo apt update && sudo apt upgrade -y && sudo apt dist-upgrade -y mkdir "$HOME/development" mkdir "$HOME/projects" @@ -12,7 +14,7 @@ sudo apt install -y unzip pkg-config clang cmake ninja-build libgtk-3-dev cd $DEVELOPMENT git clone https://github.com/flutter/flutter.git cd flutter -git checkout 3.7.12 +git checkout 3.10.3 export FLUTTER_DIR=$(pwd)/bin echo 'export PATH="$PATH:'${FLUTTER_DIR}'"' >> ~/.bashrc source ~/.bashrc @@ -46,9 +48,10 @@ rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-andro # printf 'const kChangeNowApiKey = "";\nconst kSimpleSwapApiKey = "";' > $KEYS # fi -# # build stack wallet plugins -# cd $STACK_WALLET -# cd scripts/android -# ./build_all.sh -# cd ../linux -# ./build_all.sh +# build stack wallet plugins +cd $SCRIPTS +./prebuild.sh +cd android +./build_all.sh +cd ../linux +./build_all.sh