Merge pull request #756 from larryw3i/larryw3i-patch-1

using snap to install codium requires classic mode

.github/workflows/linux.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v1
         with:
-          node-version: 12.14.1
+          node-version: 14
 
       - name: Install Yarn
         run: npm install -g yarn

.github/workflows/macos.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v1
         with:
-          node-version: 12.14.1
+          node-version: 14
           
       - name: Check PR or cron
         run: |

.github/workflows/windows.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v1
         with:
-          node-version: 12.18.3
+          node-version: 14
 
       - name: Install Yarn
         run: npm install -g yarn

DOCS.md

@@ -12,6 +12,8 @@
 - [How do I run VSCodium in portable mode?](#portable)
 - [How do I press and hold a key and have it repeat in VSCodium?](#press-and-hold)
 - [How do I open VSCodium from the terminal?](#terminal-support)
+  - [From Linux .tar.gz](#from-linux-targz)
+- [How to build VSCodium](https://github.com/VSCodium/vscodium/blob/master/docs/build.md)
 
 ## <a id="disable-telemetry"></a>Getting all the Telemetry Out
 
@@ -135,6 +137,7 @@ $ defaults write com.visualstudio.code.oss ApplePressAndHoldEnabled -bool false
 
 ## <a id="terminal-support"></a>How do I open VSCodium from the terminal?
 
+For MacOS and Windows:
 - Go to the command palette (View | Command Palette...)
 - Choose `Shell command: Install 'codium' command in PATH`.
 
@@ -148,3 +151,9 @@ This allows you to open files or directories in VSCodium directly from your term
 ```
 
 Feel free to alias this command to something easier to type in your shell profile (e.g. `alias code=codium`).
+
+On Linux, when installed with a package manager, `codium` has been installed in your `PATH`.
+
+### <a id="from-linux-targz"></a>From Linux .tar.gz
+
+When the archive `VSCodium-linux-<arch>-<version>.tar.gz` is extracted, the main entry point for VSCodium is `./bin/codium`.

README.md

@@ -68,7 +68,7 @@ scoop install vscodium
 VSCodium is available in the [Snap Store](https://snapcraft.io/) as [Codium](https://snapcraft.io/codium), published by the [Snapcrafters](https://github.com/snapcrafters/codium) community.
 If your GNU/Linux distribution has support for [snaps](https://snapcraft.io/docs/installing-snapd):
 ```bash
-snap install codium
+snap install codium --classic
 ```
 
 #### <a id="install-with-package-manager"></a>Install with Package Manager (GNU/Linux)
@@ -101,8 +101,8 @@ If you want to build from source yourself, head over to [Microsoft's vscode repo
 Microsoft's build process (which we are running to build the binaries) does download additional files. This was brought up in [Microsoft/vscode#49159](https://github.com/Microsoft/vscode/issues/49159) and [Microsoft/vscode#45978](https://github.com/Microsoft/vscode/issues/45978). These are the packages downloaded during build:
 
 - Extensions from the Microsoft Marketplace:
-  - ms-vscode.node-debug2
-  - ms-vscode.node-debug
+  - [ms-vscode.node-debug2](https://marketplace.visualstudio.com/items?itemName=ms-vscode.node-debug2)
+  - [ms-vscode.node-debug](https://marketplace.visualstudio.com/items?itemName=ms-vscode.node-debug)
 - From [Electron releases](https://github.com/electron/electron/releases) (using [gulp-atom-electron](https://github.com/joaomoreno/gulp-atom-electron))
   - electron
   - ffmpeg

build.sh

@@ -15,6 +15,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   yarn valid-layers-check
 
   yarn gulp compile-build
+  yarn gulp compile-extension-media
   yarn gulp compile-extensions-build
   yarn gulp minify-vscode
 

docs/build.md

@@ -0,0 +1,69 @@
+# Build
+
+## Table of Contents
+
+- [Dependencies](#dependencies)
+  - [Linux](#dependencies-linux)
+  - [MacOS](#dependencies-macos)
+  - [Windows](#dependencies-windows)
+- [Build Scripts](#build-scripts)
+- [Build in Docker](#build-docker)
+
+## <a id="dependencies"></a>Dependencies
+
+- node 12
+- yarn
+- jq
+
+### <a id="dependencies-linux"></a>Linux
+
+- libx11-dev
+- libxkbfile-dev
+- libsecret-1-dev
+- fakeroot
+- rpm
+
+### <a id="dependencies-macos"></a>MacOS
+
+### <a id="dependencies-windows"></a>Windows
+
+- powershell
+- git
+- sed
+
+## <a id="build-scripts"></a>Build Scripts
+
+Each platform has its build helper script in the directory `build`.
+
+- Linux: `./build/build_linux.sh`
+- MacOS: `./build/build_macos_.sh`
+- Windows: `powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1`
+
+## <a id="build-docker"></a>Build in Docker
+
+To build for Linux, you can alternatively build VSCodium in docker
+
+Firstly, create the container with:
+```
+docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash
+```
+
+When inside the container, you can use the following commands to build:
+```
+curl -fsSL https://deb.nodesource.com/setup_12.x | sudo -E bash -
+sudo apt-get install -y nodejs
+
+npm install -g yarn
+
+git clone https://github.com/VSCodium/vscodium.git
+
+cd vscodium
+
+./get_repo.sh
+
+export SHOULD_BUILD=yes
+export OS_NAME=linux
+export VSCODE_ARCH=x64
+
+./build.sh
+```

patches/custom-gallery.patch

@@ -2,14 +2,14 @@ diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
 index 129b8de..fadb99a 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
-@@ -62,6 +62,7 @@ export interface IProductConfiguration {
+@@ -68,6 +68,7 @@ export interface IProductConfiguration {
  
- 	readonly extensionsGallery?: {
- 		readonly serviceUrl: string;
-+		readonly cacheUrl?: string;
- 		readonly itemUrl: string;
- 		readonly controlUrl: string;
- 		readonly recommendationsUrl: string;
+        readonly extensionsGallery?: {
+        readonly serviceUrl: string;
++       readonly cacheUrl?: string;
+        readonly itemUrl: string;
+        readonly resourceUrlTemplate: string;
+        readonly controlUrl: string;
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
 index d79c8a3..8b4153f 100644
 --- a/src/vs/platform/product/common/product.ts

patches/user/readme.txt

@@ -0,0 +1 @@
+store user patches at location patches/user and those will be applied to vscode source git by the scripts

prepare_vscode.sh

@@ -12,6 +12,14 @@ patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patch
 patch -u resources/linux/rpm/code.spec.template -i ../patches/fix-rpm-spec.patch
 git apply --ignore-whitespace ../patches/binary-name.patch
 git apply --ignore-whitespace ../patches/custom-gallery.patch
+for file in ../patches/user/*.patch; do
+  if [ -f "$file" ]; then
+    echo applying user patch: $file;
+    if ! git apply --ignore-whitespace $file; then
+      echo failed to apply patch $file 1>&2
+    fi
+  fi
+done
 
 if [[ "$OS_NAME" == "osx" ]]; then
   CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
@@ -65,27 +73,27 @@ if [[ "$OS_NAME" == "linux" ]]; then
   # as we are renaming the application to vscodium
   # we need to edit a line in the post install template
   sed -i "s/code-oss/codium/" resources/linux/debian/postinst.template
-  
+
   # fix the packages metadata
   # code.appdata.xml
   sed -i 's|Visual Studio Code|VSCodium|g' resources/linux/code.appdata.xml
   sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/code.appdata.xml
   sed -i 's|https://code.visualstudio.com/home/home-screenshot-linux-lg.png|https://vscodium.com/img/vscodium.png|' resources/linux/code.appdata.xml
   sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/code.appdata.xml
-  
+
   # control.template
   sed -i 's|Microsoft Corporation <vscode-linux@microsoft.com>|VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|'  resources/linux/debian/control.template
   sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/debian/control.template
   sed -i 's|Visual Studio Code|VSCodium|g' resources/linux/debian/control.template
   sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/debian/control.template
-  
+
   # code.spec.template
   sed -i 's|https://code.visualstudio.com/docs/setup/linux|https://github.com/VSCodium/vscodium#download-install|' resources/linux/rpm/code.spec.template
   sed -i 's|Microsoft Corporation|VSCodium Team|' resources/linux/rpm/code.spec.template
   sed -i 's|Visual Studio Code Team <vscode-linux@microsoft.com>|VSCodium Team https://github.com/VSCodium/vscodium/graphs/contributors|' resources/linux/rpm/code.spec.template
   sed -i 's|https://code.visualstudio.com|https://vscodium.com|' resources/linux/rpm/code.spec.template
   sed -i 's|Visual Studio Code|VSCodium|' resources/linux/rpm/code.spec.template
-  
+
   # snapcraft.yaml
   sed -i 's|Visual Studio Code|VSCodium|'  resources/linux/rpm/code.spec.template
 fi