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

1694 Коммитов

Автор SHA1 Сообщение Дата
Mike Hommey b91ae3e89f Bug 1234439 - Add a jar.mn to the end-to-end test. r=gps
Also add the corner case that broke mach build faster on Windows in bug 1191230.
2015-12-24 13:12:34 +09:00
Mike Hommey 2eabcb84c2 Bug 1234439 - Use new install manifests feature for chrome manifests in the FasterMake backend. r=gps
Bug 1191230 added override lines with # characters to chrome manifests
for Windows.

So far, chrome manifests were handled with buildlist.py like in the
RecursiveMake backend, fed with Make variables. Without proper quoting,
those Make variables are just truncated by Make on the first # character,
and this results in mach build faster failing because of that.

However, the reason why chrome manifests were handled with buildlist.py
originally is that not all chrome manifest entries were known to the
FasterMake backend, but they now all are.

So instead of relying on Make variables and buildlist.py, we can now
rely on the newly added install manifests feature allowing to create files
with a given content.
2015-12-24 13:12:29 +09:00
Mike Hommey 4e978ebeda Bug 1234439 - Add support for files with a given content to install manifests. r=gps
This will be used for chrome manifests in the faster make backend.
2015-12-24 13:12:24 +09:00
Carsten "Tomcat" Book 011504aa73 Merge mozilla-central to mozilla-inbound 2015-12-23 12:47:45 +01:00
Carsten "Tomcat" Book 719ce6825c merge mozilla-inbound to mozilla-central a=merge 2015-12-23 12:00:09 +01:00
Mike Hommey dc1355e42f Bug 1233282 - Add generated FinalTargetFiles as optional_exists in install manifests. r=gps
Otherwise there's a possibility of race condition in some cases.
2015-12-23 16:18:51 +09:00
Mike Hommey 76e43de367 Bug 1233282 - Make CONFIGURE_DEFINE_FILES considered more as GENERATED_FILES in the emitter. r=gps
From the backend perspective, CONFIGURE_DEFINE_FILES is the same as
GENERATED_FILES because in both cases a GeneratedFile object is emitted, but
from the perspective of some checks in the emitter, they aren't the same,
and that causes errors when adding a CONFIGURE_DEFINE_FILES to e.g. EXPORTS.
2015-12-23 16:15:41 +09:00
Kris Maglione 8d948cbdfc Bug 1230776: Support scripts from HTML files in eslint. r=gps
Also removes related unused variables in mach_commands.py.

--HG--
extra : commitid : IiDVMuEZtA5
extra : rebase_source : 575a51dd0ad5450323b4da5f441f8e5d721e41d6
2015-12-05 13:17:49 -08:00
Chris Peterson 90c0e0da61 Bug 1232223 - Part 3: Remove MOZ_WAVE #ifdefs because Wave is always supported. r=jya 2015-12-18 00:51:16 -08:00
Chris Peterson 88051371a9 Bug 1232223 - Part 1: Remove MOZ_WEBM #ifdefs because WebM is always supported, though not necessarily enabled. r=jya r=glandium 2015-12-12 13:49:07 -05:00
Jean-Yves Avenard 42c92612f4 Bug 1234092: P3. Remove dependencies on gstreamer packages. r=glandium 2015-12-23 01:14:23 +11:00
Ms2ger fdb675bc31 No bug - Note the bug in a todo comment. 2015-12-18 11:13:00 +01:00
Mike Hommey 8ad03f4a21 Backout changesets 53a9d03e4223, e61d18180feb and f07752f611f6 (bug 1233282) for a race condition bustage on a CLOSED TREE. 2015-12-18 17:07:13 +09:00
Mike Hommey abf55a5284 Bug 1233282 - Make CONFIGURE_DEFINE_FILES considered more as GENERATED_FILES in the emitter. r=gps
From the backend perspective, CONFIGURE_DEFINE_FILES is the same as
GENERATED_FILES because in both cases a GeneratedFile object is emitted, but
from the perspective of some checks in the emitter, they aren't the same,
and that causes errors when adding a CONFIGURE_DEFINE_FILES to e.g. EXPORTS.
2015-12-18 15:57:12 +09:00
Carsten "Tomcat" Book af252b574e merge mozilla-inbound to mozilla-central a=merge 2015-12-17 11:59:41 +01:00
Gregory Szorc ee27b8ebce Bug 1225599 - Pull Mercurial repos with common 3rd party extensions disabled; r=dminor
Running old extensions with newer versions of Mercurial may crash `hg`
due to the old extension accessing something or doing something that has
been changed in the new release.

