Граф коммитов

4844 Коммитов

Автор SHA1 Сообщение Дата
Jan Beich 2b7ca7d884 Bug 1348021 - Unbreak config/gcc_hidden.h build with libc++ after bug 1341238. r=froydnj
MozReview-Commit-ID: Bfv6inLV7lV

--HG--
extra : rebase_source : f0e2f461f4d3f4f54bf3d6db61a1202da7e8234c
2017-03-16 18:15:49 +00:00
David Major d1bf9bd2fd Bug 1345998: Clean up some unused libs and delayloads in xul.dll. r=glandium
MozReview-Commit-ID: 5VgLdt2esRY

--HG--
extra : rebase_source : 9197b09d2d27a5d38dec0a530afc30abe984481e
2017-03-14 22:23:52 +13:00
Makoto Kato cebfbb06e4 Bug 1345336 - Part 2. Update ICU date file. r=Waldo
MozReview-Commit-ID: 2CWHVsLtaIt
2017-03-13 13:38:01 +09:00
Sebastian Hengst 13270bd74d Backed out changeset 2140db6f8e48 (bug 1345336) 2017-03-13 10:46:40 +01:00
Makoto Kato 1f276e17d9 Bug 1345336 - Part 2. Update ICU date file. r=Waldo
MozReview-Commit-ID: 2CWHVsLtaIt

--HG--
extra : rebase_source : 0b800d13b8b1a4ab86a9f0e0472b4d7beb38eb79
2017-03-13 13:38:01 +09:00
BharatR123 a919e5ab29 Bug 1317099 - Fix filename in check_spidermonkey_style.py error message r=arai
MozReview-Commit-ID: 14H09snq6ht

--HG--
extra : rebase_source : 867fe7d39ab9e79dfdde4b8af15ebd6b94e7c491
2017-03-09 18:14:03 +05:30
Makoto Kato 37ffe9aa86 Bug 1340393 - Remove -FS option on SIMPLE_PROGRAM. r=glandium
Although bug 1322703 is backed out, we can remove -FS options to build SIMPLE_PROGRAM.

MozReview-Commit-ID: 7uO3We5hc5n

--HG--
extra : rebase_source : 6f909c4f38ba5a5bdffed7f9ca5be0030b9c681b
2017-03-07 17:19:04 +09:00
ffxbld cce942762c Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
MozReview-Commit-ID: GEyM0F1O4hP
2017-03-06 23:53:55 +01:00
Carsten "Tomcat" Book cf269a43bd merge mozilla-inbound to mozilla-central a=merge 2017-03-03 13:03:48 +01:00
Makoto Kato 005b442f5f Bug 1225401 - Part 3. Update icudt58l.dat. r=Waldo
MozReview-Commit-ID: GxwJdkk134q
2017-03-03 15:16:06 +09:00
Makoto Kato 46f32e1ec4 Backed out changeset 8c51fd25a389 (bug 1225401)
MozReview-Commit-ID: HdWed0PDTc6
2017-03-03 14:16:07 +09:00
Makoto Kato 50db2c3032 Bug 1225401 - Part 3. Update icudt58l.dat. r=Waldo
MozReview-Commit-ID: BuB7VT3mwiS
2017-03-03 13:56:28 +09:00
Chris Manchester 69554aaee0 Bug 1339673 - Only force re-linking during PGO builds for the compile tier. r=glandium
Depending on a library or program in misc during a pgo build causes extraneous
rebuilding due to an added FORCE dependency, so we stop adding it except during
the compile tier.

MozReview-Commit-ID: 91dZFa6IRzt

--HG--
extra : rebase_source : 9994a5c05865c81d95ea075c753e270d3c223570
2017-02-17 11:08:50 -08:00
Sebastian Hengst 0c32b64e57 Backed out changeset 4aa866ebfeaa (bug 1322703) 2017-03-01 18:45:56 +01:00
Ted Mielczarek be6f12e547 bug 1322703 - use -Fd to specify unique PDB filename per-object-file for MSVC. r=glandium
MozReview-Commit-ID: CxpLruksaHg
2017-03-01 18:41:46 +01:00
André Bargull e10fb026e9 Bug 1343493 - Update tzdata in ICU data files to 2017a. r=Waldo 2017-03-02 02:11:16 -08:00
Ted Mielczarek b89045917e backout b7a2f7ff5e87 (bug 1322703) for making local xul.dll link times way slower
MozReview-Commit-ID: 5QVFWVhfFfD
2017-03-01 10:37:35 -05:00
Nathan Froyd 1cbbd567b5 Bug 1302704 - part 1 - define CARGO_TARGET_DIR in the backend; r=chmanchester
CARGO_TARGET_DIR is currently hardcoded to the current directory, but
we'd like the ability to choose a value for Rust libraries.
2017-02-23 10:35:07 -05:00
Iris Hsiao bc5590a600 Merge mozilla-central to autoland 2017-02-22 16:17:36 +08:00
Phil Ringnalda 53ccf8158e Backed out 5 changesets (bug 1318370) for mozilla-central Windows static-analysis bustage
Backed out changeset 196f9ddbf7aa (bug 1318370)
Backed out changeset 72f6eace33a1 (bug 1318370)
Backed out changeset c0c0e10ed613 (bug 1318370)
Backed out changeset a8032ae9cb2a (bug 1318370)
Backed out changeset 0848b3201c40 (bug 1318370)
2017-02-21 21:22:01 -08:00
Zibi Braniecki 27ba812587 Bug 1312053 - Expose an API to get locale information. r=Waldo
MozReview-Commit-ID: LivVJzrb3X1

--HG--
extra : rebase_source : a8c566cf918f01216e9f22e953da935ce41b7654
2017-02-17 20:06:43 -08:00
Lee Salzman fffec15aa3 Bug 1321129 - make nsShmImage stride compatible with XShm. r=karlt
MozReview-Commit-ID: GuiVTPKvAZM
2017-02-21 10:00:52 -05:00
Ted Mielczarek 0ba51f3683 bug 1318370 - move _DEPEND_CFLAGS+CL_INCLUDES_PREFIX to toolchain.configure, ignore {CC,CXX}_WRAPPER when using sccache r=glandium
Currently mozconfig.cache overrides a few build options for sccache. This
patch moves them into toolchain.configure so that the build system will
set them properly when sccache is in use. Additionally, {CC,CXX}_WRAPPER
are set in config.mk, so just avoid setting them when sccache is in use.

