mirror of https://github.com/aseprite/aseprite.git
[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 <david@igara.com>
This commit is contained in:
parent
600882352e
commit
90be6aac30
|
@ -16,4 +16,5 @@
|
||||||
tests/_test*
|
tests/_test*
|
||||||
build
|
build
|
||||||
.build
|
.build
|
||||||
|
.deps
|
||||||
CMakeSettings.json
|
CMakeSettings.json
|
||||||
|
|
32
build.sh
32
build.sh
|
@ -369,19 +369,29 @@ if [ ! -f "$pwd/.build/$file_skia_dir" ] ; then
|
||||||
skia_dir="$HOME/deps/$possible_skia_dir_name"
|
skia_dir="$HOME/deps/$possible_skia_dir_name"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Set default location if not found
|
||||||
if [ ! -d "$skia_dir" ] ; then
|
if [ ! -d "$skia_dir" ] ; then
|
||||||
echo ""
|
# Use .deps directory to download Skia for users (which is a
|
||||||
echo "Skia directory wasn't found."
|
# simple setup). In case of developers we'd prefer the shared
|
||||||
echo ""
|
# directory by default.
|
||||||
|
if [ "$userkind" == "user" ] ; then
|
||||||
echo "Select Skia directory to create [$skia_dir]? "
|
skia_dir="$pwd/.deps/$possible_skia_dir_name"
|
||||||
if [ ! $auto ] ; then
|
fi
|
||||||
read skia_dir_read
|
|
||||||
if [ "$skia_dir_read" != "" ] ; then
|
if [ ! -d "$skia_dir" ] ; then
|
||||||
skia_dir="$skia_dir_read"
|
echo ""
|
||||||
fi
|
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
|
fi
|
||||||
mkdir -p $skia_dir || exit 1
|
|
||||||
fi
|
fi
|
||||||
echo $skia_dir > "$pwd/.build/$file_skia_dir"
|
echo $skia_dir > "$pwd/.build/$file_skia_dir"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue