diff --git a/Meta/WPT.sh b/Meta/WPT.sh index 093ef6be5d5..6ee97d8d8f8 100755 --- a/Meta/WPT.sh +++ b/Meta/WPT.sh @@ -12,13 +12,18 @@ ensure_ladybird_source_dir WPT_SOURCE_DIR=${WPT_SOURCE_DIR:-"${LADYBIRD_SOURCE_DIR}/Tests/LibWeb/WPT/wpt"} WPT_REPOSITORY_URL=${WPT_REPOSITORY_URL:-"https://github.com/web-platform-tests/wpt.git"} +BUILD_PRESET=${BUILD_PRESET:-default} + +BUILD_DIR=$(get_build_dir "$BUILD_PRESET") + default_binary_path() { if [ "$(uname -s)" = "Darwin" ]; then - echo "${LADYBIRD_SOURCE_DIR}/Build/ladybird/bin/Ladybird.app/Contents/MacOS/" + echo "${BUILD_DIR}/bin/Ladybird.app/Contents/MacOS/" else - echo "${LADYBIRD_SOURCE_DIR}/Build/ladybird/bin/" + echo "${BUILD_DIR}/bin/" fi } + LADYBIRD_BINARY=${LADYBIRD_BINARY:-"$(default_binary_path)/Ladybird"} WEBDRIVER_BINARY=${WEBDRIVER_BINARY:-"$(default_binary_path)/WebDriver"} WPT_PROCESSES=${WPT_PROCESSES:-$(get_number_of_processing_units)} diff --git a/Meta/ladybird.sh b/Meta/ladybird.sh index 8f2ed508429..e79c025e20f 100755 --- a/Meta/ladybird.sh +++ b/Meta/ladybird.sh @@ -95,18 +95,7 @@ cmd_with_target() { ensure_ladybird_source_dir - # Note: Keep in sync with buildDir defaults in CMakePresets.json - case "${BUILD_PRESET}" in - "default") - BUILD_DIR="${LADYBIRD_SOURCE_DIR}/Build/ladybird" - ;; - "Debug") - BUILD_DIR="${LADYBIRD_SOURCE_DIR}/Build/ladybird-debug" - ;; - "Sanitizer") - BUILD_DIR="${LADYBIRD_SOURCE_DIR}/Build/ladybird-sanitizers" - ;; - esac + BUILD_DIR=$(get_build_dir "$BUILD_PRESET") CMAKE_ARGS+=("-DCMAKE_INSTALL_PREFIX=$LADYBIRD_SOURCE_DIR/Build/ladybird-install-${BUILD_PRESET}") diff --git a/Meta/shell_include.sh b/Meta/shell_include.sh index b73d48b30bb..864d8c5d143 100644 --- a/Meta/shell_include.sh +++ b/Meta/shell_include.sh @@ -60,3 +60,26 @@ ensure_ladybird_source_dir() { export LADYBIRD_SOURCE_DIR fi } + +get_build_dir() { + ensure_ladybird_source_dir + + # Note: Keep in sync with buildDir defaults in CMakePresets.json + case "$1" in + "default") + BUILD_DIR="${LADYBIRD_SOURCE_DIR}/Build/ladybird" + ;; + "Debug") + BUILD_DIR="${LADYBIRD_SOURCE_DIR}/Build/ladybird-debug" + ;; + "Sanitizer") + BUILD_DIR="${LADYBIRD_SOURCE_DIR}/Build/ladybird-sanitizers" + ;; + *) + echo "Unknown BUILD_PRESET: '$1'" >&2 + exit 1 + ;; + esac + + echo "${BUILD_DIR}" +}