From 90be6aac30eabdc12db4cd59bee5f9690f0d264c Mon Sep 17 00:00:00 2001 From: cybardev Date: Wed, 12 Feb 2025 10:05:23 -0400 Subject: [PATCH] [build] Use local .deps directory for users (fix #4998) For an user setup we'd prefer to download Skia inside a .deps directory (just to simplify the setup). For developers it's better if we offer a common/shared/absolute directory so different local Aseprite clones can share the same downloaded Skia version. Co-authored-by: David Capello --- .gitignore | 1 + build.sh | 32 +++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 28ed869a5..1a52ebe95 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ tests/_test* build .build +.deps CMakeSettings.json diff --git a/build.sh b/build.sh index 3f6044ae1..a7f03ee0e 100755 --- a/build.sh +++ b/build.sh @@ -369,19 +369,29 @@ if [ ! -f "$pwd/.build/$file_skia_dir" ] ; then skia_dir="$HOME/deps/$possible_skia_dir_name" fi + # Set default location if not found if [ ! -d "$skia_dir" ] ; then - echo "" - echo "Skia directory wasn't found." - echo "" - - echo "Select Skia directory to create [$skia_dir]? " - if [ ! $auto ] ; then - read skia_dir_read - if [ "$skia_dir_read" != "" ] ; then - skia_dir="$skia_dir_read" - fi + # Use .deps directory to download Skia for users (which is a + # simple setup). In case of developers we'd prefer the shared + # directory by default. + if [ "$userkind" == "user" ] ; then + skia_dir="$pwd/.deps/$possible_skia_dir_name" + fi + + if [ ! -d "$skia_dir" ] ; then + echo "" + echo "Skia directory wasn't found." + echo "" + + echo "Select Skia directory to create [$skia_dir]? " + if [ ! $auto ] ; then + read skia_dir_read + if [ "$skia_dir_read" != "" ] ; then + skia_dir="$skia_dir_read" + fi + fi + mkdir -p $skia_dir || exit 1 fi - mkdir -p $skia_dir || exit 1 fi echo $skia_dir > "$pwd/.build/$file_skia_dir" fi