MozReview-Commit-ID: FYlVKRI8OiN

--HG--
extra : rebase_source : cc7e4346869b98a52840c101824044abc236637f
2017-01-10 16:52:27 -05:00
Ted Mielczarek 5d759be63f bug 1318370 - stop using -Z7 for MSVC compilation with sccache. r=glandium
We've been using -Z7 to make MSVC emit CodeView debug info directly in
the object files instead of in PDB files because sccache can't cache
PDB files if the same one is written to by multiple compiles, which
was previously happening in our build system, and was hard to override
in the NSS build. Now that those are fixed this should work fine.

This adds a bit to the compile rule to remove the PDB file before
compilation, since sccache won't cache a compilation if the PDB file
it is supposed to generate already exists (for the aforementioned reason).

MozReview-Commit-ID: rFlX0XfTGw

--HG--
extra : rebase_source : 8f991ce72115537466f5720c20dc53083f3b2b35
2016-12-14 14:58:26 -05:00
Ralph Giles 1021cfbd7f Bug 1340672 - Don't clobber CARGOFLAGS in non-debug builds. r=froydnj
Previously, we overrode the CARGOFLAGS when we set --release
for non-debug builds. This was an oversight from bug 1310939.

MozReview-Commit-ID: LOBkCmxwDzc

--HG--
extra : rebase_source : 0325d1705cb28d6c82369abffc6fac3ca5ee6f0a
2017-02-17 12:50:29 -08:00
Ralph Giles d3fb57abec Bug 1340587 - Remove MOZ_CARGO_SUPPORTS_FROZEN. r=froydnj
We now require cargo by version, and the minimum (0.16)
supports --frozen, so we don't need to check for this.

MozReview-Commit-ID: GPoadLkhRO5

--HG--
extra : rebase_source : e191e5dd2533e28c1bca0812f2776196cc3559cf
2017-02-17 12:16:45 -08:00
Mike Shal 206b54e042 Bug 1338608 - Use mozunit in check_mkdir.py; r=chmanchester
This makes the check_mkdir.py match the TEST-PASS output of other tests
in the suite.

MozReview-Commit-ID: FR3m09wRXg0

--HG--
extra : rebase_source : 2e59fb8bc4756a9ef9fdbcf69af80e179be80cc0
2017-02-02 18:04:23 -05:00
Mike Shal 0acd1a6b5f Bug 1338608 - Move check_mkdir.tpy into a python unittest manifest; r=chmanchester
We also rename it to check_mkdir.py for consistency with other python
files.

MozReview-Commit-ID: ALuX6NUMsD2

--HG--
rename : config/tests/makefiles/autodeps/check_mkdir.tpy => config/tests/makefiles/autodeps/check_mkdir.py
extra : rebase_source : a7215c832896dd040ae2c5b3c3c2d7247c8163d8
2017-02-02 17:49:11 -05:00
Mike Shal e86326d270 Bug 1338559 - Use the tier system to recurse for 'make check'; r=glandium
This helps us avoid recursing over every directory when we only need to
run 'make check' in a select few.

MozReview-Commit-ID: BJ3hJBOneIz

--HG--
extra : rebase_source : 2493f924b9ccba3c779e512d7a8b7a2c26f43797
2017-02-03 16:47:28 -05:00
Carsten "Tomcat" Book 4b09103e6f Merge mozilla-central to mozilla-inbound 2017-02-16 13:18:55 +01:00
Michał Górny f9a50474a4 Bug 1329798 - Include sys/sysmacros.h for major(), minor() on Linux. r=glandium
Include sys/sysmacros.h explicitly as that will be required by future
glibc versions to expose major() and minor() macros.

Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1329798
2017-02-15 00:49:00 +01:00
Tooru Fujisawa 43fdb1c7f0 Bug 1336783 - Part 1: Rework on reserved word and remove TokenStream::KeywordIsName. r=jwalden
--HG--
rename : js/src/jsautokw.py => js/src/frontend/GenerateReservedWords.py
rename : js/src/vm/Keywords.h => js/src/frontend/ReservedWords.h
2017-02-15 23:53:05 +09:00
Wes Kocher 51dac1f2e8 Merge m-c to autoland, a=merge
MozReview-Commit-ID: FqToQ9qk7dg
2017-02-15 16:33:46 -08:00
Ted Mielczarek 778b18b977 bug 1322703 - use -Fd to specify unique PDB filename per-object-file for MSVC. r=glandium
MozReview-Commit-ID: CxpLruksaHg

--HG--
extra : rebase_source : 16087aba96fb7e0d7f764b4ca21d27a78a19df4d
2016-12-14 14:40:59 -05:00
Kartikaya Gupta 7ed8a4e41a Bug 1337895 - Make the pkg-config rust crate happy when cross-compiling. r=froydnj
MozReview-Commit-ID: 1430wwCYbj4

--HG--
extra : rebase_source : a66e085219992f0cb75857afebeb1003df95bbdd
2017-02-08 14:13:50 -05:00
Tom Ritter 8d3b0051f6 Bug 1336569 Define SYMBOL_UNDERSCORE for ffi in the mingw build r=glandium
MozReview-Commit-ID: 6BiTcohFDPk

--HG--
extra : rebase_source : d783f2950009d07ea45cdcc693771f4141df6ee9
2017-02-08 09:36:04 -06:00
Martin Stransky 609b4c9aad Bug 1336047 - Add gdk/gdkwayland.h to system headers, r=glandium 2017-02-02 02:08:00 +01:00
Gregory Szorc 19ffcf1738 Bug 1322769 - Declare servo rust feature properly; r=manishearth
268fa5f3bc25 grafted an old patch to define --features=servo in
rules.mk. That patch was written before RUST_LIBRARY_FEATURES
existed. This commit fixes it up.

MozReview-Commit-ID: L5atm5CsP8d

--HG--
extra : amend_source : 9362db15a696ebd5871df94afb429d6f828de184
2017-02-02 16:32:54 -08:00
Gregory Szorc aaae03d7a8 Bug 1322769 - Add a "servo" feature; r=manishearth
MozReview-Commit-ID: A9dNTxNkl39

--HG--
extra : rebase_source : b9d115025beb00d596d34ca8d414a69b8ea2ba07
extra : source : f142ed52978bfab6407c252b7c56c53d0c3fcecd
2017-02-02 15:30:16 -08:00
Wes Kocher f5eab47fb9 Merge m-c to autoland, a=merge
MozReview-Commit-ID: HVH8TbXbw7N
2017-02-01 16:30:50 -08:00
Michael Layzell 0dadca05f7 Bug 1335203 - Synchronize rust debug-assertions with C++ DEBUG, r=froydnj
MozReview-Commit-ID: JPD9eNFg89S
2017-02-01 13:54:22 -05:00
Chris Manchester d668d760b9 Bug 1333135 - Do not attempt to install SIMPLE_PROGRAMS during MOZ_PROFILE_GENERATE. r=mshal
MozReview-Commit-ID: BNvX0dFAIUf

--HG--
extra : rebase_source : ef5ccc377253b27012c7501197c232a18097a4f5
2017-02-01 10:59:41 -08:00
Mike Hommey dc5d1e6adf Bug 1335309 - Change the default for find_executables to False. r=mshal
Back when the class was written, for the packaging code, it made sense
that the default was True. But now that it's used all over the place,
and that the vast majority of uses are with find_executables=False, it
makes more sense for that to be the default.

--HG--
extra : rebase_source : ff813735fc0d53093f348f20eb77ee03e9b09d4e
2017-01-31 14:06:15 +09:00
Benjamin Smedberg beb6ea8925 Bug 1333826 - Remove a few references from .mk files, r=mshal
MozReview-Commit-ID: E5cDr4OO91C

--HG--
extra : rebase_source : 3480c22581113ceee42e07e933f10447048cec70
2017-01-25 14:21:30 -05:00
Benjamin Smedberg ca77995f5d Bug 1333826 - Remove SDK_FILES, SDK_LIBRARY, and related is_sdk support in the build goop, r=mshal
MozReview-Commit-ID: 52vPyDXdFte

--HG--
extra : rebase_source : c3217730bb70eb7319152dd07536b12f49d6a597
2017-01-30 11:24:10 -05:00
Nathan Froyd 960aa50e1b Bug 1324296 - only enable verbose cargo output if BUILD_VERBOSE_LOG; r=ted.mielczarek
This mirrors what we do elsewhere for C/C++/etc.
2017-01-26 20:38:27 -05:00
Chris Manchester 26adeacc8a Bug 1312916 - Add support for host rust libraries in moz.build. r=froydnj
MozReview-Commit-ID: It8VH5Obnx5

--HG--
extra : rebase_source : bc4dabb18ff51c45ac8df5a409881d0d4a7279fa
2017-01-19 14:58:10 -08:00
ffxbld ed04f7a449 Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2017-01-23 15:38:06 +00:00
nfroyd@mozilla.com 8b92f8beb8 Bug 1302028 - part 6 - pass LIBCLANG_PATH and CLANG_PATH environment variables to cargo build; r=gps 2017-01-20 16:33:04 +00:00
Jan Beich 37441c2712 Bug 1325246 - Unbreak build --with-system-icu after bug 1270146. r=glandium
MozReview-Commit-ID: Dob5wTmHgxn

--HG--
extra : rebase_source : 7505163d23978c4cbb308314ba78a7063199face
2016-12-22 01:42:19 +00:00
André Bargull da4c250c9f Bug 1323254 - Part 1: Update in-tree ICU to release 58.2. r=Waldo 2016-12-13 13:15:43 -08:00
Zibi Braniecki ee5fe1af13 Bug 1270146 - Add PluralRules API. r=Waldo
MozReview-Commit-ID: 2WCcMjiGjwZ

--HG--
extra : rebase_source : 4fa494e35424be579ba3714bab2a4e1932d6404c
2016-12-20 11:54:44 -08:00
Xidorn Quan a2cddc7eb7 Bug 1323127 - Pass absolute path of DIST to cargo. r=froydnj
MozReview-Commit-ID: GOK2MSA6imC

--HG--
extra : rebase_source : 4abe1a93ff488a4612f4f6f4ca3961c9db3456e7
2016-12-13 15:38:37 +11:00
Phil Ringnalda 5b74c14e18 Backed out changeset 349a316ed0f7 (bug 1316735) for build packaging failures
CLOSED TREE
2016-12-13 10:48:40 -08:00
Jack Bates c2c1c10265 Bug 1316735 - Relative symlinks in the dist directory. r=gps
Make the symlinks in the dist directory relative instead of absolute.

MozReview-Commit-ID: HS7KL4JwSbV

--HG--
extra : rebase_source : 5dca673cc17423d47e6707d8800f7ee9693a9c48
2016-11-10 22:24:38 +00:00
André Bargull d1745aead9 Bug 1321030: Update tzdata in ICU data files to 2016j. r=Waldo 2016-11-29 15:16:21 -08:00
Phil Ringnalda 2edc2d42db Merge m-i to m-c, a=merge
MozReview-Commit-ID: ByPMe4s1FrG
2016-12-02 22:17:31 -08:00
Gregory Szorc c7c65f2fb5 Bug 1321750 - Remove automatic color flags from HOST_CFLAGS, HOST_CXXFLAGS; r=glandium
moz.configure only sets the color flags value for the target compiler.
If the host compiler is a different version and doesn't support color
flags, we may pass unrecognized command line options.

Until we have better distinction between host and target compilers
throughout the build system, just disable automatic color flags for
host invocations. We don't have too many host binaries, so this should
have negligible impact.

MozReview-Commit-ID: KWTLkKvtwHs

--HG--
extra : rebase_source : 97a7240a796bae42221b2952d4dc1e66294e6219
2016-12-02 10:10:24 -08:00
Nathan Froyd 1c12d3858c Bug 1319156 - part 2 - handle Rust library features in the recursivemake backend; r=chmanchester 2016-12-02 11:39:15 -05:00
Nathan Froyd 8783deedb3 Bug 1318981 - part 2 - pass MOZ_DIST as an environment variable to `cargo build`; r=chmanchester
rust-bindgen, at least, will need to know where Gecko's headers are to
parse them.
2016-12-02 11:38:45 -05:00
Nathan Froyd b3f52ed877 Bug 1318981 - part 1 - factor out a CARGO_BUILD makefile variable; r=chmanchester
This change makes the individual cargo rules easier to understand, and
provides a single place to change e.g. environment variables passed to
cargo.
2016-12-02 11:38:45 -05:00
Ting-Yu Chou 4941450f3f Bug 1316545 part 4 - Run clang.exe instead of clang-cl.exe for loading the plugin. r=ehsan,glandium
MozReview-Commit-ID: K85tFo0nzoI

