From f5b32fb7eb3d983938d871a0aabe6cf07b8c9cad Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Thu, 15 Feb 2024 01:12:15 -0600 Subject: [PATCH] fix debug shell scripts --- infra/DEBUG/build_debug_linux.sh | 13 ++++++++++++- infra/DEBUG/build_debug_shell_linux.sh | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/infra/DEBUG/build_debug_linux.sh b/infra/DEBUG/build_debug_linux.sh index ddf6faa5..e3191d22 100755 --- a/infra/DEBUG/build_debug_linux.sh +++ b/infra/DEBUG/build_debug_linux.sh @@ -30,10 +30,21 @@ printf "\n" && printf "${YEL}Building Thorium DEBUG for Linux...\n" && printf "${CYA}\n" && +# chromium/src dir env variable +if [ -z "${CR_DIR}" ]; then + CR_SRC_DIR="$HOME/chromium/src" + export CR_SRC_DIR +else + CR_SRC_DIR="${CR_DIR}" + export CR_SRC_DIR +fi + # Build Thorium and Thorium UI Debug Shell export NINJA_SUMMARIZE_BUILD=1 && -autoninja -C ~/chromium/src/out/thorium chrome chrome_sandbox chromedriver thorium_shell thorium_ui_debug_shell clear_key_cdm -j$@ && +cd ${CR_SRC_DIR} && +autoninja -C /out/thorium chrome chrome_sandbox chromedriver thorium_shell thorium_ui_debug_shell clear_key_cdm -j$@ && +cd ~/thorium/infra/DEBUG && mkdir -v -p ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell && mkdir -v -p ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/lib && diff --git a/infra/DEBUG/build_debug_shell_linux.sh b/infra/DEBUG/build_debug_shell_linux.sh index 2e8266e7..e4e1cbd7 100755 --- a/infra/DEBUG/build_debug_shell_linux.sh +++ b/infra/DEBUG/build_debug_shell_linux.sh @@ -30,10 +30,21 @@ printf "\n" && printf "${YEL}Building Thorium UI Debug Shell for Linux...\n" && printf "${CYA}\n" && +# chromium/src dir env variable +if [ -z "${CR_DIR}" ]; then + CR_SRC_DIR="$HOME/chromium/src" + export CR_SRC_DIR +else + CR_SRC_DIR="${CR_DIR}" + export CR_SRC_DIR +fi + # Build Thorium UI Debug Shell export NINJA_SUMMARIZE_BUILD=1 && -autoninja -C ~/chromium/src/out/thorium thorium_ui_debug_shell -j$@ && +cd ${CR_SRC_DIR} && +autoninja -C out/thorium thorium_ui_debug_shell -j$@ && +cd ~/thorium/infra/DEBUG && mkdir -v -p ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell && mkdir -v -p ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/lib && @@ -57,7 +68,7 @@ cp -r -f -v ~/chromium/src/out/thorium/ui ~/chromium/src/out/thorium/Thorium_UI_ cp -r -f -v ~/chromium/src/out/thorium/libffmpeg.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && cp -r -f -v ~/chromium/src/out/thorium/libffmpeg.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/lib && # cp -r -f -v ~/chromium/src/out/thorium/libblink_test_plugin.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && -cp -r -f -v ~/chromium/src/out/thorium/libmojo_core.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && +# cp -r -f -v ~/chromium/src/out/thorium/libmojo_core.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && cp -r -f -v ~/chromium/src/out/thorium/icudtl.dat ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && cp -r -f -v ~/chromium/src/out/thorium/content_resources.pak ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ && cp -r -f -v ~/chromium/src/out/thorium/libEGL.so ~/chromium/src/out/thorium/Thorium_UI_Debug_Shell/ &&