Commit Graph

1711 Commits

Author SHA1 Message Date
Mike Hommey
10b873ff27 Bug 1235021 - Move FasterMakeBackend._consume_jar_manifest to CommonBackend. r=gps
And do some import cleanup at the same time.
2015-12-31 07:06:11 +09:00
Mike Hommey
f834ce6af8 Bug 1235021 - Avoid passing defines to FasterMakeBackend._consume_jar_manifest. r=gps
We want to move it to CommonBackend, so it's better to make it more
independent, which the Defines instances now attached to ContextDerived
instances allow.
2015-12-31 07:06:11 +09:00
Mike Hommey
eb9103453a Bug 1235021 - Re-emit FinalTarget{,Preprocessed}Files from the jar manifest handler code in the FasterMake backend. r=gps
Like with ChromeManifestEntries, reloop in consume_object, with the double
goal of allowing to reuse the jar manifest handler code in other backends
and avoid code duplication in the FasterMake backend itself when support
for e.g. GeneratedFiles is added.
2015-12-31 07:06:11 +09:00
Mike Hommey
9e270a330d Bug 1235021 - Re-emit ChromeManifestEntries from the jar manifest handler code in the FasterMake backend. r=gps
Instead of filling the install manifests accordingly, reloop in
consume_object, so that the jar manifest handler code can eventually
be reused in other backends.
2015-12-31 07:06:11 +09:00
Mike Hommey
b2f22a11cd Bug 1235021 - Add a RenamedSourcePath helper class. r=gps
This class will be used to represent files that are copied with a different
name, which we have plenty of in jar manifests.
2015-12-31 07:06:11 +09:00
Mike Hommey
2b5200312f Bug 1235021 - Associate a Defines instance to each ContextDerived instance. r=gps 2015-12-31 07:06:11 +09:00
Mike Hommey
2a5918fdb4 Bug 1235021 - Rename Linkable.defines to linkable.lib_defines. r=gps 2015-12-31 07:06:11 +09:00
Mike Hommey
0aa84aff6a Bug 1235021 - Use Path instances to handle paths in jar manifest in the FasterMake backend. r=gps
This is a transitional step to make further changes smaller and easier to
review.
2015-12-31 07:06:11 +09:00
Mike Hommey
d5126527fe Bug 1235021 - Always use the % marker for preprocessed css files. r=gps
Currently, only css files added through jar manifests are treated this way.
There is really no reason for the discrepancy, but there are actually no css
files added directly through moz.build, so this was never a problem.

On the other hand, it makes things simpler in a world where jar manifests are
treated as if they were entirely described in moz.build (which is where the
FasterMake backend is heading).
2015-12-31 07:06:11 +09:00
Mike Hommey
37df7ea303 Bug 1235021 - Normalize whitespaces in manifest entries emitted by the jar manifest parser. r=gps
Again, this is not strictly necessary but allows to confirm idempotence of
further changes. And it has the nice side effect of making chrome manifest
files more consistent.
2015-12-31 07:06:11 +09:00
Mike Hommey
76bb6c3b3a Bug 1235021 - Normalize paths from jar manifests before putting them in an install manifest in the FasterMake backend. r=gps
This is not necessary in itself, but allows to confirm that further changes,
which are going to normalize paths as a side effect, are idempotent.
2015-12-31 07:06:11 +09:00
Mike Hommey
6dcd4bc2cf Bug 1235021 - Use SourcePaths for JAR_MANIFESTS. r=gps 2015-12-31 07:06:11 +09:00
Mike Hommey
0619b043f0 Bug 1235021 - Add a relative jar.mn in the end-to-end test. r=gps 2015-12-31 07:06:11 +09:00
Shane Caraveo
eabb5f6400 Bug 1215694 move pocket to a system addon, r=Gijs, r=glandium
part 1: reorganize file locations, r=Gijs
  part 2: remove built-in pocket code, r=Gijs
  part 3: l10n support, r=glandium
  part 4: move code/functionality from part 2 into the addon, r=Gijs
  part 5: remove dead code, r=Gijs
  part 6: create a simple api for addons to add to reader mode, r=Gijs
  part 7: various test fixes related to cui behaviour and pocket, r=me