--HG--
extra : histedit_source : 2652e6144760cf77d10ba3b28fc73b85378ec585
2016-11-22 14:20:58 +08:00
Mike Hommey 07083a8dfb Bug 1317504 - Make MSVC builds use the LINK variable instead of LD. r=chmanchester
At the same time, remove HOST_LD. It was only used for MSVC builds,
which don't support cross-compile anyways, so we can, at least for now,
use LINK for both host and target.

--HG--
extra : rebase_source : 9ee9e7e1bd3edefc043fa63d5c03f2a242f76982
2016-11-24 15:45:16 +09:00
Nathan Froyd 36fb414815 Bug 1293253 - part 6 - add build and installation rules for {HOST_,}RUST_PROGRAMS; r=chmanchester
The only complicating factor here is having to split out the --target
flag from cargo_build_flags, so we can pass the appropriate one
depending on our build target.
2016-11-28 11:20:39 -05:00
Nathan Froyd 3d6a6a666a Bug 1293253 - part 5 - move cargo_build_flags determination out of RUST_LIBRARY_FILE block; r=chmanchester
We need cargo_build_flags not just for Rust libraries now, but for Rust
programs as well.
2016-11-28 11:20:39 -05:00
Nathan Froyd cd91c3196d Bug 1293253 - part 1 - modify existing Rust library build rules to be explicitly about libraries; r=chmanchester
In preparation for a world where we have cargo building binaries too,
the existing rules should be renamed to reflect their library
associations.  The lone Cargo invocation should be updated to explicitly
build libraries only, so libraries and binaries in the same directory
will work correctly.

Fixup a leftover comment from a previous set of changes while we're here.
2016-11-28 11:20:39 -05:00
Wes Kocher b851c06cc9 Merge m-c to inbound, a=merge 2016-11-23 16:18:24 -08:00
André Bargull fa6366e3c1 Bug 1319465 - Use the newer ICU string normalization API to improve performance for partially normalized strings. r=arai 2016-11-22 09:20:18 -08:00
Sebastian Hengst e572ef1bbb Backed out changeset aabf76e98464 (bug 1319465) for failure in Intl.h in Sm-tc(nu). r=backout 2016-11-23 17:40:54 +01:00
André Bargull f65a5306ad Bug 1319465: Use the newer ICU string normalization API to improve performance for partially normalized strings. r=arai 2016-11-22 09:20:18 -08:00
Gregory Szorc ef9dd4c540 Bug 1319166 - Don't automatically enable color in iTerm2; r=glandium
iTerm2 interprets the byte sequence "ESC [ 2 i" as a request to open
a print dialog. This sequence can get emitted when printing colorized
compiler output.

Until we figure out a workaround, disable automatic coloring on iTerm2
so developers aren't annoyed.

MozReview-Commit-ID: 3Be4YgArg4k

--HG--
extra : rebase_source : e4e441a6fd97b09f55b05d53af91890649249e1c
2016-11-21 22:37:01 -08:00
Carsten "Tomcat" Book 8b27dda5d1 merge mozilla-inbound to mozilla-central a=merge 2016-11-22 15:53:05 +01:00
Andrew Halberstadt 6adcf5b456 Bug 1317970 - Use manifestparser manifests for python unit tests, r=chmanchester
This deprecates PYTHON_UNIT_TESTS and replaces it with PYTHON_UNITTEST_MANIFESTS.
In the build system, this means python unittests will be treated the same as all
other test suites that use manifestparser. New manifests called 'python.ini' have
been created for all test directories containing python unittests.

MozReview-Commit-ID: IBHG7Thif2D

--HG--
extra : rebase_source : 11a92a2bc544d067946bbd774975140147458caa
2016-11-16 09:59:22 -05:00
Mike Hommey e8af659498 Bug 1319345 - application.ini fixup for artifact build bustage; r=gps
--HG--
extra : amend_source : 2ee3e26e5e68bbdf718d02dd0d86d40fb0d18be6
2016-11-22 14:50:28 -08:00
Nathan Froyd 55243ce768 Bug 1300835 - enable --disable-optimize --enable-debug to DTRT for Rust code; r=ted.mielczarek 2016-11-21 17:39:39 -05:00
Richard Marti 26169e82fa Bug 1318798 - Remove config/external/nss/target in recurse.mk. r=ted
MozReview-Commit-ID: 884NGQYXfQl

--HG--
extra : amend_source : ed7edd124dc7f1847063f5c0f5a9b068cf45ffa3
2016-11-19 16:15:35 +01:00
Ted Mielczarek a449823a50 bug 1295937 - build NSS using gyp files. r=glandium
MozReview-Commit-ID: Gm1PLWSJwbD

--HG--
rename : config/external/nss/moz.build => security/moz.build
rename : config/external/nss/nss.symbols => security/nss.symbols
extra : rebase_source : bedd3b2f315f8504e1d0cb1ee94720e380466e5b
2016-11-09 12:37:09 -05:00
André Bargull af66848eae Bug 1314920 - Update tzdata in ICU data files to 2016i. r=Waldo
--HG--
extra : rebase_source : 3c3b0fa19d7d8f8a47148afaea4290fe6d9b6e65
2016-11-07 10:10:21 -08:00
Gregory Szorc 4732e7cb34 Bug 1171610 - Automatically enable color in compiler output; r=glandium
GCC and Clang will colorize compiler output automatically if stdout is a
TTY. Unfortunately, when the build backend is invoked via `mach`,
stdout is not a TTY.

6e9a4c0b9cd8 (bug 1315785) changed mach so it exports an environment
variable indicating whether mach's original stdout is a TTY. This was
later used to add color flags to `cargo` invocations.

