add some small improvements (#803)

.gitignore

@@ -1,3 +1,6 @@
 vscode
 VS*/*
 .DS_Store
+out
+pkg2appimage-*.AppImage
+pkg2appimage.AppDir

build/build_windows.ps1

@@ -1,6 +1,7 @@
 # powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1
 
-$env:Path += ";C:\Program Files\Git\bin"
+# first so `bash` is the one installed with `git`, avoid conflict with WSL
+$env:Path = "C:\Program Files\Git\bin;" + $env:Path
 
 Remove-Item -Recurse -Force VSCode*
 

build/build_windows.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# to run with WSL: wsl ./build/build_windows.sh
+
+rm -rf VSCode*
+rm -rf vscode
+
+./get_repo.sh
+
+SHOULD_BUILD=yes CI_BUILD=no OS_NAME=windows VSCODE_ARCH=x64 ./build.sh

docs/build.md

@@ -14,6 +14,7 @@
 - node 14
 - yarn
 - jq
+- git
 
 ### <a id="dependencies-linux"></a>Linux
 
@@ -30,7 +31,6 @@
 ### <a id="dependencies-windows"></a>Windows
 
 - powershell
-- git
 - sed
 
 ## <a id="build-scripts"></a>Build Scripts
@@ -38,7 +38,7 @@
 Each platform has its build helper script in the directory `build`.
 
 - Linux: `./build/build_linux.sh`
-- MacOS: `./build/build_macos_.sh`
+- MacOS: `./build/build_macos.sh`
 - Windows: `powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1`
 
 ## <a id="build-docker"></a>Build in Docker

prepare_vscode.sh

@@ -8,6 +8,8 @@ cd vscode || exit
 ../update_settings.sh
 
 # apply patches
+{ set +x; } 2>/dev/null
+
 for file in ../patches/*.patch; do
   if [ -f "$file" ]; then
     echo applying patch: $file;
@@ -28,6 +30,8 @@ for file in ../patches/user/*.patch; do
   fi
 done
 
+set -x
+
 if [[ "$OS_NAME" == "osx" ]]; then
   CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
   npm_config_argv='{"original":["--ignore-optional"]}' yarn postinstall