To minimize the risk of this happening, we disable common 3rd party
extensions when cloning or pulling as part of `mach mercurial-setup`. We
don't want to disable everything because some extensions (like
remotenames) provide features the user may want enabled as part of the
clone/update. This leaves the door open for more failures. Hopefully
this approach is sufficient. We can always revisit later.

--HG--
extra : rebase_source : 92e7d8fe227f29fc64c0f69021bd731ba762faf3
2015-12-15 10:47:33 -08:00
Carsten "Tomcat" Book ee3a10a104 Merge mozilla-central to mozilla-inbound 2015-12-16 12:03:47 +01:00
Carsten "Tomcat" Book a77b9d40f7 merge mozilla-inbound to mozilla-central a=merge 2015-12-16 12:01:46 +01:00
Wes Kocher dcd5150ad9 Merge m-c to inbound, a=merge
--HG--
extra : commitid : wg0tOahMU6
2015-12-15 15:52:44 -08:00
Nick Alexander 4899166b70 Bug 1227248 - Part 1: Allow extending StrictOrderingOnAppendListWithFlags. r=gps
In order to use StrictOrderingOnAppendListWithFlags instances in
mozbuild template functions, we need += to work correctly.  This patch
implements extend and the associated functions (including +=),
disallowing some behaviour where convenient.

There's a subtle point hidden in the isinstance() tests: before this
patch, it was not easy to compare two
StrictOrderingOnAppendListWithFlags instances to see if they had the
*same* set of flags.  That was because two instances may not have the
same class, and would only share the common
StrictOrderingOnAppendList, which isn't enough to infer the presence
of flags.  To be slightly more clear, concrete instances will have
class StrictOrderingOnAppendListWithFlagsSpecialization (although
there are still multiple instances of that class) and all extend from
the unique class StrictOrderingOnAppendListWithFlags.

--HG--
extra : commitid : AMVDYt8khR
extra : rebase_source : 1ce0698691fc03fbdf6a976e92017c1d60bad15d
extra : histedit_source : 4812a565179fb4fac2e4b5cd89c4efe74e794dfa
2015-12-14 11:50:06 -08:00
Nick Alexander a196b3a8a7 Bug 1230848 - Remove Gradle configuration rooted in the object directory. r=gps
DONTBUILD NPOTB