Building on that work, this patch adds color flags to compiler
invocations if the compiler supports color and a mach TTY is
detected. The result is that compiler output from `mach build`
will be colorized automatically if Clang or a modern version of
GCC is used.

The only issue I see with this is that Clang doesn't "unset" its color
sequences when printing a newline. As a result, mach's time line
prefixing can sometimes inherit "bold" or other stylings. AFAICT this is
only a minor cosmetic concern. GCC does not exhibit this issue.

MozReview-Commit-ID: 5Icu6aXGZBL

--HG--
extra : rebase_source : 5b2bf5a287fdf8075b3d7dde36b91f3c65b60728
2016-11-09 14:01:24 -08:00
Phil Ringnalda aee7b7f39e Merge m-c to autoland 2016-11-14 20:08:18 -08:00
ffxbld d07aca95ba Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2016-11-14 13:29:32 +01:00
Martin Thomson 0b45b71319 Bug 1316261 - Configure trust anchors list to be empty for WebRTC, r=drno
MozReview-Commit-ID: ltSVAAp2WF

--HG--
extra : rebase_source : cd7e2aea72c74e8eda7089f5a540d3a839534acf
2016-11-12 10:57:21 +11:00
Carsten "Tomcat" Book 846adaea6c merge mozilla-inbound to mozilla-central a=merge 2016-11-09 16:38:04 +01:00
Gregory Szorc 389dbcf95f Bug 1315785 - Invoke cargo with --color=always when original stdout is a TTY; r=glandium
Combined with the previous patch that sets MACH_STDOUT_ISATTY, the
practical effect of this patch is that cargo is invoked with
`--color=always` when mach was attached to a TTY and colorized output
is sent to the terminal.

Note: this doesn't work with Rust/Cargo 1.10 for reasons unknown to me.
It appears there was a bug with Rust/Cargo because `--color=never` still
sent colorized output on that version! Cargo/Rust 1.12.1 works fine.

MozReview-Commit-ID: 6uXS3t3413i

--HG--
extra : rebase_source : 72df6e8248cb14c96850964f694576c7fd2f5fbb
2016-11-07 13:46:15 -08:00
Jan Beich 5e4ba89dca Bug 1315882 - Unbreak --with-system-nspr after bug 1115944. r=glandium
MozReview-Commit-ID: H9A63lwCasG

--HG--
extra : rebase_source : eded64cd638b5efc1293af0060e684c743993177
2016-11-08 06:44:36 +00:00
David Keeler aca0d93d8d bug 1195434 - specify what signature schemes the platform will actually accept in TLS handshakes r=mt
MozReview-Commit-ID: A3T4EgEfcfy

--HG--
extra : rebase_source : 0369bb38069fde33a57e885b5009257b4a16c7ac
2016-11-03 12:53:23 -07:00
Phil Ringnalda 06521a66a4 Merge m-c to m-i
MozReview-Commit-ID: 7W5SwSOspcB
2016-11-04 21:04:44 -07:00
Mike Hommey 342e5e3816 Bug 1115944 - Work around race condition between building NSPR and NSS. r=mshal
--HG--
extra : rebase_source : 61a9a23360d16ad6d60b0bb65107f2cb797d9736
2016-11-04 17:06:51 +09:00
André Bargull def7683621 Bug 1299615 - Part 5: Update tzdata in ICU data files to 2016h. r=Waldo 2016-10-27 15:39:49 -07:00
André Bargull a934a3b70d Bug 1299615 - Part 3: Update in-tree ICU to release 58.1. rs=Waldo 2016-11-03 05:27:28 -07:00
Emanuel Hoogeveen e0a81d7503 Bug 1309573 - Part 2: Define MOZ_HAS_MOZGLUE in various places so that the crash reason gets used. r=glandium
--HG--
extra : rebase_source : d55e8dd75469759f333366bdf9662178ff0a2474
2016-11-08 03:53:00 -05:00
Zibi Braniecki 89b4923282 Bug 966559 - Use public C API for NumberingSystem. r=Waldo
MozReview-Commit-ID: CBICCJQXI7R

--HG--
extra : rebase_source : b74b9d6038580ab970565bb56c09d5330be92407
2016-11-01 12:15:26 -07:00
Aaron Klotz a426b005cc Bug 1310841: Modify build rules to allow specification of a manifest for Windows DLLs; r=gps
MozReview-Commit-ID: EdY8Kx8irYW

--HG--
extra : histedit_source : 2c62d93279b54c30840910fb3fe54f9276a80f01
2016-10-17 16:03:11 -06:00
André Bargull aec865dde5 Bug 1312061 - iUpdate tzdata in ICU data files to 2016h. r=Waldo 2016-10-21 10:18:12 -07:00
Cameron McCormack 4378d41370 Bug 1310939 - Pass $(CARGOFLAGS) to cargo invocations so cargo flags can be passed from a .mozconfig file. r=froydnj
MozReview-Commit-ID: A5GNTzS0BTM

--HG--
extra : amend_source : 01749f41a239949510bbc1e90a3324c934cfe86a
2016-10-18 16:04:57 +08:00
André Bargull e92830ccfa Bug 1310733 - Part 1: Update tzdata in ICU data files to 2016g. r=Waldo
--HG--
extra : rebase_source : d96161ceb37720a00237d60c0c1b83112b056926
2016-10-18 11:45:57 -07:00
Eugen Sawin 5b99355518 Bug 1307570 - [1.4] Add XZ Embedded support configuration, scripts and the initial library version. r=glandium 2016-10-18 15:11:02 +02:00
Ted Mielczarek e9130abab5 bug 1305731 - Revert workaround from bug 1301751 now that we have updated to Rust 1.12. r=froydnj
MozReview-Commit-ID: 3akbELExfKT

--HG--
extra : rebase_source : 0308214bae6eb683df65991fc91d41679acd3530
2016-10-17 10:47:30 -04:00
Nathan Froyd e818915fae Bug 1304815 - rearrange Rust crate structure for newer Rust releases; r=ted.mielczarek
In our current Rust world, we have the following dependency structure:

  xul.so --------------------------+
                                   |
  xul-gtest.so -+--> xul.a --------+-> gkrust
                |
                +--> gkrust-gtest

This structure results in link errors with multiply-defined symbols
between gkrust-gtest and gkrust with newer Rust releases when linking
xul-gtest.so.  So we have to do something different.

