Revert "Merge from vscode 81d7885 (microsoft#5949)" (microsoft#5983)

This reverts commit d15a3fc.
PejmanNik · Jun 11, 2019 · 5a7562a · 5a7562a
1 parent 95a50b7
commit 5a7562a
Show file tree

Hide file tree

Showing 926 changed files with 11,290 additions and 19,436 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,9 +19,6 @@ out-vscode-reh/
 out-vscode-reh-min/
 out-vscode-reh-pkg/
 **/node_modules
-src/vs/server
-resources/server
-build/node_modules
 coverage/
 test_data/
 test-results/

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -218,4 +218,4 @@
 			]
 		}
 	]
-}
+}
diff --git a/.yarnrc b/.yarnrc
@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "4.2.3"
+target "3.1.8"
 runtime "electron"
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
diff --git a/build/.nativeignore b/build/.nativeignore
@@ -1,8 +1,5 @@
 # cleanup rules for native node modules, .gitignore style
 
-nan/**
-*/node_modules/nan/**
-
 fsevents/binding.gyp
 fsevents/fsevents.cc
 fsevents/build/**
@@ -86,7 +83,6 @@ node-pty/binding.gyp
 node-pty/build/**
 node-pty/src/**
 node-pty/tools/**
-node-pty/deps/**
 !node-pty/build/Release/*.exe
 !node-pty/build/Release/*.dll
 !node-pty/build/Release/*.node

diff --git a/build/azure-pipelines/common/installDistro.ts b/build/azure-pipelines/common/installDistro.ts
@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as cp from 'child_process';
+import * as path from 'path';
+
+function yarnInstall(packageName: string): void {
+	cp.execSync(`yarn add --no-lockfile ${packageName}`);
+	cp.execSync(`yarn add --no-lockfile ${packageName}`, { cwd: path.join( process.cwd(), 'remote') });
+}
+
+const product = require('../../../product.json');
+const dependencies = product.dependencies || {} as { [name: string]: string; };
+
+Object.keys(dependencies).forEach(name => {
+	const url = dependencies[name];
+	yarnInstall(url);
+});
diff --git a/build/azure-pipelines/common/installDistroDependencies.ts b/build/azure-pipelines/common/installDistroDependencies.ts
diff --git a/build/azure-pipelines/common/symbols.ts b/build/azure-pipelines/common/symbols.ts
@@ -36,6 +36,7 @@ export interface IVersionAccessor extends IApplicationAccessor {
 enum Platform {
 	WIN_32 = 'win32-ia32',
 	WIN_64 = 'win32-x64',
+	LINUX_32 = 'linux-ia32',
 	LINUX_64 = 'linux-x64',
 	MAC_OS = 'darwin-x64'
 }
@@ -190,7 +191,7 @@ if (process.platform === 'darwin') {
 } else if (process.platform === 'win32') {
 	platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
 } else {
-	platform = Platform.LINUX_64;
+	platform = is64 ? Platform.LINUX_64 : Platform.LINUX_32;
 }
 
 // Create version and upload symbols in HockeyApp

diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -34,8 +34,7 @@ steps:
     yarn gulp mixin
     yarn gulp hygiene
     yarn monaco-compile-check
-    node build/azure-pipelines/common/installDistroDependencies.js
-    node build/azure-pipelines/common/installDistroDependencies.js remote
+    node build/azure-pipelines/common/installDistro.js
     node build/lib/builtInExtensions.js
   displayName: Prepare build
 

diff --git a/build/azure-pipelines/linux/build-arm.sh b/build/azure-pipelines/linux/build-arm.sh
diff --git a/build/azure-pipelines/linux/prebuild-arm.sh b/build/azure-pipelines/linux/prebuild-arm.sh
diff --git a/build/azure-pipelines/linux/product-build-linux-arm.yml b/build/azure-pipelines/linux/product-build-linux-arm.yml
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
@@ -16,6 +16,9 @@ steps:
 - script: |
     set -e
     export npm_config_arch="$(VSCODE_ARCH)"
+    if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
+      export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
+    fi
 
     cat << EOF > ~/.netrc
     machine monacotools.visualstudio.com
@@ -35,8 +38,7 @@ steps:
     yarn gulp mixin
     yarn gulp hygiene
     yarn monaco-compile-check
-    node build/azure-pipelines/common/installDistroDependencies.js
-    node build/azure-pipelines/common/installDistroDependencies.js remote
+    node build/azure-pipelines/common/installDistro.js
     node build/lib/builtInExtensions.js
   displayName: Prepare build
 

diff --git a/build/azure-pipelines/linux/publish-arm.sh b/build/azure-pipelines/linux/publish-arm.sh
diff --git a/build/azure-pipelines/linux/publish.sh b/build/azure-pipelines/linux/publish.sh
@@ -5,6 +5,8 @@ ROOT="$REPO/.."
 
 # Publish tarball
 PLATFORM_LINUX="linux-$VSCODE_ARCH"
+[[ "$VSCODE_ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
+[[ "$VSCODE_ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
 BUILDNAME="VSCode-$PLATFORM_LINUX"
 BUILD="$ROOT/$BUILDNAME"
 BUILD_VERSION="$(date +%s)"
@@ -37,7 +39,7 @@ node build/azure-pipelines/common/symbols.js "$VSCODE_MIXIN_PASSWORD" "$VSCODE_H
 # Publish DEB
 yarn gulp "vscode-linux-$VSCODE_ARCH-build-deb"
 PLATFORM_DEB="linux-deb-$VSCODE_ARCH"
-DEB_ARCH="amd64"
+[[ "$VSCODE_ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
 DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
 DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
 
@@ -46,7 +48,7 @@ node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" p
 # Publish RPM
 yarn gulp "vscode-linux-$VSCODE_ARCH-build-rpm"
 PLATFORM_RPM="linux-rpm-$VSCODE_ARCH"
-RPM_ARCH="x86_64"
+[[ "$VSCODE_ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
 RPM_FILENAME="$(ls $REPO/.build/linux/rpm/$RPM_ARCH/ | grep .rpm)"
 RPM_PATH="$REPO/.build/linux/rpm/$RPM_ARCH/$RPM_FILENAME"
 

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
@@ -1,8 +1,11 @@
 resources:
   containers:
   - container: vscode-x64
+    endpoint: VSCodeHub
     image: vscodehub.azurecr.io/vscode-linux-build-agent:x64
+  - container: vscode-ia32
     endpoint: VSCodeHub
+    image: vscodehub.azurecr.io/vscode-linux-build-agent:ia32
   - container: snapcraft
     image: snapcore/snapcraft
 
@@ -46,14 +49,15 @@ jobs:
   steps:
   - template: linux/snap-build-linux.yml
 
-- job: LinuxArmhf
-  condition: eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true')
+- job: Linux32
+  condition: eq(variables['VSCODE_BUILD_LINUX_32BIT'], 'true')
   pool:
     vmImage: 'Ubuntu-16.04'
   variables:
-    VSCODE_ARCH: armhf
+    VSCODE_ARCH: ia32
+  container: vscode-ia32
   steps:
-  - template: linux/product-build-linux-arm.yml
+  - template: linux/product-build-linux.yml
 
 - job: macOS
   condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
@@ -71,7 +75,7 @@ jobs:
   - Windows32
   - Linux
   - LinuxSnap
-  - LinuxArmhf
+  - Linux32
   - macOS
   steps:
   - template: sync-mooncake.yml
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
@@ -35,8 +35,7 @@ steps:
     exec { yarn gulp mixin }
     exec { yarn gulp hygiene }
     exec { yarn monaco-compile-check }
-    exec { node build/azure-pipelines/common/installDistroDependencies.js }
-    exec { node build/azure-pipelines/common/installDistroDependencies.js remote }
+    exec { node build/azure-pipelines/common/installDistro.js }
     exec { node build/lib/builtInExtensions.js }
   displayName: Prepare build
-Original file line number
+Diff line change
@@ Expand Up / @@ -218,4 +218,4 @@ @@
     			]
     		}
     	]
-    }
+    }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.