Skip to content

Commit

Permalink
Bug 1635514 - Delete tup CI/configure stuff r=froydnj
Browse files Browse the repository at this point in the history
This includes scripts that involve `tup`, jobs that build `tup` in automation, `tup.configure`, and related infrastructure and documentation.

Differential Revision: https://phabricator.services.mozilla.com/D73921
  • Loading branch information
Ricky Stewart committed May 5, 2020
1 parent ea09818 commit 2ce561d
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 413 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@ tps_result.json
# Ignore files created when running a reftest.
lextab.py

# tup database
/.tup

# Ignore Visual Studio Code workspace files.
.vscode/
!.vscode/extensions.json
Expand Down
3 changes: 0 additions & 3 deletions .hgignore
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,6 @@ _OPT\.OBJ/
# Ignore files created when running a reftest.
^lextab.py$

# tup database
^\.tup

# Ignore sync tps logs and reports
tps\.log
tps_result\.json
Expand Down
16 changes: 0 additions & 16 deletions browser/config/mozconfigs/linux64/tup

This file was deleted.

1 change: 0 additions & 1 deletion build/docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Important Concepts
files-metadata
Profile Guided Optimization <pgo>
slow
tup
environment-variables
build-targets
python
Expand Down
12 changes: 5 additions & 7 deletions build/docs/slow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,14 @@ no-op build is spent in make traversal.
make is inefficient
===================

Compared to modern build backends like Tup or Ninja, make is slow and
inefficient. We can only make make so fast. At some point, we'll hit a
Compared to modern build backends like Tup or Ninja, `make` is slow and
inefficient. We can only make `make` so fast. At some point, we'll hit a
performance plateau and will need to use a different tool to make builds
faster.

Please note that clobber and incremental builds are different. A clobber
build with make will likely be as fast as a clobber build with e.g. Tup.
However, Tup should vastly outperform make when it comes to incremental
builds. Therefore, this issue is mostly seen when performing incremental
builds. For more information, see :ref:`tup`.
Please note that clobber and incremental builds are different. A clobber build
with `make` will likely be as fast as a clobber build with a modern build
system.

C++ header dependency hell
==========================
Expand Down
170 changes: 0 additions & 170 deletions build/docs/tup.rst

This file was deleted.

76 changes: 0 additions & 76 deletions build/moz.configure/tup.configure

This file was deleted.

15 changes: 0 additions & 15 deletions moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -448,21 +448,6 @@ def possible_makes(make, host):

check_prog('GMAKE', possible_makes)

@depends(build_backends, build_project)
def tup_include(build_backends, build_project):
# We need to check the rustc version when building with tup, but
# rustc_info isn't available when configuring js (and build_backends isn't
# available from project-specific configure), so as a workaround we only
# include the file when we know we'll need it. This can be removed when
# we globally require a rustc recent enough to build with tup.
if build_project not in ('browser', 'mobile/android'):
return None
for backend in build_backends:
if 'Tup' in backend:
return 'build/moz.configure/tup.configure'

include(tup_include)

# watchman detection
# ==============================================================

Expand Down
41 changes: 0 additions & 41 deletions taskcluster/ci/build/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1241,47 +1241,6 @@ linux64-rusttests/debug:
- linux64-lucetc
- wasi-sysroot

linux64-tup/opt:
description: "Linux64 Tup"
index:
product: firefox
job-name: linux64-tup-opt
treeherder:
platform: linux64/opt
symbol: Btup
tier: 3
worker-type: b-linux
worker:
max-run-time: 3600
env:
PERFHERDER_EXTRA_OPTIONS: tup
RUSTC_BOOTSTRAP: '1'
run:
using: mozharness
actions: [get-secrets, build]
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
script: "mozharness/scripts/fx_desktop_build.py"
secrets: true
custom-build-variant-cfg: tup
mozconfig-variant: tup
tooltool-downloads: public
need-xvfb: true
run-on-projects: []
fetches:
toolchain:
- linux64-binutils
- linux64-clang
- linux64-rust
- linux64-cbindgen
- linux64-sccache
- linux64-tup
- linux64-nasm
- linux64-node
- linux64-lucetc
- wasi-sysroot

linux64-ccov/opt:
description: "Linux64-CCov Opt"
index:
Expand Down
7 changes: 0 additions & 7 deletions taskcluster/ci/fetch/toolchains.yml
Original file line number Diff line number Diff line change
Expand Up @@ -324,13 +324,6 @@ llvm-for-dsymutil:
repo: https://github.com/llvm/llvm-project
revision: 3b7811f6441be13c9f613f81ef93297d231b4f8e

tup:
description: tup source code
fetch:
type: git
repo: https://github.com/gittup/tup
revision: 4371a41ba4ece660bf060b598b9eee4c2eb347d8

rust-size:
description: rust-size source code
fetch:
Expand Down
Loading

0 comments on commit 2ce561d

Please sign in to comment.