Our new structure is:

  xul.so --------------------------+
                                   |
  xul-gtest.so -+--> xul.a --------+-> gkrust --+-> gkrust-shared
                |                               |
                +--> gkrust-gtest --------------+

and we enforce that a given shared library can only have at most one
Rust library that it depends on.  Said Rust library is assumed to
include all significant Rust dependencies of the dependent static
libraries as well.  (In the above structure, gkrust is simply a wrapper
around gkrust-shared, so gkrust-gtest doesn't have to include gkrust as
a dependency.)
2016-10-15 18:16:13 -04:00
Chris Pearce 35e13f726f Bug 1308076 - Move ClearKeyCencParser to PsshParser library. r=glandium
To validate the PSSH init data passed to EME, I'd like to reuse the same
PSSH parser that the ClearKey CDM shared library uses. So move the code
out of gmp-clearkey and into its own library, so we can link it statically
into code that needs to use it.



MozReview-Commit-ID: 7xSUSmCueJz

--HG--
rename : media/gmp-clearkey/0.1/ClearKeyCencParser.cpp => media/psshparser/PsshParser.cpp
rename : media/gmp-clearkey/0.1/ClearKeyCencParser.h => media/psshparser/PsshParser.h
extra : source : 78dcbc5d3c26547c63269eb14034a67863cf28de
2016-10-06 20:23:38 +13:00
Enes Goktas 43ddfab91c Bug 1303227 - Wrap libxul.so linker to prevent getting the linking process killed; r=glandium
This patch removes the memory usage tracking in the script that wraps the
linking of the xul library. This patch also generalizes the wrapping of the
xul linking process to all platforms.

MozReview-Commit-ID: HyncF3aVwdx

--HG--
extra : rebase_source : 8fb90c896dc57793d1c9d9aa4e8492dec8697e36
2016-09-20 17:58:34 -07:00
Andrew Halberstadt 6b48ddc0b0 Bug 1304593 - Use |mach python-test| to run python unittests from make check, r=ted
Currently make check loops over all directories and runs each test file in PYTHON_UNIT_TESTS
individually. This patch instead creates a single top-level check target that runs
|mach python-tests|. This should make automation more similar to running locally, be a bit
quicker and make it easier to pull python tests out of make check completely at a future date.

MozReview-Commit-ID: 4Hg4zdFyc61

--HG--
extra : rebase_source : 31d0c38a76c11b75d3bf569f2bf22a0666161726
2016-09-26 15:29:02 -04:00
Carsten "Tomcat" Book 5b45193594 merge mozilla-inbound to mozilla-central a=merge 2016-09-29 11:44:58 +02:00
Makoto Kato d78efa6ffb Bug 1305677 - Remove requirement of libffi on aarch64 as default. r=chmanchester
To support android/aarch64, I want to remove the requirement of system's libffi.

MozReview-Commit-ID: Lc3POx09Cks

--HG--
extra : rebase_source : 384852e7b9e61d0d7a950159535e3ddc8457e889
2016-09-27 19:16:03 +09:00
Makoto Kato 347d2f4b09 Bug 1305931 - --enable-system-ffi is broken after landing bug 1262155. r=chmanchester
MozReview-Commit-ID: MQlMdXDhbW

--HG--
extra : rebase_source : cecaa8451f4bbad5ea77211f64c1dc5c90fe5257
2016-09-28 15:41:15 +09:00
Carsten "Tomcat" Book b5206d37f5 Merge mozilla-central to mozilla-inbound 2016-09-28 16:25:01 +02:00
Carsten "Tomcat" Book 572e74ee99 merge mozilla-inbound to mozilla-central a=merge 2016-09-28 15:56:33 +02:00
Tooru Fujisawa fd9e045dcb Bug 1304970 - Check encoding of js.msg-like files. r=jandem,gps 2016-09-28 14:12:54 +09:00
Ted Mielczarek abdba70d60 bug 1301751 - work around llvm-dsymutil crash by building rust with debuginfo=1 instead of -g. r=froydnj
MozReview-Commit-ID: 5pK8okLw0Cl

--HG--
extra : rebase_source : f1c366ae3751bcd70272e77c7754fb4adeafdd7b
2016-09-27 06:24:24 -04:00
Ted Mielczarek 6fba0e392a bug 1256642 - have the build system automatically detect LIB_IS_C_ONLY. r=glandium
MozReview-Commit-ID: 3xWSEe0Tmp9

--HG--
extra : rebase_source : 473fd5911dcf5e6d0122cb74de16e7d41cd35cdc
2016-08-24 11:29:00 -04:00
Sergei Chernov 976d5c3f1d Bug 1293231 - Certificate Transparency - basic telemetry reports; r=Cykesiopka,keeler
MozReview-Commit-ID: EGvuZADObJo

--HG--
extra : rebase_source : 9a059c9f8e2fdf9bfc693b0b5649808b1beeb67b
2016-08-11 13:41:50 +03:00
Martin Thomson 6158ad648f Bug 1304926 - Enable specific named groups, r=keeler
MozReview-Commit-ID: KIe6D9iRAXt

--HG--
extra : rebase_source : a8f6d712b59bf373e52a88b8451c8db4a3f71d65
extra : amend_source : 071e9f4c3ebe336af3888b76e778d0d753d326fc
2016-09-26 15:06:42 +10:00
Martin Thomson 54eb5cb215 Bug 1304919 - Update WebRTC to latest NSS, r=ekr
MozReview-Commit-ID: Jz9lraGZIyx

--HG--
extra : rebase_source : 9b80b600f46ecc04ea9f282342d3a98ef0e915b8
extra : source : f1aace586e14a276cc43dd00111d5c9d04580ea0
2016-09-23 13:47:00 +10:00
Sebastian Hengst a0d432121c Backed out changeset f1aace586e14 (bug 1304919) 2016-09-24 18:00:08 +02:00
Martin Thomson d566e166e9 Bug 1304919 - Update WebRTC to latest NSS, r=ekr
MozReview-Commit-ID: Jz9lraGZIyx