--HG--
rename : browser/components/pocket/Pocket.jsm => browser/extensions/pocket/content/Pocket.jsm
rename : browser/components/pocket/main.js => browser/extensions/pocket/content/main.js
rename : browser/components/pocket/panels/css/firasans.css => browser/extensions/pocket/content/panels/css/firasans.css
rename : browser/components/pocket/panels/css/normalize.css => browser/extensions/pocket/content/panels/css/normalize.css
rename : browser/components/pocket/panels/css/saved.css => browser/extensions/pocket/content/panels/css/saved.css
rename : browser/components/pocket/panels/css/signup.css => browser/extensions/pocket/content/panels/css/signup.css
rename : browser/components/pocket/panels/fonts/FiraSans-Regular.woff => browser/extensions/pocket/content/panels/fonts/FiraSans-Regular.woff
rename : toolkit/themes/shared/reader/pocket.svg => browser/extensions/pocket/content/panels/img/pocket.svg
rename : browser/components/pocket/panels/img/pocketerror@1x.png => browser/extensions/pocket/content/panels/img/pocketerror@1x.png
rename : browser/components/pocket/panels/img/pocketerror@2x.png => browser/extensions/pocket/content/panels/img/pocketerror@2x.png
rename : browser/components/pocket/panels/img/pocketlogo@1x.png => browser/extensions/pocket/content/panels/img/pocketlogo@1x.png
rename : browser/components/pocket/panels/img/pocketlogo@2x.png => browser/extensions/pocket/content/panels/img/pocketlogo@2x.png
rename : browser/components/pocket/panels/img/pocketlogosolo@1x.png => browser/extensions/pocket/content/panels/img/pocketlogosolo@1x.png
rename : browser/components/pocket/panels/img/pocketlogosolo@2x.png => browser/extensions/pocket/content/panels/img/pocketlogosolo@2x.png
rename : browser/components/pocket/panels/img/pocketmenuitem16.png => browser/extensions/pocket/content/panels/img/pocketmenuitem16.png
rename : browser/components/pocket/panels/img/pocketmenuitem16@2x.png => browser/extensions/pocket/content/panels/img/pocketmenuitem16@2x.png
rename : browser/components/pocket/panels/img/pocketsignup_button@1x.png => browser/extensions/pocket/content/panels/img/pocketsignup_button@1x.png
rename : browser/components/pocket/panels/img/pocketsignup_button@2x.png => browser/extensions/pocket/content/panels/img/pocketsignup_button@2x.png
rename : browser/components/pocket/panels/img/pocketsignup_devices@1x.png => browser/extensions/pocket/content/panels/img/pocketsignup_devices@1x.png
rename : browser/components/pocket/panels/img/pocketsignup_devices@2x.png => browser/extensions/pocket/content/panels/img/pocketsignup_devices@2x.png
rename : browser/components/pocket/panels/img/pocketsignup_hero@1x.png => browser/extensions/pocket/content/panels/img/pocketsignup_hero@1x.png
rename : browser/components/pocket/panels/img/pocketsignup_hero@2x.png => browser/extensions/pocket/content/panels/img/pocketsignup_hero@2x.png
rename : browser/components/pocket/panels/img/signup_firefoxlogo@1x.png => browser/extensions/pocket/content/panels/img/signup_firefoxlogo@1x.png
rename : browser/components/pocket/panels/img/signup_firefoxlogo@2x.png => browser/extensions/pocket/content/panels/img/signup_firefoxlogo@2x.png
rename : browser/components/pocket/panels/img/signup_help@1x.png => browser/extensions/pocket/content/panels/img/signup_help@1x.png
rename : browser/components/pocket/panels/img/signup_help@2x.png => browser/extensions/pocket/content/panels/img/signup_help@2x.png
rename : browser/components/pocket/panels/img/signup_or@1x.png => browser/extensions/pocket/content/panels/img/signup_or@1x.png
rename : browser/components/pocket/panels/img/signup_or@2x.png => browser/extensions/pocket/content/panels/img/signup_or@2x.png
rename : browser/components/pocket/panels/img/tag_close@1x.png => browser/extensions/pocket/content/panels/img/tag_close@1x.png
rename : browser/components/pocket/panels/img/tag_close@2x.png => browser/extensions/pocket/content/panels/img/tag_close@2x.png
rename : browser/components/pocket/panels/img/tag_closeactive@1x.png => browser/extensions/pocket/content/panels/img/tag_closeactive@1x.png
rename : browser/components/pocket/panels/img/tag_closeactive@2x.png => browser/extensions/pocket/content/panels/img/tag_closeactive@2x.png
rename : browser/components/pocket/panels/js/messages.js => browser/extensions/pocket/content/panels/js/messages.js
rename : browser/components/pocket/panels/js/saved.js => browser/extensions/pocket/content/panels/js/saved.js
rename : browser/components/pocket/panels/js/signup.js => browser/extensions/pocket/content/panels/js/signup.js
rename : browser/components/pocket/panels/js/tmpl.js => browser/extensions/pocket/content/panels/js/tmpl.js
rename : browser/components/pocket/panels/js/vendor/handlebars.runtime.js => browser/extensions/pocket/content/panels/js/vendor/handlebars.runtime.js
rename : browser/components/pocket/panels/js/vendor/jquery-2.1.1.min.js => browser/extensions/pocket/content/panels/js/vendor/jquery-2.1.1.min.js
rename : browser/components/pocket/panels/js/vendor/jquery.tokeninput.min.js => browser/extensions/pocket/content/panels/js/vendor/jquery.tokeninput.min.js
rename : browser/components/pocket/panels/license.txt => browser/extensions/pocket/content/panels/license.txt
rename : browser/components/pocket/panels/saved.html => browser/extensions/pocket/content/panels/saved.html
rename : browser/components/pocket/panels/signup.html => browser/extensions/pocket/content/panels/signup.html
rename : browser/components/pocket/panels/tmpl/saved_premiumextras.handlebars => browser/extensions/pocket/content/panels/tmpl/saved_premiumextras.handlebars
rename : browser/components/pocket/panels/tmpl/saved_premiumshell.handlebars => browser/extensions/pocket/content/panels/tmpl/saved_premiumshell.handlebars
rename : browser/components/pocket/panels/tmpl/saved_shell.handlebars => browser/extensions/pocket/content/panels/tmpl/saved_shell.handlebars
rename : browser/components/pocket/panels/tmpl/signup_shell.handlebars => browser/extensions/pocket/content/panels/tmpl/signup_shell.handlebars
rename : browser/components/pocket/panels/tmpl/signupstoryboard_shell.handlebars => browser/extensions/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars
rename : browser/components/pocket/pktApi.js => browser/extensions/pocket/content/pktApi.jsm
rename : browser/locales/en-US/chrome/browser/browser-pocket.properties => browser/extensions/pocket/locales/en-US/pocket.properties
2015-12-29 15:40:52 -08:00
Mike Hommey
d7478b6b1e Bug 1234955 - Make TEST_DIRS a SPECIAL_VARIABLE. r=gps
Using TEST_DIRS is nothing more than a shortcut for

if CONFIG['ENABLE_TESTS']:
    DIRS += [...]

As such, we might as well remove it being a separate variable, and use some
Context magic to just fill DIRS when ENABLE_TESTS is set.

The security/manager/ssl/tests/unit/moz.build change ensures that the order
of DIRS before the change is kept, not because it matters, but because it
allows to confirm that nothing else is modified by this change.
2015-12-24 13:12:49 +09:00
Mike Hommey
fbf6637c30 Bug 1234780 - Use Paths for BRANDING_FILES. r=gps
Also, handle them like other FinalTargetFiles.

After this, TEST_HARNESS_FILES is the last use of plain HierarchicalStringList.
2015-12-24 13:12:44 +09:00
Mike Hommey
e8fa609d2a Bug 1234780 - Avoid a loop in RecursiveMakeBackend._process_final_target_files. r=gps 2015-12-24 13:12:40 +09:00
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