development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove more 32-bit Linux build stuff

Browse source 
Fixes #66271
This commit is contained in:
Daniel Imms 2019-05-01 13:56:26 -07:00
parent a5dae5cf55
commit 7b0cd32591
7 changed files with 5 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/azure-pipelines/common/symbols.ts
View file

@ -36,7 +36,6 @@ 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'
}
@ -191,7 +190,7 @@ if (process.platform === 'darwin') {
} else if (process.platform === 'win32') {
platform = is64 ? Platform.WIN_64 : Platform.WIN_32;
} else {
platform = is64 ? Platform.LINUX_64 : Platform.LINUX_32;
platform = Platform.LINUX_64;
}
// Create version and upload symbols in HockeyApp

3
build/azure-pipelines/linux/product-build-linux.yml
View file

@ -10,9 +10,6 @@ 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

6
build/azure-pipelines/linux/publish.sh
View file

@ -5,8 +5,6 @@ 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)"
@ -26,7 +24,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"
[[ "$VSCODE_ARCH" == "ia32" ]] && DEB_ARCH="i386" || DEB_ARCH="amd64"
DEB_ARCH="amd64"
DEB_FILENAME="$(ls $REPO/.build/linux/deb/$DEB_ARCH/deb/)"
DEB_PATH="$REPO/.build/linux/deb/$DEB_ARCH/deb/$DEB_FILENAME"
@ -35,7 +33,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"
[[ "$VSCODE_ARCH" == "ia32" ]] && RPM_ARCH="i386" || RPM_ARCH="x86_64"
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"

2
build/azure-pipelines/product-build.yml
View file

@ -2,8 +2,6 @@ resources:
containers:
- container: vscode-x64
image: joaomoreno/vscode-linux-build-agent:x64
- container: vscode-ia32
image: joaomoreno/vscode-linux-build-agent:ia32
- container: snapcraft
image: snapcore/snapcraft

5
build/gulpfile.vscode.linux.js
View file

@ -23,7 +23,7 @@ const commit = util.getVersion(root);
const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
function getDebPackageArch(arch) {
return { x64: 'amd64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
return { x64: 'amd64', arm: 'armhf', arm64: "arm64" }[arch];
}
function prepareDebPackage(arch) {
@ -114,7 +114,7 @@ function getRpmBuildPath(rpmArch) {
}
function getRpmPackageArch(arch) {
return { x64: 'x86_64', ia32: 'i386', arm: 'armhf', arm64: "arm64" }[arch];
return { x64: 'x86_64', arm: 'armhf', arm64: "arm64" }[arch];
}
function prepareRpmPackage(arch) {
@ -238,7 +238,6 @@ function buildSnapPackage(arch) {
}
const BUILD_TARGETS = [
{ arch: 'ia32' },
{ arch: 'x64' },
{ arch: 'arm' },
{ arch: 'arm64' },

78
resources/linux/rpm/dependencies.json
View file

@ -63,83 +63,5 @@
"libxcb.so.1()(64bit)",
"libxkbfile.so.1()(64bit)",
"libsecret-1.so.0()(64bit)"
],
"i386": [
"ld-linux.so.2",
"ld-linux.so.2(GLIBC_2.1)",
"libX11-xcb.so.1",
"libX11.so.6",
"libXcomposite.so.1",
"libXcursor.so.1",
"libXdamage.so.1",
"libXext.so.6",
"libXfixes.so.3",
"libXi.so.6",
"libXrandr.so.2",
"libXrender.so.1",
"libXss.so.1",
"libXtst.so.6",
"libasound.so.2",
"libatk-1.0.so.0",
"libc.so.6",
"libc.so.6(GLIBC_2.0)",
"libc.so.6(GLIBC_2.1)",
"libc.so.6(GLIBC_2.1.3)",
"libc.so.6(GLIBC_2.11)",
"libc.so.6(GLIBC_2.2)",
"libc.so.6(GLIBC_2.2.3)",
"libc.so.6(GLIBC_2.3)",
"libc.so.6(GLIBC_2.3.2)",
"libc.so.6(GLIBC_2.3.4)",
"libc.so.6(GLIBC_2.4)",
"libc.so.6(GLIBC_2.6)",
"libc.so.6(GLIBC_2.7)",
"libcairo.so.2",
"libcups.so.2",
"libdbus-1.so.3",
"libdl.so.2",
"libdl.so.2(GLIBC_2.0)",
"libdl.so.2(GLIBC_2.1)",
"libexpat.so.1",
"libfontconfig.so.1",
"libfreetype.so.6",
"libgcc_s.so.1",
"libgcc_s.so.1(GCC_4.0.0)",
"libgcc_s.so.1(GLIBC_2.0)",
"libgdk-x11-2.0.so.0",
"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",
"libm.so.6",
"libm.so.6(GLIBC_2.0)",
"libm.so.6(GLIBC_2.1)",
"libnspr4.so",
"libnss3.so",
"libnssutil3.so",
"libpango-1.0.so.0",
"libpangocairo-1.0.so.0",
"libpthread.so.0",
"libpthread.so.0(GLIBC_2.0)",
"libpthread.so.0(GLIBC_2.1)",
"libpthread.so.0(GLIBC_2.2)",
"libpthread.so.0(GLIBC_2.2.3)",
"libpthread.so.0(GLIBC_2.3.2)",
"libpthread.so.0(GLIBC_2.3.3)",
"librt.so.1",
"librt.so.1(GLIBC_2.2)",
"libsmime3.so",
"libstdc++.so.6",
"libstdc++.so.6(GLIBCXX_3.4)",
"libstdc++.so.6(GLIBCXX_3.4.10)",
"libstdc++.so.6(GLIBCXX_3.4.11)",
"libstdc++.so.6(GLIBCXX_3.4.14)",
"libstdc++.so.6(GLIBCXX_3.4.15)",
"libstdc++.so.6(GLIBCXX_3.4.9)",
"libxcb.so.1",
"libxkbfile.so.1",
"libsecret-1.so.0"
]
}

1
src/vs/platform/product/node/product.ts
View file

@ -74,7 +74,6 @@ export interface IProductConfiguration {
hockeyApp: {
'win32-ia32': string;
'win32-x64': string;
'linux-ia32': string;
'linux-x64': string;
'darwin': string;
};