Commit Graph

1745 Commits

Author SHA1 Message Date
Ryan VanderMeulen
b108b057b0 Merge inbound to m-c. a=merge 2016-01-01 19:29:16 -05:00
Richard Newman
601d9a9241 Bug 1062537 - Pre: correct comments in android_version_code.py. 2015-12-31 19:32:41 -08:00
Richard Newman
573d6f9524 Bug 1155801 - Part 4: miscellaneous SDK_INT bumps. 2015-12-30 18:59:17 -08:00
Richard Newman
b091f9ce84 Bug 1155801 - Part 2: bump Android version code computation check. r=nalexander 2015-12-30 18:59:17 -08:00
Nick Alexander
373d1fc12c Bug 1207890 - Follow-up: Fix |mach artifact install| for mobile/android. r=me
DONTBUILD NPOTB
2015-12-31 15:38:13 -08:00
Nigel Babu
37b1bc435c Backed out changeset 991a5607ee54 (bug 1155801) 2015-12-31 13:57:30 +05:30
Nigel Babu
b7151d7008 Backed out changeset 06a75f114c31 (bug 1155801) 2015-12-31 13:57:25 +05:30
Nick Alexander
fadad1ed3b Bug 1216817 - Follow-up: Fix "KeyError: uMOZ_ARTIFACT_BUILDS" in config.status. r=bustage 2015-12-30 21:18:14 -08:00
Nick Alexander
78c56e099d Bug 1216817 - Follow-up: Fix "KeyError: u'MOZ_ARTIFACT_BUILDS'". r=bustage 2015-12-30 21:07:20 -08:00
Nick Alexander
f21b5fc611 Bug 1207890 - Post: Hack to make |mach run| for Mac OS X artifact builds. r=me 2015-12-30 20:16:23 -08:00
Nick Alexander
2198b681e7 Bug 1207890 - Post: Move |mach artifact| command out of mobile/android. r=glandium 2015-12-23 17:08:49 -08:00
Nick Alexander
dd2985d167 Bug 1207890 - Part 4: Download and process Mac OS X artifacts. r=glandium
This mounts the downloaded DMG and copies a subset of the libraries
into the correct places in the processed archive.  They'll be
installed, with paths, into dist/bin from there.
2015-12-23 16:41:17 -08:00
Nick Alexander
a9c24b325a Bug 1207890 - Part 3: Post-process downloaded artifacts. r=glandium
For Android, this just copies .so files from the APK assets/ and libs/
directories into the root, which ends up in dist/bin.

I include .ini files as a partial replacement for having the build ID
in the downloaded file name, and then don't put the .ini files in
dist/bin.
2015-11-24 20:42:35 -08:00
Nick Alexander
0e47eac50e Bug 1207890 - Part 2: Stop extracting build ID from artifacts. r=glandium
Sadly, it's slow to extract the build ID from Mac OS X DMG artifacts.
It's better to sacrifice human-legible names in order to know the
final name for an artifact quickly.
2015-11-24 16:30:38 -08:00
Nick Alexander
7dcd272246 Bug 1207890 - Part 1: Add rich ArtifactJob extension point. r=glandium 2015-11-24 15:48:57 -08:00
Nick Alexander
60d6c83e06 Bug 1207890 - Pre: Make JarWriter handle inputs with read() but not seek(). r=glandium 2015-12-23 16:05:34 -08:00
Nick Alexander
fe2907f66f Bug 1216817 - Part 5: Run |mach artifact install| automatically when asked. r=glandium
It turns out to be much easier to hook |mach artifact install| into
config.status and |mach build| than to hook into client.mk.

The additional virtualenv package avoids an import error when running
|mach artifact install|.
2015-12-23 14:25:37 -08:00
Nick Alexander
96b1f51bde Bug 1216817 - Part 2: Narrow distdir to bindir in artifacts. r=gps 2015-10-30 12:30:35 -07:00
Nick Alexander
30810bcd0b Bug 1216817 - Part 1: Add install_callback to artifacts. r=gps 2015-10-30 13:35:13 -07:00
Richard Newman
9f1acc1b07 Bug 1155801 - Part 4: miscellaneous SDK_INT bumps. 2015-12-30 18:59:17 -08:00
Richard Newman
0b3560dbd6 Bug 1155801 - Part 2: bump Android version code computation check. r=nalexander 2015-12-30 18:59:17 -08:00
Shane Caraveo
b536ed1656 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
2015-12-29 15:40:52 -08:00
Andreas Tolfsen
3ee11bc76b Bug 1234612: Print path when failing to create virtualenv r=gps
r=gps
2015-12-30 11:33:36 +00:00
Gregory Szorc
4329c55426 Bug 1234954 - Use LooseVersion for parsing Mercurial version; r=me
StrictVersion is strict about version strings, insisting on whatever
convention Python uses. LooseVersion is not as strict but is strict
enough for our use cases.

