timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-11 16:27:18 +10:00
Code Issues Packages Projects Releases Wiki Activity

feat(1.96): update patches and build process (#2131)

Browse Source
This commit is contained in:
Baptiste Augrain
2024-11-27 12:34:24 +01:00
committed by GitHub
parent 573a70ede1
commit 67fd09f6b8
9 changed files with 158 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build/build.sh
View File

@@ -113,8 +113,26 @@ if [[ "${SKIP_BUILD}" == "no" ]]; then
cd ..
fi
if [[ -f "./include_${OS_NAME}.gypi" ]]; then
echo "Installing custom ~/.gyp/include.gypi"
mkdir -p ~/.gyp
if [[ -f "${HOME}/.gyp/include.gypi" ]]; then
mv ~/.gyp/include.gypi ~/.gyp/include.gypi.pre-vscodium
else
echo "{}" > ~/.gyp/include.gypi.pre-vscodium
fi
cp ./include_osx.gypi ~/.gyp/include.gypi
fi
. build.sh
if [[ -f "./include_${OS_NAME}.gypi" ]]; then
mv ~/.gyp/include.gypi.pre-vscodium ~/.gyp/include.gypi
fi
if [[ "${VSCODE_LATEST}" == "yes" ]]; then
jsonTmp=$( cat "${VSCODE_QUALITY}.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )
echo "${jsonTmp}" > "${VSCODE_QUALITY}.json" && unset jsonTmp

28
build/update_patches.sh
View File

@@ -13,6 +13,12 @@ while getopts ":i" opt; do
done
check_file() {
while [ $# -gt 1 ]; do
git apply --reject "${1}"
shift
done
if [[ -f "${1}" ]]; then
echo applying patch: "${1}"
if ! git apply --ignore-whitespace "${1}"; then
@@ -49,10 +55,26 @@ fi
for ARCH in alpine linux osx windows; do
for FILE in "../patches/${ARCH}/"*.patch; do
check_file "${FILE}"
if [[ "${FILE}" != *"/arch-"* ]]; then
check_file "${FILE}"
fi
done
for FILE in "../patches/${ARCH}/"*/*.patch; do
check_file "${FILE}"
if [[ "${ARCH}" == "linux" ]]; then
check_file "../patches/linux/arch-0-support.patch"
check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch"
check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch"
check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch"
check_file "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" "../patches/linux/arch-4-s390x.patch"
fi
for TARGET in client reh; do
for FILE in "../patches/${ARCH}/${TARGET}/"*.patch; do
check_file "${FILE}"
done
for FILE in "../patches/${ARCH}/${TARGET}/"*/*.patch; do
check_file "${FILE}"
done
done
done