--HG--
extra : rebase_source : 9731046d82e7aeef9192fe6e7ce10dd56d80a78d
2016-09-23 13:47:00 +10:00
Chris Manchester 6736329d5e Bug 1262155 - Use moz.build instead of libffi's build system. r=ted,glandium
MozReview-Commit-ID: 3wobNk0HDU5
2016-08-08 16:58:54 -07:00
Chris Manchester bb8ff6012c Bug 1262155 - Always pass defines when compiling SOBJS. r=ted
This is relevant when attempting to build libffi with our build system
(libffi expects its assembly sources to be pre-processed).

MozReview-Commit-ID: J6mCUkYYjQh
2016-09-21 12:04:08 -07:00
Nathan Froyd ed9a70c138 Bug 1301076 - remove stlport support from the build system and stlport code; r=glandium
We can no longer build with STLport now that we require a
C++11-compliant standard library, so we might as well get rid of all the
support for it.
2016-09-21 19:21:40 -04:00
Michael Layzell 05bd5a1076 Bug 1300208 - Allow specifying multiple rust crates to mozbuild within the same FINAL_LIBRARY, r=froydnj
MozReview-Commit-ID: IIjV4Kg7wOv
2016-09-20 11:26:43 -04:00
Benjamin Bouvier 825a1575d8 Bug 1303085: Add fenv.h to the list of system-headers for rint/rintf; r=glandium
MozReview-Commit-ID: 2aOUxKqBj3g

--HG--
extra : rebase_source : 2481b138daa5fca18b8692ab47dbbb2ccdd0394b
extra : histedit_source : 4ad1e9befd98103ce80ffbfc1d70533e33c1e74f
2016-09-15 21:00:03 +02:00
ffxbld 857d1ac980 Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2016-09-19 09:45:57 -04:00
Gian-Carlo Pascutto 2326cba3bf Bug 977786 - Add tests for nsProfileLock. r=ted
MozReview-Commit-ID: 6Cr0EwVwVIq

--HG--
extra : rebase_source : 9e85ddca27685f0fcfbe518884cc05e922f1994f
extra : histedit_source : 6f1d53d79f59ee6a8319e05e5943653b4e026522
2016-09-16 17:31:14 +02:00
Carsten "Tomcat" Book d2c3fe7fd3 merge autoland to mozilla-central a=merge 2016-09-14 12:07:02 +02:00
Tooru Fujisawa c0fc17d9f4 Bug 1298779 - Port jskwgen to Python. r=jwalden 2016-09-14 12:16:41 +09:00
Nathan Froyd a83ad8b858 Bug 1298472 - part 2 - use #include_next in STL header wrappers for clang-cl; r=glandium
clang-cl's system header detection doesn't kick in if we're using full
paths to the STL headers we need to include.  And if certain headers
aren't recognized as system headers, we get a pile of warnings from
said headers.  Use #include_next to ensure that system headers are
recognized as such, and suppress the warnings.

MozReview-Commit-ID: 4ZlAAGa49M1

--HG--
extra : rebase_source : c56711e09118fe930f389cc48543a661c293d7e4
2016-09-09 09:01:14 -04:00
Martin Thomson 3561540a50 Bug 1188657 - Enable SSLKEYLOGFILE for non-release builds, r=kaie,glandium
MozReview-Commit-ID: CeTSLPmkoJ8
2016-04-26 19:40:41 +10:00
Nathan Froyd 3369462f39 Bug 1298466 - avoid some spammy warnings for ICU when compiling with clang-cl; r=ted.mielczarek
We don't need to hear about ICU redefining macros we set up or about
include paths that are Microsoft-specific, but still resolve to where
they need to go.

MozReview-Commit-ID: D9lFiNCvkOh

--HG--
extra : rebase_source : 66848780bb4e2473a7f1df9a621f0b2f54171e70
2016-08-25 17:13:51 -04:00
Chris Manchester b0b84a1928 Bug 1240134 - Incorporate the interfaces.xpt from downloaded artifacts instead of building XPIDL during an artifact build. r=glandium
MozReview-Commit-ID: 8oEyS1xLOwV
2016-08-17 15:02:31 -07:00
Elias Probst fa561f244a Bug 1293234 - Use octal notation for permission modes in the build system; r=gps
As of Python 3, decimal notations of octal values for permission modes
are no longer permitted and will result in a `SyntaxError` exception
(`invalid token`).

Using the proper octal notation which is also Python 2.7 compatible will
fix this issue.

--HG--
extra : rebase_source : 2e897c51f04ad0ee69071f84b98df224f3af72d3
2016-08-08 13:45:17 +02:00
Carsten "Tomcat" Book 553a2da922 merge mozilla-inbound to mozilla-central a=merge 2016-08-10 15:54:26 +02:00
Mike Shal 549dd4ff30 Bug 1293784 - Only recurse into xpcom/idl-parser/xpidl once; r=gps
MozReview-Commit-ID: 823OM551BH6

--HG--
extra : rebase_source : 0770b3156d9abd60cb3520eaee87f1a3211a8351
2016-08-09 16:58:18 -04:00
Nathan Froyd 5330c39ccd Bug 1293315 - remove RUSTFLAGS and friends from the build system; r=mshal
Now that we compile with cargo, we don't have fine-grained control over
the build flags used via environment variables detected in configure or
set in config.mk.  We should just remove that dead code so nobody trips
over it.
2016-08-09 18:10:19 -04:00
Nathan Froyd f7fb6722a6 Bug 1231764 - part 6 - build rust code via cargo; r=chmanchester
This patch is really two separate changes.

The first change is that rust crates are large, standalone entities that
may contain multitudes of source files.  It therefore doesn't make sense
to keep them in SOURCES, as we have been doing.  Moving to use cargo
will require a higher-level approach, which suggests that we need a
different, higher-level representation for Rust sources in the build
system.

The representation here is to have the build system refer to things
defined in Cargo.toml files as the entities dealt with in the build
system, and let Cargo deal with the details of actually building things.
This approach means that adding a new crate to an existing library just
requires editing Rust and Cargo.toml files, rather than dealing with
moz.build, which seems more natural to Rust programmers.  By having the
source files for libraries (and binaries in subsequent iterations of
this support) checked in to the tree, we can also take advantage of
Cargo.lock files.

The second is that we switch the core build system over to building via
cargo, rather than invoking rustc directly.

