fix scripts

This commit is contained in:
Alexander Frick 2023-03-02 07:16:07 -06:00
parent 51cde53765
commit 727e595662
4 changed files with 13 additions and 5 deletions

View file

@ -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"

View file

@ -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

View file

@ -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')

View file

@ -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 &&