Merge from vscode merge-base (#22769)

* Merge from vscode merge-base

* Turn off basic checks

* Enable compilation, unit, and integration tests
This commit is contained in:
Lewis Sanchez
2023-04-18 18:28:58 -07:00
committed by GitHub
parent 6186358001
commit 6bd0a17d3c
2389 changed files with 92183 additions and 42601 deletions

View File

@@ -75,10 +75,8 @@ exports.referenceGeneratedDepsByArch = {
'libgbm.so.1()(64bit)',
'libgcc_s.so.1()(64bit)',
'libgcc_s.so.1(GCC_3.0)(64bit)',
'libgdk_pixbuf-2.0.so.0()(64bit)',
'libgio-2.0.so.0()(64bit)',
'libglib-2.0.so.0()(64bit)',
'libgmodule-2.0.so.0()(64bit)',
'libgobject-2.0.so.0()(64bit)',
'libgtk-3.so.0()(64bit)',
'libm.so.6()(64bit)',
@@ -160,10 +158,8 @@ exports.referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.0)',
'libgcc_s.so.1(GCC_3.4)',
'libgcc_s.so.1(GCC_3.5)',
'libgdk_pixbuf-2.0.so.0',
'libgio-2.0.so.0',
'libglib-2.0.so.0',
'libgmodule-2.0.so.0',
'libgobject-2.0.so.0',
'libgtk-3.so.0',
'libgtk-3.so.0()(64bit)',
@@ -252,10 +248,8 @@ exports.referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.0)(64bit)',
'libgcc_s.so.1(GCC_4.2.0)(64bit)',
'libgcc_s.so.1(GCC_4.5.0)(64bit)',
'libgdk_pixbuf-2.0.so.0()(64bit)',
'libgio-2.0.so.0()(64bit)',
'libglib-2.0.so.0()(64bit)',
'libgmodule-2.0.so.0()(64bit)',
'libgobject-2.0.so.0()(64bit)',
'libgtk-3.so.0()(64bit)',
'libm.so.6()(64bit)',

View File

@@ -75,10 +75,8 @@ export const referenceGeneratedDepsByArch = {
'libgbm.so.1()(64bit)',
'libgcc_s.so.1()(64bit)',
'libgcc_s.so.1(GCC_3.0)(64bit)',
'libgdk_pixbuf-2.0.so.0()(64bit)',
'libgio-2.0.so.0()(64bit)',
'libglib-2.0.so.0()(64bit)',
'libgmodule-2.0.so.0()(64bit)',
'libgobject-2.0.so.0()(64bit)',
'libgtk-3.so.0()(64bit)',
'libm.so.6()(64bit)',
@@ -160,10 +158,8 @@ export const referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.0)',
'libgcc_s.so.1(GCC_3.4)',
'libgcc_s.so.1(GCC_3.5)',
'libgdk_pixbuf-2.0.so.0',
'libgio-2.0.so.0',
'libglib-2.0.so.0',
'libgmodule-2.0.so.0',
'libgobject-2.0.so.0',
'libgtk-3.so.0',
'libgtk-3.so.0()(64bit)',
@@ -252,10 +248,8 @@ export const referenceGeneratedDepsByArch = {
'libgcc_s.so.1(GCC_3.0)(64bit)',
'libgcc_s.so.1(GCC_4.2.0)(64bit)',
'libgcc_s.so.1(GCC_4.5.0)(64bit)',
'libgdk_pixbuf-2.0.so.0()(64bit)',
'libgio-2.0.so.0()(64bit)',
'libglib-2.0.so.0()(64bit)',
'libgmodule-2.0.so.0()(64bit)',
'libgobject-2.0.so.0()(64bit)',
'libgtk-3.so.0()(64bit)',
'libm.so.6()(64bit)',

View File

@@ -1,8 +1,8 @@
"use strict";
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
Object.defineProperty(exports, "__esModule", { value: true });
exports.getDependencies = void 0;
const child_process_1 = require("child_process");
@@ -81,7 +81,7 @@ function calculatePackageDeps(binaryPath) {
const requires = new Set(findRequiresResult.stdout.toString('utf-8').trimEnd().split('\n'));
return requires;
}
// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/merge_package_deps.py
// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/merge_package_deps.py.
function mergePackageDeps(inputDeps) {
const requires = new Set();
for (const depSet of inputDeps) {

View File

@@ -3,8 +3,6 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
'use strict';
import { spawnSync } from 'child_process';
import { constants, statSync } from 'fs';
import path = require('path');
@@ -94,7 +92,7 @@ function calculatePackageDeps(binaryPath: string): Set<string> {
return requires;
}
// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/merge_package_deps.py
// Based on https://source.chromium.org/chromium/chromium/src/+/main:chrome/installer/linux/rpm/merge_package_deps.py.
function mergePackageDeps(inputDeps: Set<string>[]): Set<string> {
const requires = new Set<string>();
for (const depSet of inputDeps) {