package startup scripts and latest node 14

Author: akosyakov

build/gulpfile.server.js

@@ -5,6 +5,7 @@
 // @ts-check
 'use strict';
 
+const cp = require('child_process');
 const gulp = require('gulp');
 const path = require('path');
 const es = require('event-stream');
@@ -271,12 +272,27 @@ function defineTasks(options) {
 			const packageJsonStream = gulp.src([base + '/package.json'], { base })
 				.pipe(json({ name, version }));
 
+			cp.execSync('yarn gulp node');
+			const nodePath = cp.execSync('node ' + path.join(root, 'build/lib/node'), { encoding: 'utf-8' });
+			const nodeStream = gulp.src([nodePath], { base: path.dirname(nodePath) });
+
+			const resourcesBase = path.join(root, 'resources/' + qualifier);
+			const binStream = gulp.src([path.join(resourcesBase, '**/*.' + (process.platform === 'win32' ? 'cmd' : 'sh'))], { base: resourcesBase })
+				.pipe(util.setExecutableBit(['**/*.sh']))
+				.pipe(rename(path => {
+					if (path.basename === 'code' && path.extname === '.sh') {
+						path.extname = '';
+					}
+				}));
+
 			let all = es.merge(
 				packageJsonStream,
 				productJsonStream,
 				// license,
 				sources,
-				runtimeDependencies
+				runtimeDependencies,
+				nodeStream,
+				binStream
 			);
 
 			let result = all

remote/.yarnrc

@@ -1,3 +1,3 @@
 disturl "http://nodejs.org/dist"
-target "14.16.0"
+target "14.17.6"
 runtime "node"

resources/server/bin/code.cmd

@@ -0,0 +1,5 @@
+@echo off
+setlocal
+set VSCODE_DEV=
+"%~dp0\..\node.exe" "%~dp0\..\out\server-cli.js" %*
+endlocal

resources/server/startup.sh resources/server/bin/code.shresources/server/startup.sh renamed to resources/server/bin/code.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
 	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
@@ -7,4 +7,4 @@ else
 	ROOT=$(dirname "$(readlink -f $0)")
 fi
 
-exec $ROOT/node/bin/node $ROOT/server-pkg/out/server.js "$@"
+exec $ROOT/../node $ROOT/../out/server-cli.js "$@"

resources/server/server.cmd

@@ -0,0 +1,6 @@
+@echo off
+setlocal
+set VSCODE_DEV=
+set PATH="%~dp0\bin";%PATH%
+"%~dp0\node.exe" "%~dp0\out\server.js" %*
+endlocal

resources/server/server.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	realpath() { [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"; }
+	ROOT=$(dirname "$(realpath "$0")")
+else
+	ROOT=$(dirname "$(readlink -f $0)")
+fi
+
+PATH=$ROOT/bin:$PATH
+exec $ROOT/node $ROOT/out/server.js "$@"