We also clean up a number of leftover things from the Old Way of doing
things.  A number of tests are added to confirm that we'll only permit
crates to be built that have dependencies in-tree.
2016-08-06 00:49:26 -04:00
Nathan Froyd 4fb1a7545d Bug 1231764 - part 0 - only link librul once; r=chmanchester
Through an oversight, we listed librul.a twice when linking libxul: once
as part of the "objects" we were linking, and once as a static library.
This duplication is unnecessary and would cause problems later when we
try to generate librul.a via cargo, as cargo will put it someplace
different from where we expect and the two names will conflict.  Let's
have rules.mk be the single source of truth for how librul.a is named,
and then the code to link libxul can simply refer to that name.
2016-08-06 00:49:26 -04:00
Carsten "Tomcat" Book cf611bec79 merge mozilla-inboudn to mozilla-central a=merge 2016-08-05 12:01:14 +02:00
Mike Hommey 9712b25c12 Bug 1292080 - Don't set NSINSTALL_BIN from old-configure. r=gps
The only use of this variable is to override NSINSTALL, and its value is
the same as NSINSTALL_PY.

While here, remove the outdated NSINSTALL_NATIVECMD that was used for
pymake.

--HG--
extra : rebase_source : b871fbb409836a17cb8d71cd1e5ddc9d5ad3f49f
2016-08-04 17:55:54 +09:00
James Willcox 26bcde6a5e Bug 1255628 - Replace and/or remove some graphics-related calls in AndroidBridge with NDK equivalents r=jchen 2016-08-04 09:23:34 -05:00
Carsten "Tomcat" Book 389a3e0817 merge mozilla-inbound to mozilla-central a=merge
--HG--
rename : mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/GeckoAppShell.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/GeckoLayerClient.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/LayerRenderer.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerRenderer.java
rename : mobile/android/base/java/org/mozilla/gecko/gfx/PanningPerfAPI.java => mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/PanningPerfAPI.java
2016-08-04 15:55:50 +02:00
Wes Kocher 9605851be0 Backed out 7 changesets (bug 1231764) for apparently causing linux debug wpt bustage
Backed out changeset 4b71272c92cf (bug 1231764)
Backed out changeset 234d8a930afa (bug 1231764)
Backed out changeset f9b204c2f5a7 (bug 1231764)
Backed out changeset f933119e57e4 (bug 1231764)
Backed out changeset e3af0b1d3473 (bug 1231764)
Backed out changeset 643b03aae1dd (bug 1231764)
Backed out changeset a945dbf63410 (bug 1231764)

--HG--
extra : rebase_source : e71360fa4b5e3e74859c82e74e183e13e6211c4c
2016-08-03 16:27:06 -07:00
Mike Hommey 47ba08e825 Bug 1290616 - Pass down LD to the NSS build system. r=gps
as opposed to passing down LINK when cross compiling.
Until bug 1290334, LINK was the variable used by the NSS build system
for the linker on Windows, but it now uses LD, like on other platforms.

But its default value on Windows is "link", which can pick /usr/bin/link
on msys2, instead of MSVC's so, pass down LD from the Gecko build
system. And do so an all platforms in all cases, because it shouldn't
hurt.

--HG--
extra : rebase_source : 3eb8236a8f032468d10c874be2daa1c66986bd47
2016-07-30 08:01:45 +09:00
Nathan Froyd 6b2618fb44 Bug 1231764 - part 6 - build rust code via cargo; r=chmanchester
This patch is really two separate changes.

The first change is that rust crates are large, standalone entities that
may contain multitudes of source files.  It therefore doesn't make sense
to keep them in SOURCES, as we have been doing.  Moving to use cargo
will require a higher-level approach, which suggests that we need a
different, higher-level representation for Rust sources in the build
system.

The representation here is to have the build system refer to things
defined in Cargo.toml files as the entities dealt with in the build
system, and let Cargo deal with the details of actually building things.
This approach means that adding a new crate to an existing library just
requires editing Rust and Cargo.toml files, rather than dealing with
moz.build, which seems more natural to Rust programmers.  By having the
source files for libraries (and binaries in subsequent iterations of
this support) checked in to the tree, we can also take advantage of
Cargo.lock files.

The second is that we switch the core build system over to building via
cargo, rather than invoking rustc directly.

We also clean up a number of leftover things from the Old Way of doing
things.  A number of tests are added to confirm that we'll only permit
crates to be built that have dependencies in-tree.
2016-08-03 19:40:41 -04:00
Nathan Froyd a79d68b929 Bug 1231764 - part 0 - only link librul once; r=chmanchester
Through an oversight, we listed librul.a twice when linking libxul: once
as part of the "objects" we were linking, and once as a static library.
This duplication is unnecessary and would cause problems later when we
try to generate librul.a via cargo, as cargo will put it someplace
different from where we expect and the two names will conflict.  Let's
have rules.mk be the single source of truth for how librul.a is named,
and then the code to link libxul can simply refer to that name.
2016-08-03 19:40:41 -04:00
Xidorn Quan 8391c4bb40 Bug 1290336 - Define U_DEBUG flag for ICU in debug build. r=glandium
MozReview-Commit-ID: AHCydclfdcW

--HG--
extra : transplant_source : %D0%F32%BE%D2%5E8L%CF%7C%87v%16%DB%0ET4%2C%ACc
2016-07-29 14:31:22 +10:00
Mike Hommey c2df8cd611 Bug 1290026 - Automatically set LIB from configure. r=chmanchester 2016-08-02 13:17:19 +09:00
Mike Hommey c6b7fab94b Bug 1290026 - Automatically set INCLUDE from configure. r=chmanchester 2016-08-02 13:17:17 +09:00
ffxbld 3df383b855 Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2016-08-01 07:09:05 -07:00
Carsten "Tomcat" Book 8321d9897b Backed out changeset a4a381f85dc8 (bug 1290026) 2016-08-01 09:12:37 +02:00
Carsten "Tomcat" Book 2b84fbf042 Backed out changeset 90559af62774 (bug 1290026) 2016-08-01 09:12:36 +02:00
Carsten "Tomcat" Book fc8e03f0d8 Merge mozilla-central to autoland 2016-07-30 16:49:41 +02:00
Eugen Sawin a90cb717a5 Bug 1272693 - [1.1] Disable building libpkix. r=keeler,ted 2016-07-29 15:25:07 +02:00