Baptiste Augrain 4 anni fa
parent
commit
b99e93970e
2 ha cambiato i file con 2 aggiunte e 3 eliminazioni
  1. 1 2
      build/build_windows.ps1
  2. 1 1
      prepare_vscode.sh

+ 1 - 2
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"
 $env:Path += ";C:\Program Files\Git\bin"
 
 
 Remove-Item -Recurse -Force VSCode*
 Remove-Item -Recurse -Force VSCode*
-Remove-Item -Recurse -Force vscode
 
 
 bash ./get_repo.sh
 bash ./get_repo.sh
 
 

+ 1 - 1
prepare_vscode.sh

@@ -10,7 +10,7 @@ cd vscode || exit
 # apply patches
 # apply patches
 patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch
 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
 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
 if [[ "$OS_NAME" == "osx" ]]; then
   CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
   CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional