Commit Graph

4011 Commits

Author SHA1 Message Date
Mozilla Release Engineering
5429cb98c6 Merging in version bump NO BUG CLOSED TREE DONTBUILD 2014-03-17 13:48:08 -07:00
Wes Kocher
ed2f101c5e Merge m-c to fx-team 2014-03-12 21:23:37 -07:00
Nick Alexander
73597cec4f Bug 979388 - Make aapt invocation rebuild R.java. r=glandium
This commit adds an empty recipe to dependencies of .aapt.deps, which
forces the appropriate gecko-R.jar rebuild.  This is because Make treats
targets with no recipe at all differently than targets with an empty
recipe, in a way that defeats our dependencies.

What appeared to be happening is the following:

Touch a resource.  On the next build, .aapt.deps is stale, so aapt is
invoked, which generates R.java, and we touch .aapt.deps.

Now R.java depends on .aapt.deps, but this does not appear to force Make
to consider targets that depend on R.java to be stale.  A target that
depends on R.java (such as gecko-R.jar) itself compares timestamps and
finds that gecko-R.jar is newer than R.java (from the previous build),
and this comparison appears to happen before aapt is invoked.  So even
though .aapt.deps is seen to be stale, and by transitivity R.java is
stale, this does not mark gecko-R.jar as stale.  The timestamp check
between R.java and gecko-R.jar appears to happen *before* aapt is
invoked.

On the second build following the update, the R.java generated in the
previous build is newer than gecko-R.jar, triggering the observed
rebuild of gecko-R.jar.
2014-03-12 17:22:27 -07:00
Ted Mielczarek
34da80ea4f Bug 980015 - Remove MOCHITEST_FILES et. al. r=gps 2014-03-05 15:51:39 -05:00
Ryan VanderMeulen
70fda5091d Backed out changeset 88780b5a201e (bug 980015) for test_property_database.html failures.
CLOSED TREE
2014-03-10 15:31:23 -04:00
Ted Mielczarek
16414a3269 Bug 980015 - Remove MOCHITEST_FILES et. al. r=gps
--HG--
extra : rebase_source : 3825abc63eb0901bc1422aa00aed3680dbe3e44c
2014-03-05 15:51:39 -05:00
Ryan VanderMeulen
7b0d7d89be Merge fx-team to m-c. 2014-03-05 15:49:40 -05:00
Robert Strong
40e187af87 Bug 900251 - Add support for add-if-not instruction added by bug 759469 to the mar generation scripts. r=nthomas 2014-03-05 11:42:56 -08:00
Nick Alexander
014159ff40 Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey 2014-03-05 08:57:09 -08:00
Ehsan Akhgari
17f4a32d8b Bug 976896 - Port STL_FLAGS to moz.build; r=mshal 2014-03-04 19:39:06 -05:00
Ehsan Akhgari
a8d5c6ba79 Bug 978594 - Part 2: Add support for expressing per-source build flags to moz.build; r=glandium
--HG--
extra : rebase_source : 254d8acf1a6a53845a2e2d6d895217515ea7b836
2014-03-04 11:30:01 -05:00
Mike Hommey
9d3f4024b9 Bug 977951 - Don't force build a static libxul. r=gps 2014-03-04 16:09:08 +09:00
Ehsan Akhgari
f9ae64d95a Fix a typo, no bug, DONTBUILD 2014-03-02 16:35:24 -05:00
Ms2ger
0604b7f97a Bug 973649 - Add logic for CFLAGS, CXXFLAGS and LDFLAGS to moz.build; r=gps
--HG--
extra : amend_source : d44541fd844c1b3f5fb4077add7aa0589ae61942
2014-02-26 12:49:00 -08:00
Mike Hommey
c4df4bacb1 Bug 976853 - Exclude dependency file from dependency output for expandlibs_exec.py; r=gps
--HG--
extra : amend_source : d7f26ca852a9013d031fe752cd3ae5d8d6ad1414
2014-02-26 13:55:36 +09:00
Jan Beich
07cc7be8ee Bug 962345 - Unhide cairo_qt_surface_*() when building with --enable-system-cairo. r=glandium 2014-02-25 15:55:26 -05:00
Ryan VanderMeulen
0dc3c5e22c Merge m-c to inbound. 2014-02-25 15:28:35 -05:00
Nick Alexander
c77f1718b5 Bug 903528 - Follow-up: Fix build dependencies. a=bustage
The issue is that the preprocessed files need to be referenced as
$(CURDIR)/file to have Make handle the dependencies correctly.  To
allow this, this patch adds ANDROID_MANIFEST_FILE (defaulting to
AndroidManifest.xml) and uses it in the appropriate places.
2014-02-24 23:18:47 -08:00
Nick Alexander
b75843c7b2 Bug 903528 - Pre: Make classes.dex depend on ANDROID_EXTRA_JARS. r=glandium 2014-02-24 18:24:45 -08:00
Ralph Giles
24597e8179 Bug 964559 - Remove MOZ_OGG. r=doublec,ted
We are unable to maintain all the --disable-foo build-time options
for the media code. Just support ogg unconditionally.
2014-02-20 18:01:00 -08:00
Ehsan Akhgari
b22894a86b Bug 974216 - Set LIBXUL_LIBRARY for LIBRARY_NAME==xul; r=glandium 2014-02-18 22:20:51 -05:00
Ehsan Akhgari
73b8879e45 Bug 973142 - Get rid of the MOZILLA_INTERNAL_API makefile variable; r=glandium
It's just as easy to directly set the preprocessor macro in the moz.build
files.  Using this variable doesn't really buy us anything.

This patch also removes unused code from rdf/tests/dsds.
2014-02-18 01:56:51 -05:00
Nick Alexander
a84954b70a Bug 946083 - Part 1: Delete .class files when (re-)building a Java JAR. r=glandium
This cleans up stale .class files, so they don't get packaged into the
.jar files that Proguard consumes.

--HG--
extra : rebase_source : a090d707579711f85b8f9f174b88bf9302be0b24
2014-02-11 09:55:47 -08:00
Brian O'Keefe
75d0f2aeaf Bug 772828 - Part a: add support for RESOURCE_FILES in moz.build; r=mshal 2013-11-05 13:37:49 -05:00
Ryan VanderMeulen
285a3a25dd Backed out changesets 6948901b128f and d9a099b06911 (bug 946083) and changeset 1e038f308b8d (bug 961339) for intermittent Android build failures. 2014-02-11 09:35:12 -05:00
Nick Alexander
3453483072 Bug 946083 - Part 1: Delete .class files when (re-)building a Java JAR. r=glandium
This cleans up stale .class files, so they don't get packaged into the
.jar files that Proguard consumes.
2014-02-10 21:43:00 -08:00
Nick Alexander
4bdd98ac0e Bug 961339 - Fix generated/ source dependencies. r=glandium
Generated sources are listed like 'generated/FILE.java'.  Generated
sources are produced by PP_TARGETS, which generates the file
'$(CURDIR)/generated/FILE.java'.  Because Make interprets $(CURDIR)/foo
and foo differently, this means we need to depend on $(CURDIR)/* for all
generated sources.  Since R.java is both listed as a generated source,
but produced by aapt, we need any dependencies to be on
$(CURDIR)/.../R.java.

The change to java-build.mk includes $(CURDIR) in the dependencies for
generated sources.  The changes to Makefile.in includes $(CURDIR) in the
produced R.java files for Make.
2014-02-10 21:43:00 -08:00
Mike Hommey
9dfe3dbc7b Bug 969164 - Replace most BUILDING_JS uses with JS_STANDALONE. r=gps
Before making top-level traverse js/src moz.build files, there was a need to
distinguish between top-level traversing e.g. top-level moz.build or
config/moz.build and js/src traversing them. With a single traversal of both
moz.build sets, we now only need to distinguish between js standalone builds
and gecko builds.

There is still, however, a need to distinguish between top-level vs. js/src
configure runs on gecko builds to make them subconfigure icu and libffi from
top-level instead of js/src in js standalone builds, or when choosing to make
js/src's config.status do something when run or not.
2014-02-11 10:37:47 +09:00
Mike Hommey
69e70086e0 Bug 969164 - Traverse js/src moz.builds from top-level configure. r=gps
Before, we would run configure in both top-level and js/src, and both
configures would traverse their own set of moz.builds, without actual
knowledge about the other. With this change, both configures still run,
but only top-level traverses moz.build files, and uses js/src's
config.status when traversing its moz.build files. This allows a better
sharing of information between both build systems and the removal of many
hacks.

This also moves running libffi and icu configure to top-level.

Standalone js builds still have their own configure doing moz.build traversal,
as before.

--HG--
rename : config/autoconf.mk.in => config/autoconf-js.mk.in
rename : config/emptyvars.mk.in => config/emptyvars-js.mk.in
2014-02-11 10:37:47 +09:00
EKR
e029aab31b Bug 970476 - Re-add CPP unit test target. r=ted 2014-02-10 11:42:19 -08:00
Ehsan Akhgari
d91d200572 Bug 969757 - Remove the dead code in our tree which pretends to support OS/2; r=roc,mcmanus,gps,jorendorf,bsmedberg sr=bsmedberg 2014-02-10 17:57:01 -05:00
Ehsan Akhgari
39001bcb42 Bug 944800 - Move the information about delay loaded DLLs into moz.build; r=gps 2014-02-06 14:17:44 -05:00
Mike Hommey
d3b848da56 Bug 959519 - Keep timestamps when copying files with nsinstall.py while nsinstall is not ready to be used yet. r=gps 2014-02-05 13:02:20 +09:00
Ehsan Akhgari
bdd531f68f Backed out changeset b54e8c328c32 (bug 944800) because of test failures on a CLOSED TREE 2014-02-04 17:03:17 -05:00
Ehsan Akhgari
6494b169e9 Bug 944800 - Move the information about delay loaded DLLs into moz.build; r=gps
--HG--
extra : rebase_source : 3eca29dae04c42fa8e7d113318b8a169a0cf22e4
2014-02-04 13:57:34 -05:00
Lukas Blakk
985eeb693c Merging in version bump NO BUG CLOSED TREE 2014-02-03 15:03:10 -08:00
Randy Lin
8179f228c6 Bug 891705 - [MediaEncoder] Implement WebM 1.0 container writer. r=giles, r=gps, r=rillian
This is an integrated patch which includes:
1. Bug 891705: [MediaEncoder] Implement WebM 1.0 container writer. r=giles, r=gps
2. Bug 950567: [MediaEncoder] Phase-in libmkv library. r=giles
3. bug 883749: Implement Vorbis encoding. r=rillian
4. bug 881840: Implement VP8 track encoder. r=rillian
2014-01-15 14:21:14 +08:00
Jeff Walden
c47e36f0b2 Bug 963434 - Remove jsopcode.tbl and jsoplengen.cpp in favor of a higher-order macro, and make JSOP_*_LENGTH into C++ constant variables. This will make the build process simpler, and it likely eliminates a needs-CLOBBER situation encountered while landing bug 948583. Particular thanks to r=jorendorff for the fast review here (given any change at all to jsopcode.tbl would bitrot this), DONTBUILD because already landed with wrong bug number 2014-01-24 13:21:09 -08:00
Jeff Walden
afae127ae3 Backed out changeset fe06fb5e10a7, wrong bug number.
--HG--
extra : rebase_source : fad89601b11e3a6cf19114b2152fa3c62d05cce4
2014-01-24 15:00:52 -08:00
Jeff Walden
f23f7d4ebe Bug 963634 - Remove jsopcode.tbl and jsoplengen.cpp in favor of a higher-order macro, and make JSOP_*_LENGTH into C++ constant variables. This will make the build process simpler, and it likely eliminates a needs-CLOBBER situation encountered while landing bug 948583. Particular thanks to r=jorendorff for the fast review here (given any change at all to jsopcode.tbl would bitrot this)
--HG--
extra : rebase_source : 4f5956dd196ff894766210cc4c9629054fc2914d
2014-01-24 13:21:09 -08:00
Sylvestre Ledru
acb3eb4dc5 Bug 777378 - Remove SUPPRESS_DEFAULT_RULES. r=gps 2014-01-23 09:38:29 -05:00
Jan Beich
4f324459ad Bug 961816 - Unhide _Unwind_Backtrace() as needed by NS_StackWalk(). r=glandium 2014-01-21 11:40:21 -05:00
Mike Hommey
e6b76b1823 Bug 958404 - Use tiers for js build. r=gps 2014-01-20 09:11:37 +09:00
Mike Hommey
73df9c208d Bug 959508 - Remove EXTERNALLY_MANAGED_MAKE_FILE traversal. r=gps 2014-01-20 09:10:33 +09:00
Mike Hommey
380b003fcb Bug 944650 - Allow mach to use a pristine GNU make if present and supported. r=gps 2014-01-20 09:09:56 +09:00
Mike Hommey
4c0e22933b Bug 956398 - Error out at build time if we end up with text relocations. r=ted 2014-01-16 09:13:43 +09:00
Mike Hommey
71a7b66679 Bug 950298 - Make the js build system use top-level as its root objdir. r=gps 2014-01-14 07:38:40 +09:00
Mike Hommey
8fce0b0fa7 Bug 957919 - Remove config/asencode.cpp. r=ted 2014-01-14 07:31:30 +09:00
Dan Minor
df1c99dccf Bug 949536 - Remove cpp unittests from 'make check'; r=gps 2014-01-09 21:59:28 -08:00
Masatoshi Kimura
3936c0b525 Bug 948405 - Define a dummy environment variable to ensure that the build system will not choke with non-ASCII characters. r=gps 2014-01-07 07:58:30 +09:00