Commit Graph

149 Commits

Author SHA1 Message Date
Brian O'Keefe
f6037f90a0 Bug 923080 - Generate xpt files into final location. r=glandium
Now that the mozbuild backend knows about FINAL_TARGET, we are able to
install generated xpt files into their final location. This saves us
from copying xpt files into their final location on every build.

Original patch by gps, rebased and comments addressed by Ms2ger

--HG--
extra : transplant_source : %E2%DC%0F%E0%AD%C2%25%A1%B8%A9%FE%B0%8C%60%FF%CB%02G%25%E5
2014-05-21 08:25:57 -04:00
Joshua Cranmer
4a4c68428e Bug 1099430, mozilla-central parts: Eliminate the duplication of the build system in comm-central, r=glandium.
See the revisions a few steps prior for more fine-grained information. This just
needs to be relanded because our automation doesn't like non-ASCII commit
messages.

--HG--
extra : amend_source : 0ee4e0da1ea9ada815abfe989c51030db24aac56
2014-11-29 19:45:31 -06:00
Phil Ringnalda
9edb638106 Backed out 3 changesets (bug 1099430) because 256 characters should be enough for anybody's commit message
CLOSED TREE

Backed out changeset 28abb8af2d62 (bug 1099430)
Backed out changeset 358aa39360d5 (bug 1099430)
Backed out changeset 3313e545f4f6 (bug 1099430)
2014-11-29 17:17:58 -08:00
Joshua Cranmer
4064b423b1 Bug 1099430, part 三: Use MOZILLA_DIR instead of topsrcdir in shared makefiles, r=glandium.
With these substitutions, it is possible to have comm-central's versions of
these files merely include the mozilla-central versions and avoid having to port
small changes to these files.
2014-11-29 18:44:19 -06:00
Mike Hommey
0412683b7d Bug 1062221 - Replace add_tier_dir with DIRS. r=gps 2014-10-02 09:14:07 +09:00
Mike Hommey
1d5475041b Bug 1049281 - Remove static dirs handling, now that there aren't any. r=gps
Also do some overdue cleanup from the removal of parallel and tools dirs
2014-08-07 02:58:53 +09:00
Mike Hommey
3424efc9f3 Bug 1043869 - Derive build dependencies for programs and libraries from make backend data instead of getting them from expandlibs. r=mshal 2014-07-29 08:59:56 +09:00
Mike Hommey
90e6ca0914 Bug 1043865 - Remove the remainder of compilation bits from the libs tier. r=gps 2014-07-29 08:59:27 +09:00
Mike Hommey
cc5c6d1ecc Bug 1043862 - Make the binaries target use the compile tier. r=gps 2014-07-29 08:58:28 +09:00
Mike Hommey
20d181268e Bug 1043820 - Remove PARALLEL_DIRS. r=gps 2014-07-29 08:57:59 +09:00
Mike Hommey
1e79fe55c2 Bug 1043802 - Remove TOOLS_DIRS and TEST_TOOLS_DIRS. r=gps 2014-07-29 08:55:55 +09:00
Mike Hommey
dbad84b131 Bug 1043344 - Move libraries and programs build to the compile tier. r=gps 2014-07-25 07:14:40 +09:00
Neil Rashbrook
10c8a98557 Bug 1037981 Make 'derecursed' builds support --enable-xterm-updates r=glandium 2014-07-16 08:36:30 +01:00
Mike Hommey
07267c6f7f Bug 1036864 - Remove EXPORT_LIBRARY. r=mshal 2014-07-11 19:06:55 +09:00
Mike Hommey
4409f0d493 Bug 1035543 - Remove the MOZ_PSEUDO_DERECURSE variable. r=gps 2014-07-10 14:11:52 +09:00
Mike Hommey
b02a375963 Bug 1027890 - Remove all sorts of build system code dedicated to pymake. r=gps 2014-06-25 08:38:28 +09:00
Wes Kocher
93661497bd Merge m-c to fx-team 2014-03-12 21:23:37 -07:00
Nick Alexander
28663ebee3 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
1e45b1eeae Bug 980015 - Remove MOCHITEST_FILES et. al. r=gps 2014-03-05 15:51:39 -05:00
Ryan VanderMeulen
462d354cd5 Backed out changeset 88780b5a201e (bug 980015) for test_property_database.html failures.
CLOSED TREE
2014-03-10 15:31:23 -04:00
Ted Mielczarek
4efe7d076c Bug 980015 - Remove MOCHITEST_FILES et. al. r=gps
--HG--
extra : rebase_source : 3825abc63eb0901bc1422aa00aed3680dbe3e44c
2014-03-05 15:51:39 -05:00
Nick Alexander
3720d512ba Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey 2014-03-05 08:57:09 -08:00
Nick Alexander
1fd81b5538 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
0d131e80d7 Bug 903528 - Pre: Make classes.dex depend on ANDROID_EXTRA_JARS. r=glandium 2014-02-24 18:24:45 -08:00
Nick Alexander
ec132ddcf5 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
Ryan VanderMeulen
f46afed6ea 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
d848739427 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
01e16e28ef 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
Ehsan Akhgari
b870bb3fe9 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
Sylvestre Ledru
f854b0dc6b Bug 777378 - Remove SUPPRESS_DEFAULT_RULES. r=gps 2014-01-23 09:38:29 -05:00
Nick Alexander
6fade1ad27 Bug 934646 - Part 3: Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
extra : rebase_source : f6ec8a38594e70520b10202c735dc019f8c856fd
2013-12-11 21:20:07 -08:00
Mike Hommey
e6e9868d2e Bug 947083 - Kill elf-dynstr-gc. r=ted 2013-12-07 07:47:27 +09:00
Mike Hommey
bf60896454 Bug 943728 - Replace double quotes with single quotes in Makefiles (or remove them when it makes sense). r=mshal 2013-12-03 06:34:21 +09:00
Mike Hommey
95f50f57a3 Bug 944558 - Refactor config/makefiles/debugmake.mk for more correctness, and remove old cruft. r=gps
Also remove use of print-depth-path.sh in UPDATE_TITLE.
2013-12-01 07:20:19 +09:00
Carsten "Tomcat" Book
22519643b6 Backed out changeset a829f4d2584a (bug 934646) Android Nightlies Build Bustage
--HG--
rename : mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png => mobile/android/branding/aurora/content/fennec_144x144.png
rename : mobile/android/branding/aurora/res/drawable-mdpi/icon.png => mobile/android/branding/aurora/content/fennec_48x48.png
rename : mobile/android/branding/aurora/res/drawable-hdpi/icon.png => mobile/android/branding/aurora/content/fennec_72x72.png
rename : mobile/android/branding/aurora/res/drawable-xhdpi/icon.png => mobile/android/branding/aurora/content/fennec_96x96.png
rename : mobile/android/branding/beta/res/drawable-xxhdpi/icon.png => mobile/android/branding/beta/content/fennec_144x144.png
rename : mobile/android/branding/beta/res/drawable-mdpi/icon.png => mobile/android/branding/beta/content/fennec_48x48.png
rename : mobile/android/branding/beta/res/drawable-hdpi/icon.png => mobile/android/branding/beta/content/fennec_72x72.png
rename : mobile/android/branding/beta/res/drawable-xhdpi/icon.png => mobile/android/branding/beta/content/fennec_96x96.png
rename : mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png => mobile/android/branding/nightly/content/fennec_144x144.png
rename : mobile/android/branding/nightly/res/drawable-mdpi/icon.png => mobile/android/branding/nightly/content/fennec_48x48.png
rename : mobile/android/branding/nightly/res/drawable-hdpi/icon.png => mobile/android/branding/nightly/content/fennec_72x72.png
rename : mobile/android/branding/nightly/res/drawable-xhdpi/icon.png => mobile/android/branding/nightly/content/fennec_96x96.png
rename : mobile/android/branding/official/res/drawable-xxhdpi/icon.png => mobile/android/branding/official/content/fennec_144x144.png
rename : mobile/android/branding/official/res/drawable-mdpi/icon.png => mobile/android/branding/official/content/fennec_48x48.png
rename : mobile/android/branding/official/res/drawable-hdpi/icon.png => mobile/android/branding/official/content/fennec_72x72.png
rename : mobile/android/branding/official/res/drawable-xhdpi/icon.png => mobile/android/branding/official/content/fennec_96x96.png
rename : mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_144x144.png
rename : mobile/android/branding/unofficial/res/drawable-mdpi/icon.png => mobile/android/branding/unofficial/content/fennec_48x48.png
rename : mobile/android/branding/unofficial/res/drawable-hdpi/icon.png => mobile/android/branding/unofficial/content/fennec_72x72.png
rename : mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_96x96.png
2013-11-20 15:16:00 +01:00
Nick Alexander
0bec83eec7 Bug 934646 - Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
--HG--
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
2013-11-18 09:31:55 -08:00
Mike Hommey
d2778baa7e Bug 862770 - Fix --disable-compile-environment a little. r=gps
--HG--
rename : config/makefiles/target_libs.mk => config/makefiles/target_binaries.mk
rename : js/src/config/makefiles/target_libs.mk => js/src/config/makefiles/target_binaries.mk
2013-11-07 10:37:45 +09:00
Mike Hommey
7adba441b7 Bug 921816 - Handle idls in --with-libxul-sdk builds. r=gps 2013-11-07 10:37:44 +09:00
Gregory Szorc
9ada834d56 Bug 927837 - Don't manage generated files in configure; r=glandium
--HG--
extra : rebase_source : b502ce209de6a0ae10e130644e424687e4fae85e
2013-10-23 14:43:32 -07:00
Gregory Szorc
c60359d87c Bug 585011 - Move cl.py to mozbuild; r=ted
--HG--
rename : build/cl.py => python/mozbuild/mozbuild/action/cl.py
2013-10-22 14:25:56 -07:00
Carsten "Tomcat" Book
fc3455fc6c Merge mozilla-inbound to mozilla-central 2013-10-17 13:43:37 +02:00
Mike Hommey
6aeae2f437 Bug 926906 - Kill core_abspath, core_realpath and core_winabspath. r=gps 2013-10-17 07:55:16 +09:00
Nick Alexander
fdfe926d99 Bug 900522 - Part 2: Use ANDROID_RESFILES in mobile/android/base/moz.build. r=gps
This defines ANDROID_RESFILES in mobile/android/base/moz.build but
does not use the default processing from java-build.mk.
* * *
Bug 900522 - Part 1: Make ANDROID_RESFILES a moz.build-only variable. r=gps
2013-10-09 16:19:00 -07:00
Gregory Szorc
e01a77d1ca Bug 917753 - Add XPIDL files to clean target; r=glandium 2013-10-11 07:32:49 -07:00
Gregory Szorc
9691b82900 Bug 585016 - Move buildlist.py to a mozbuild action; r=mshal
--HG--
rename : config/buildlist.py => python/mozbuild/mozbuild/action/buildlist.py
rename : config/tests/unit-buildlist.py => python/mozbuild/mozbuild/test/action/test_buildlist.py
2013-10-11 07:22:49 -07:00
Nick Alexander
5b2ccde7b1 Bug 923306 - Follow-up: Address review comment. r=me 2013-10-09 17:14:20 -07:00
Nick Alexander
7e9466764b Bug 923306 - Add JAVA_JAR_TARGETS. r=glandium 2013-10-09 17:05:36 -07:00
Marco Castelluccio
9a1528e3b9 Bug 924549 - Add MOCHITEST_WEBAPPRT_CHROME_MANIFESTS to specify webapprt chrome tests and convert all the webapprt mochitests to use manifests. r=gps 2013-10-09 09:16:18 -04:00
Mike Hommey
36ee75f02e Bug 923488 - Avoid binaries dependency on backend.mk when there isn't one. r=gps 2013-10-04 22:29:15 +09:00
Mike Hommey
44fe8c20f5 Bug 921307 - Aggregate dependencies in subdirectories that are still recursed with pseudo derecurse. r=gps 2013-10-03 05:51:19 +09:00