languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-01 07:14:29 +00:00
Code Issues Projects Releases Wiki Activity

[infra] Remove wheezy left overs from SDK

Browse Source 
Also removes some dart editor related code which is unused nowadays.

Related https://dart-review.googlesource.com/c/sdk/+/150104

Change-Id: I97f91a35e82af09ac715a4eb93a945f335a71d5e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150106
Reviewed-by: Alexander Thomas <athom@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
This commit is contained in:
Martin Kustermann 2020-06-04 18:32:29 +00:00 committed by commit-bot@chromium.org
parent 026e1cf01d
commit d7e2f9ba3b
10 changed files with 16 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DEPS
View File

@ -559,21 +559,21 @@ hooks = [
],
},
{
# Pull Debian wheezy sysroot for i386 Linux
# Pull Debian sysroot for i386 Linux
'name': 'sysroot_i386',
'pattern': '.',
'action': ['python', 'sdk/build/linux/sysroot_scripts/install-sysroot.py',
'--arch', 'i386'],
},
{
# Pull Debian wheezy sysroot for amd64 Linux
# Pull Debian sysroot for amd64 Linux
'name': 'sysroot_amd64',
'pattern': '.',
'action': ['python', 'sdk/build/linux/sysroot_scripts/install-sysroot.py',
'--arch', 'amd64'],
},
{
# Pull Debian wheezy sysroot for arm Linux
# Pull Debian sysroot for arm Linux
'name': 'sysroot_amd64',
'pattern': '.',
'action': ['python', 'sdk/build/linux/sysroot_scripts/install-sysroot.py',

2
build/.gitignore vendored
View File

@ -1,7 +1,7 @@
# Generated file containing information about the VS toolchain on Windows
win_toolchain.json
# Pulled Debian wheezy sysroots
# Pulled Debian jessie sysroots
linux/debian_jessie_arm-sysroot
linux/debian_jessie_arm64-sysroot
linux/debian_jessie_amd64-sysroot

15
build/linux/sysroot_scripts/install-sysroot.py
View File

@ -5,16 +5,15 @@
"""Install Debian sysroots for building chromium.
"""
# The sysroot is needed to ensure that binaries will run on Debian Wheezy,
# the oldest supported linux distribution. For ARM64 linux, we have Debian
# Jessie sysroot as Jessie is the first version with ARM64 support. This script
# can be run manually but is more often run as part of gclient hooks. When run
# from hooks this script is a no-op on non-linux platforms.
# The sysroot is needed to ensure that binaries will run on Debian Jessie,
# the oldest supported linux distribution. This script can be run manually
# but is more often run as part of gclient hooks. When run from hooks this
# script is a no-op on non-linux platforms.
# The sysroot image could be constructed from scratch based on the current
# state or Debian Wheezy/Jessie but for consistency we currently use a
# pre-built root image. The image will normally need to be rebuilt every time
# chrome's build dependencies are changed.
# state or Debian Jessie but for consistency we currently use a pre-built root
# image. The image will normally need to be rebuilt every time chrome's build
# dependencies are changed.
import hashlib
import json

24
build/linux/sysroot_scripts/sysroots.json
View File

@ -40,29 +40,5 @@
"Sha1Sum": "d1591e8fc6a273af1fbf3d1a864f098081d06dd1",
"SysrootDir": "ubuntu_trusty_arm-sysroot",
"Tarball": "ubuntu_trusty_arm_sysroot.tgz"
},
"wheezy_amd64": {
"Revision": "7031a828c5dcedc937bbf375c42daab08ca6162f",
"Sha1Sum": "3a150574635247c7fc7f135df10c2565d745c76c",
"SysrootDir": "debian_wheezy_amd64-sysroot",
"Tarball": "debian_wheezy_amd64_sysroot.tgz"
},
"wheezy_arm": {
"Revision": "7031a828c5dcedc937bbf375c42daab08ca6162f",
"Sha1Sum": "65a16e16ffbb570f044c7139871665bb6689be1c",
"SysrootDir": "debian_wheezy_arm-sysroot",
"Tarball": "debian_wheezy_arm_sysroot.tgz"
},
"wheezy_i386": {
"Revision": "7031a828c5dcedc937bbf375c42daab08ca6162f",
"Sha1Sum": "e7fa85ede53048dd3e8f3ea8009af954f0b7ef0d",
"SysrootDir": "debian_wheezy_i386-sysroot",
"Tarball": "debian_wheezy_i386_sysroot.tgz"
},
"wheezy_mips": {
"Revision": "7031a828c5dcedc937bbf375c42daab08ca6162f",
"Sha1Sum": "edf929f216611a7fae41e537687c75be50c8fdec",
"SysrootDir": "debian_wheezy_mips-sysroot",
"Tarball": "debian_wheezy_mips_sysroot.tgz"
}
}

41
tools/bots/bot_utils.py
View File

