Perma orange on comm-central:
- TEST-UNEXPECTED-TIMEOUT | toolkit/components/downloads/test/unit/test_cancel_download_files_removed.js
- TEST-UNEXPECTED-TIMEOUT | toolkit/components/downloads/test/unit/test_download_samename.js | Test timed out
- TEST-UNEXPECTED-TIMEOUT | uriloader/exthandler/tests/unit_ipc/test_encoding.js | Test timed out
There are, sadly, many combinations of linkage in use throughout the tree.
The main differentiator, though, is between program/libraries related to
Gecko or not. Kind of. Some need mozglue, some don't. Some need dependent
linkage, some standalone.
Anyways, these new templates remove the need to manually define the
right dependencies against xpcomglue, nspr, mozalloc and mozglue
in most cases.
Places that build programs and were resetting MOZ_GLUE_PROGRAM_LDFLAGS
or that build libraries and were resetting MOZ_GLUE_LDFLAGS can now
just not use those Gecko-specific templates.
OS_LIBS for libraries that are not part of the gecko tree, EXTRA_LIBS for
libraries, such as NSPR, that are in the tree, but are not handled by
moz.build just yet. Those EXTRA_LIBS may also come from a system library.
However, in cases where the expanded variables are always empty for the
in-tree case, OS_LIBS is used (as for, e.g. MOZ_ZLIB_LIBS). OS_LDFLAGS is
used exclusively for non-library linker flags.
Always pass EXTRA_LIBS before OS_LIBS on linker command lines.
Forbid EXTRA_DSO_LDOPTS, SHARED_LIBRARY_LIBS and LIBS in Makefiles.
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):
- Never set the buffer's mode.
Years ago, Emacs did not have a good JavaScript mode, so it made sense
to use Java or C++ mode in .js files. However, Emacs has had js-mode for
years now; it's perfectly serviceable, and is available and enabled by
default in all major Emacs packagings.
Selecting a mode in the -*- file variable line -*- is almost always the
wrong thing to do anyway. It overrides Emacs's default choice, which is
(now) reasonable; and even worse, it overrides settings the user might
have made in their '.emacs' file for that file extension. It's only
useful when there's something specific about that particular file that
makes a particular mode appropriate.
- Correctly propagate settings that establish the correct indentation
level for this file: c-basic-offset and js2-basic-offset should be
js-indent-level. Whatever value they're given should be preserved;
different parts of our tree use different indentation styles.
- We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
Remove tab-width: settings, at least in files that don't contain tab
characters.
- Remove js2-mode settings that belong in the user's .emacs file, like
js2-skip-preprocessor-directives.
Many moz.build files define things that could be defined in parent
moz.build files. Keeping the number of moz.build files low helps with
build times due to less I/O and fewer directories traversed.
This patch eliminates a lot of moz.build files by moving their content
into parent moz.build files.
--HG--
extra : rebase_source : 0cfdf2697d10532e5b03cd27fbaadb41f42b837c
extra : amend_source : 0119d4e4881217f105e0e4ba1dfa9c8f7295f3e9
extra : histedit_source : eb49e62c67af2005fdc08d9c9a07f56bee98d558%2C50951e960e450f9b0e48fc7e8ec369d8666a63b0
Hiroyuki Ikezoe
Gareth Smith
Magnus Melin
Ganesh Sahukari
Ryan VanderMeulen
Carsten "Tomcat" Book
Phil Ringnalda
Christoph Kerschbaumer
Gavin Sharp
Mike Hommey
Andrew Halberstadt
Jim Blandy
Bill McCloskey
Wes Kocher
Vaibhav Agarwal
Ehsan Akhgari
Gregory Szorc
Paolo Amadini
Ms2ger
Martijn Wargers
Ed Morley