diff --git a/VERSION.sh b/VERSION.sh index f609f7b5..eed50d32 100755 --- a/VERSION.sh +++ b/VERSION.sh @@ -44,12 +44,23 @@ git checkout -f tags/$THOR_VER && git clean -ffd && +cd ~/thorium && + +# Add //third_party/libjxl to DEPS cp -v thorium-libjxl/DEPS ~/chromium/src/ +# Use our artifacts hash +cp -v src/build/vs_toolchain.py ~/chromium/src/build/ + +cd ~/chromium/src && + gclient sync --with_branch_heads --with_tags -f -R -D && gclient runhooks && +# Install all sysroots (i.e. for ARM64) +build/linux/sysroot_scripts/install-sysroot.py --all && + cd ~/thorium && printf "\n" diff --git a/setup.sh b/setup.sh index a5c9f60b..f2c3c4e3 100755 --- a/setup.sh +++ b/setup.sh @@ -45,6 +45,7 @@ printf "${YEL}Copying Thorium source files over the Chromium tree...\n" && tput sgr0 && # Copy libjxl src +cd ~/thorium && cp -r -v thorium-libjxl/src/. $HOME/chromium/src/ && # Copy Thorium sources diff --git a/src/build/vs_toolchain.py b/src/build/vs_toolchain.py index c1b94fd8..adae0f4c 100755 --- a/src/build/vs_toolchain.py +++ b/src/build/vs_toolchain.py @@ -33,7 +33,7 @@ from gn_helpers import ToGNString # Affects the availability of APIs in the toolchain headers. # * //docs/windows_build_instructions.md mentions of VS or Windows SDK. # Keeps the document consistent with the toolchain version. -TOOLCHAIN_HASH = '1023ce2e82' +TOOLCHAIN_HASH = '740cbbb033' script_dir = os.path.dirname(os.path.realpath(__file__)) json_data_file = os.path.join(script_dir, 'win_toolchain.json') diff --git a/trunk.sh b/trunk.sh index a8982e29..ad74c786 100755 --- a/trunk.sh +++ b/trunk.sh @@ -38,10 +38,6 @@ gsyncShallow () { cd $HOME/chromium/src/third_party/devtools-frontend/src && - git checkout -f origin/main && - - cd $HOME/chromium/src/third_party/ffmpeg && - git checkout -f origin/main && cd $HOME/chromium/src &&