@ -79,11 +79,6 @@ class GCSNamer(object):
- /VERSION
- /api-docs/dartdocs-gen-api.zip
- /sdk/dartsdk-{linux,macos,windows}-{ia32,x64}-release.zip
- /editor/darteditor-{linux,macos,windows}-{ia32,x64}.zip
- /editor/darteditor-installer-macos-{ia32,x64}.dmg
- /editor/darteditor-installer-windows-{ia32,x64}.msi
- /editor-eclipse-update
/{index.html,features/,plugins/,artifacts.jar,content.jar}
"""
def __init__(self,
@ -106,24 +101,6 @@ class GCSNamer(object):
return '%s/channels/%s/%s/%s/VERSION' % (self.bucket, self.channel,
self.release_type, revision)
def editor_zipfilepath(self, revision, system, arch):
return '/'.join([
self.editor_directory(revision),
self.editor_zipfilename(system, arch)
])
def editor_installer_filepath(self, revision, system, arch, extension):
return '/'.join([
self.editor_directory(revision),
self.editor_installer_filename(system, arch, extension)
])
def editor_android_zipfilepath(self, revision):
return '/'.join([
self.editor_directory(revision),
self.editor_android_zipfilename()
])
def sdk_zipfilepath(self, revision, system, arch, mode):
return '/'.join([
self.sdk_directory(revision),
@ -156,12 +133,6 @@ class GCSNamer(object):
def src_directory(self, revision):
return self._variant_directory('src', revision)
def editor_directory(self, revision):
return self._variant_directory('editor', revision)
def editor_eclipse_update_directory(self, revision):
return self._variant_directory('editor-eclipse-update', revision)
def apidocs_directory(self, revision):
return self._variant_directory('api-docs', revision)
@ -176,18 +147,6 @@ class GCSNamer(object):
def dartdocs_zipfilename(self):
return 'dartdocs-gen-api.zip'
def editor_zipfilename(self, system, arch):
return 'darteditor-%s-%s.zip' % (SYSTEM_RENAMES[system],
ARCH_RENAMES[arch])
def editor_android_zipfilename(self):
return 'android.zip'
def editor_installer_filename(self, system, arch, extension):
assert extension in ['dmg', 'msi']
return 'darteditor-installer-%s-%s.%s' % (SYSTEM_RENAMES[system],
ARCH_RENAMES[arch], extension)
def sdk_zipfilename(self, system, arch, mode):
assert mode in Mode.ALL_MODES
return 'dartsdk-%s-%s-%s.zip' % (SYSTEM_RENAMES[system],

4
tools/bots/linux_distribution_support.py
View File

@ -136,10 +136,6 @@ def SrcSteps(build_info):
# run as root)
Run(['cp', '/usr/bin/dart', 'out/ReleaseX64/dart'])
# We currently can't run the testing script on wheezy since the checked in
# binary is built on precise, see issue 18742
# TODO(18742): Run './tools/test.py' '-mrelease' 'standalone'
# Sanity check dart2js and the analyzer against a hello world program
with utils.TempDir() as temp_dir:
test_file = CreateDartTestFile(temp_dir)

6
tools/create_debian_chroot.sh
View File

@ -4,7 +4,7 @@
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
#
# Script to create a Debian wheezy chroot environment for building Dart
# Script to create a Debian jessie chroot environment for building Dart
# Debian packages.
#
@ -67,9 +67,9 @@ then
SRC_URI=$SVN_REPRO$SVN_PATH
fi
# Create Debian wheezy chroot.
# Create Debian jessie chroot.
debootstrap --arch=$ARCH --components=main,restricted,universe,multiverse \
wheezy $CHROOT http://http.us.debian.org/debian/
jessie $CHROOT http://http.us.debian.org/debian/
chroot $CHROOT apt-get update
chroot $CHROOT apt-get -y install \
debhelper python git gcc sudo make

2
tools/download_chromium_sysroot.sh
View File

@ -4,7 +4,7 @@
# for details. All rights reserved. Use of this source code is governed by a
# BSD-style license that can be found in the LICENSE file.
# Downloads the ia32 and x64 Debian wheezy sysroot that chromium uses,
# Downloads the ia32 and x64 Debian jessie sysroot that chromium uses,
# Only tested and used on Ubuntu trusty linux. Used to keep glibc version low.
# Creates directories called "build" and "tools" in the current directory.
# After running this, source set_ia32_sysroot.sh or set_x64_sysroot.sh, in

10
tools/gn.py
View File

@ -457,16 +457,6 @@ def parse_args(args):
'-t',
type=str,
help='Comma-separated list of arch=/path/to/toolchain-prefix mappings')
other_group.add_argument(
'--wheezy',
help='This flag is deprecated.',
default=True,
action='store_true')
other_group.add_argument(
'--no-wheezy',
help='This flag is deprecated',
dest='wheezy',
action='store_false')
other_group.add_argument(
'--workers',
'-w',

2
tools/promote.py
View File

@ -168,7 +168,7 @@ def _PromoteDartArchiveBuild(channel, source_channel, revision):
to_loc = release_namer.apidocs_zipfilepath(to_revision)
Gsutil(['-m', 'cp', '-a', 'public-read', from_loc, to_loc])
# Copy wheezy linux deb and src packages.
# Copy linux deb and src packages.
from_loc = raw_namer.linux_packages_directory(revision)
to_loc = release_namer.linux_packages_directory(to_revision)
remove_gs_directory(to_loc)