The top source directory configuration requires
mobile/android/gradle/m2repo/**, so it stays.  There's no value
changing the location; it contains an Android-specific Gradle plugin.

We note the removal of |mach gradle-install| and point to the new
documentation.

--HG--
extra : commitid : 9Nhz2dnBIgY
extra : rebase_source : 32a2b8a92d57f963feac2bae28fed5a9f1b26f93
extra : amend_source : bf53a0b2d3d4ac0618bc82fe79914bdeaf1c1e0a
2015-12-06 15:02:11 -08:00
Carsten "Tomcat" Book 5a86bca15a merge mozilla-inbound to mozilla-central a=merge 2015-12-15 12:16:29 +01:00
Brian Murray 4bbd072a06 Bug 1232486 - Implement |mach bootstrap| for Fennec on Fedora. r=nalexander
DONTBUILD NPOTB

--HG--
extra : commitid : 8vOjqwGEMbK
extra : amend_source : 4175892eff7aa506471734946c8d74a24ab8f0ab
2015-12-14 17:20:09 -08:00
Brian Murray 52931434b2 Bug 1232715 - Bootstrap ignores --no-interactive flag when using dnf groupinstall; r=gps
DONTBUILD (NPOTB)

--HG--
extra : commitid : F1laIL5bUHN
extra : amend_source : a21757bd9a69cd7ddadb16e49ab89cdd45841b03
2015-12-15 13:59:23 -08:00
Gijs Kruitbosch b63e88e1a7 Bug 1232421 - followup: fix test to not use 'inline comments' which are not supported elsewhere, rs=bustage on a CLOSED TREE
--HG--
extra : commitid : JqObbyNgDTC
extra : amend_source : 84a1aacb62cfb28c45012c64edbb38ef392ba9b7
2015-12-16 14:03:20 +00:00
Gijs Kruitbosch d83623503a Bug 1232421 - force matching the start of the line for comments, r=glandium
--HG--
extra : commitid : KomtUxWCGB6
extra : rebase_source : efa6f6f1f48b2e142536cddebabf1581b732e9b2
2015-12-14 20:33:57 +00:00
Rail Aliiev 7744523519 Bug 1232887 - "make package MOZ_PKG_PRETTYNAMES=1" is busted. r=glandium 2015-12-15 23:23:18 -05:00
Mike Hommey b13b86d3cc Bug 1231315 - Build CONFIGURE_DEFINE_FILES at build time instead of during configure. r=gps 2015-12-15 08:06:11 +09:00
Mike Hommey 347d2ccc90 Bug 1231314 - Turn mozilla-config.h and js-confdefs.h into CONFIGURE_DEFINE_FILES. r=gps
Both these files, are, after all, define files, like other CONFIGURE_DEFINE_FILES.
They only happen to have a special requirement for an expansion for all defines,
which doesn't need to happen through traditional preprocessing.

This change adds consistency in how configure-related headers are being handled.
2015-12-15 08:06:11 +09:00
Gregory Szorc aa64dfaae7 Bug 1231989 - Install watchman via Homebrew and MacPorts; r=ahal
This is needed to support hgwatchman.

--HG--
extra : commitid : 8D2A8YPNimB
extra : rebase_source : 7d5932aa049dfb352b93a87c2c8087dd7b324aab
extra : histedit_source : 9863189f265eca9e0b9363e13c59a7d55f5c633d
2015-12-11 12:40:41 -05:00
Felipe Gomes 4680ffb080 Bug 1231720 - Log when ESLint finishes running. r=nalexander
--HG--
extra : commitid : 5u08LIBan4s
2015-12-10 14:31:14 -05:00
Carsten "Tomcat" Book ffb37c03fb merge mozilla-inbound to mozilla-central a=merge 2015-12-10 12:05:03 +01:00
Mike Hommey 158e08c29b Bug 1230355 - Remove include_deps. r=mshal
We used to use include_deps to trigger a fast-path in pymake, but we don't
use pymake anymore, so we can use normal includes now.
2015-12-09 19:23:53 +09:00
Ted Mielczarek 47dba5ed8c bug 1160185 - support GENERATED_FILES in EXPORTS. r=glandium
This change allows specifying objdir-relative paths in EXPORTS to enable
exporting entries from GENERATED_FILES. Objdir paths in EXPORTS that are
not in GENERATED_FILES will raise an exception.

Example:
```
EXPORTS += ['!g.h', 'f.h']
GENERATED_FILES += ['g.h']
```

Given the implementation, this should also work for FINAL_TARGET_FILES,
FINAL_TARGET_PP_FILES, and TESTING_FILES, but those are not well-tested.

This patch also renames the install manifest for '_tests' to match the
directory name for convenience in some code I refactored.

--HG--
extra : commitid : CwayzXtxv1O
extra : rebase_source : 5fb6f461fc740da9bce14bbdbfabdfe618af8803
2015-12-01 09:53:16 -05:00
Mike Hommey e876eeef92 Bug 1230060 - Don't fail to read an install manifest containing non-actionable items. r=gps
Future improvements to process_install_manifest's --track option will require
adding data in the tracking dump that uses an install manifest form, and I don't
want e.g. switching branches or bisection to require to clobber in order to do the
right thing, so this change future-proofs the install manifest reader.
2015-12-05 11:04:21 +09:00
Mike Hommey a6e5352b39 Bug 1230060 - Add a --track option to process_install_manifest. r=gps
There are currently two operating modes for process_install_manifest:
- default, which removes any file in the destination directory that is not
  in the install manifest
- --no-remove, which doesn't do the above.

While install manifests also have the ability to deal with files that may
be left in the destination directory some other way, that requires knowing the
list of those files in advance, which is not always possible.

For instance:
- with the FasterMake build backend, install manifests are split such that
  there is one manifest per application of addon directory (to allow more
  parallelism), which means there is one for dist/bin and one for several
  of its sub-directories.
- With --disable-compile-environment combined with artefacts, the backends
  are not aware of e.g. all the libraries and executables that end up in
  dist/bin.

If we want to properly remove files when they are removed from moz.build
or jar.mn, we can't use --no-remove, but the alternative would remove those
files

So add an option that keeps a list of all the files that were installed as
part of processing the given install manifest(s). That information is simply
a dump of the install manifest, which, while it contains more information
than currently required, will allow to do smarter things in the future.
2015-12-05 11:04:21 +09:00
Mike Hommey dab94e1f70 Bug 1230060 - Allow to restrict what unaccounted files to remove when copying from a FileCopier. r=gps
The default behavior for a FileCopier's copy is to remove all the files and
directories in the destination that aren't in its registry.

The remove_unaccounted argument can be passed as False to disable this
behavior.

This change adds another possibility, where remove_unaccounted may be a
FileRegistry, in which case only the files in that registry are removed.

This allows to e.g. only remove files that were copied from a previous
FileCopier.copy, leaving aside files that were in the destination for some
other reason.
2015-12-05 11:04:21 +09:00
Carsten "Tomcat" Book 71e373189a Backed out changeset 9d1f7f04a682 (bug 1230060) to complete backout 2015-12-04 15:22:52 +01:00
Carsten "Tomcat" Book 70e80c658e Backed out changeset 0dcea48cbf38 (bug 1230060) for bustage due to race conditions of some sort 2015-12-04 15:18:07 +01:00
Carsten "Tomcat" Book 3e46254e72 Backed out changeset 1e44f391a3cb (bug 1230060) 2015-12-04 15:17:38 +01:00
Mike Hommey 27d503c493 Bug 1230067 - Normalize install target when processing JarManifestParser data in FasterMake backend. r=gps
The loop addon jar.mn data uses '.' as base, and join(path, '.') returns
'{path}/.'. So normalize that so that it becomes '{path}'.
2015-12-04 19:25:42 +09:00
Mike Hommey 3d1b660fdf Bug 1230060 - Don't fail to read an install manifest containing non-actionable items. r=gps
Future improvements to process_install_manifest's --track option will require
adding data in the tracking dump that uses an install manifest form, and I don't
want e.g. switching branches or bisection to require to clobber in order to do the
right thing, so this change future-proofs the install manifest reader.
2015-12-04 19:25:42 +09:00
Mike Hommey 831f8542c7 Bug 1230060 - Add a --track option to process_install_manifest. r=gps
There are currently two operating modes for process_install_manifest:
- default, which removes any file in the destination directory that is not
  in the install manifest
- --no-remove, which doesn't do the above.

While install manifests also have the ability to deal with files that may
be left in the destination directory some other way, that requires knowing the
list of those files in advance, which is not always possible.

For instance:
- with the FasterMake build backend, install manifests are split such that
  there is one manifest per application of addon directory (to allow more
  parallelism), which means there is one for dist/bin and one for several
  of its sub-directories.
- With --disable-compile-environment combined with artefacts, the backends
  are not aware of e.g. all the libraries and executables that end up in
  dist/bin.

If we want to properly remove files when they are removed from moz.build
or jar.mn, we can't use --no-remove, but the alternative would remove those
files

So add an option that keeps a list of all the files that were installed as
part of processing the given install manifest(s). That information is simply
a dump of the install manifest, which, while it contains more information
than currently required, will allow to do smarter things in the future.
2015-12-04 19:25:42 +09:00
Mike Hommey 0a5ad30ee1 Bug 1230060 - Allow to restrict what unaccounted files to remove when copying from a FileCopier. r=gps
The default behavior for a FileCopier's copy is to remove all the files and
directories in the destination that aren't in its registry.

The remove_unaccounted argument can be passed as False to disable this
behavior.

This change adds another possibility, where remove_unaccounted may be a
FileRegistry, in which case only the files in that registry are removed.

This allows to e.g. only remove files that were copied from a previous
FileCopier.copy, leaving aside files that were in the destination for some
other reason.
2015-12-04 19:25:42 +09:00
Maja Frydrychowicz 65297a6d50 Bug 1229467 - Include wptserve in common.tests.zip; r=gps
--HG--
extra : commitid : BqsAW4Qumv3
extra : rebase_source : eba9a1c941c8d3f48e6a02e07689ced16dd32cfe
extra : histedit_source : 3e3726d534589579f896f0b339e800d3513f0b34
2015-12-01 15:45:41 -05:00
Axel Hecht e3a88f714b Bug 1229330 - fix import, r=glandium
Follow-up fix to bug 1147283

--HG--
extra : transplant_source : %8F%05c%031%90%16%27%A5%A2%8F%D7%CE%9CP%3B%8E%C8%B2%FD
2015-12-01 11:55:59 +01:00
Mike Hommey 6e7dc8af8c Bug 1229341 - Remove HierarchicalStringListWithFlagsFactory. r=gps
It is not used anymore.
2015-12-03 13:34:02 +09:00
Mike Hommey 3df4b2841e Bug 1229341 - Remove .source flag on BRANDING_FILES. r=gps
The only use of BRANDING_FILES[...].source is in xulrunner/app/moz.build, for
the app.ico file.

This file has not been useful since the removal of the xpinstall-based
installer in bug 344236... 9 years ago.
2015-12-03 13:34:02 +09:00
Mike Hommey 524f4438ab Bug 1229279 - Use mozbuild.context.Path for FINAL_TARGET{_PP}_FILES. r=gps 2015-12-03 13:34:02 +09:00
Mike Hommey d385de836e Bug 1229279 - Add a specialized HierarchicalStringList class for ContextDerivedValue types. r=gps 2015-12-03 13:34:02 +09:00