From 036ddbb0ee6858ae532df82a2747aa93faee4487 Mon Sep 17 00:00:00 2001 From: Mouad Debbar Date: Mon, 3 Feb 2020 15:06:24 -0800 Subject: [PATCH] [web][felt] If full dart-sdk isn't available, install it (#16341) --- lib/web_ui/dev/felt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/web_ui/dev/felt b/lib/web_ui/dev/felt index 8dcac564c..a9dae177c 100755 --- a/lib/web_ui/dev/felt +++ b/lib/web_ui/dev/felt @@ -31,25 +31,26 @@ HOST_DEBUG_UNOPT_DIR="${ENGINE_SRC_DIR}/out/host_debug_unopt" DART_SDK_DIR="${ENGINE_SRC_DIR}/out/host_debug_unopt/dart-sdk" GN="${FLUTTER_DIR}/tools/gn" DART_TOOL_DIR="${WEB_UI_DIR}/.dart_tool" +PUB_PATH="$DART_SDK_DIR/bin/pub" SNAPSHOT_PATH="${DART_TOOL_DIR}/felt.snapshot" STAMP_PATH="${DART_TOOL_DIR}/felt.snapshot.stamp" SCRIPT_PATH="${DEV_DIR}/felt.dart" REVISION="$(cd "$FLUTTER_DIR"; git rev-parse HEAD)" -if [ ! -d "${OUT_DIR}" ] || [ ! -d "${HOST_DEBUG_UNOPT_DIR}" ] +if [ ! -f "${PUB_PATH}" ] then echo "Compiling the Dart SDK." gclient sync $GN --unoptimized --full-dart-sdk - ninja -C $HOST_DEBUG_UNOPT_DIR + ninja -C $HOST_DEBUG_UNOPT_DIR -j 100 fi install_deps() { echo "Running \`pub get\` in 'engine/src/flutter/lib/web_ui'" - (cd "$WEB_UI_DIR"; $DART_SDK_DIR/bin/pub get) + (cd "$WEB_UI_DIR"; $PUB_PATH get) echo "Running \`pub get\` in 'engine/src/flutter/web_sdk/web_engine_tester'" - (cd "$FLUTTER_DIR/web_sdk/web_engine_tester"; $DART_SDK_DIR/bin/pub get) + (cd "$FLUTTER_DIR/web_sdk/web_engine_tester"; $PUB_PATH get) } if [[ "$FELT_USE_SNAPSHOT" == "false" || "$FELT_USE_SNAPSHOT" == "0" ]]; then -- GitLab