DONTBUILD (NPOTB)
2015-12-31 16:14:20 -08:00
Gregory Szorc
34230b64ea Bug 1235921 - Update modern Mercurial version to 3.5.2; r=me
3.5.2 is what is listed in `mach mercurial-setup`. These should match.
Add a comment to each file saying to change both.
2015-12-31 16:01:48 -08:00
Mike Hommey
c33292892a Bug 1235738 - Fixup: it turns out we weren't passing debug flags in HOST_C{,XX}FLAGS before. r=me 2015-12-31 09:19:12 +09:00
Mike Hommey
ea69649651 Bug 1235733 - Use absolute paths for include paths. r=gps
Limit ourselves to include paths for now, because there are tricky things
involved in making this globally.

While here, use shell_quote instead of manual quoting for those paths.
2015-12-31 08:10:02 +09:00
Mike Hommey
e3ecff2131 Bug 1235676 - Add a topobjdir variable to all Makefiles. r=mshal 2015-12-31 08:10:02 +09:00
Mike Hommey
16f8f011bd Bug 1235748 - Stop post-processing include flags for CompileDB and codecomplete. r=gps
With all include flags now using absolute paths, there is no need to try
to post-process them when getting them for CompileDB and codecomplete.
As a matter of fact, doing so fixes the flags in media/gmp-clearkey/0.1,
since they use literal "-include stdio.h", which was wrongly transformed
into "-include $objdir/media/gmp-clearkey/0.1/stdio.h".
2015-12-31 07:37:01 +09:00
Mike Hommey
80534e1b44 Bug 1235739 - Move DEFINES quoting from frontend to backend. r=gps 2015-12-31 07:34:51 +09:00
Mike Hommey
f6876363ac Bug 1235738 - Simplify MOZ_DEBUG_DEFINES. r=gps
Now that it's not directly used in command lines, it can just become a list
of symbols that ought to be defined. This simplifies all the uses of it.
2015-12-31 07:28:05 +09:00
Mike Hommey
d95483e5fc Bug 1235738 - Move MOZ_DEBUG_DEFINES to build frontend. r=gps
MOZ_DEBUG_DEFINES are essentially defines used everywhere. So treat them as
feeding the initial value for DEFINES in each moz.build sandbox. This allows
the kind overrides that was done in the past by resetting MOZ_DEBUG_DEFINES
in Makefiles.
2015-12-31 07:27:23 +09:00
Mike Hommey
db3281e18f Bug 1235132 - Remove convert_def_file.py. r=gps 2015-12-31 07:22:18 +09:00
Mike Hommey
340fbdc9d2 Bug 1235132 - Add support for a more-or-less cross-platform symbols file. r=gps
Currently, one needs to define DEFFILE or LD_VERSION_SCRIPT appropriately,
and somehow deal with the fact that their input format is different, which
currently relies on manual invocations of the convert_def_file script, with
awkward aggregations.

This simplifies the problem by using a simple list of symbols, with
preprocessing, allowing #includes.
2015-12-31 07:22:04 +09:00
Mike Hommey
121581de01 Bug 1235117 - Add input file to the depfile emitted by process_define_files. r=mshal 2015-12-31 07:16:56 +09:00
Mike Hommey
47c1ceb2af 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
b11e10eeaf 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
4f64443860 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
2bbd78f429 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
89f6e82b87 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
a6c666b691 Bug 1235021 - Associate a Defines instance to each ContextDerived instance. r=gps 2015-12-31 07:06:11 +09:00
Mike Hommey
fdf59e41d7 Bug 1235021 - Rename Linkable.defines to linkable.lib_defines. r=gps 2015-12-31 07:06:11 +09:00
Mike Hommey
4f8d692711 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
9425956c3f 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
303fa045bb 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
4bbb85c4a3 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
a990e8632d Bug 1235021 - Use SourcePaths for JAR_MANIFESTS. r=gps 2015-12-31 07:06:11 +09:00
Mike Hommey
212c8e90da Bug 1235021 - Add a relative jar.mn in the end-to-end test. r=gps 2015-12-31 07:06:11 +09:00
Mike Hommey
f75ab3e6fc 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
f8abc7adc8 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