diff --git a/build/build_windows.ps1 b/build/build_windows.ps1 index f051bf1..c0a80e7 100755 --- a/build/build_windows.ps1 +++ b/build/build_windows.ps1 @@ -1,9 +1,8 @@ -# powershell -ExecutionPolicy ByPass -File build_windows.ps1 +# powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1 $env:Path += ";C:\Program Files\Git\bin" Remove-Item -Recurse -Force VSCode* -Remove-Item -Recurse -Force vscode bash ./get_repo.sh diff --git a/prepare_vscode.sh b/prepare_vscode.sh index 891904a..3cf0024 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -10,7 +10,7 @@ cd vscode || exit # apply patches patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch patch -u resources/linux/rpm/code.spec.template -i ../patches/fix-rpm-spec.patch -git apply ../patches/binary-name.patch +git apply --ignore-whitespace ../patches/binary-name.patch if [[ "$OS_NAME" == "osx" ]]; then CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional