014159ff40
Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey
2014-03-05 08:57:09 -08:00
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
b75843c7b2
Bug 903528 - Pre: Make classes.dex depend on ANDROID_EXTRA_JARS. r=glandium
2014-02-24 18:24:45 -08:00
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
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
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
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
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
acb3eb4dc5
Bug 777378 - Remove SUPPRESS_DEFAULT_RULES. r=gps
2014-01-23 09:38:29 -05:00
7760713d9e
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
0f2f57cd14
Bug 947083 - Kill elf-dynstr-gc. r=ted
2013-12-07 07:47:27 +09:00
881a7c1554
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
004e0ed1ac
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
b35c0e3a73
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
193f865ba8
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
f932a1fe70
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
c55e498091
Bug 921816 - Handle idls in --with-libxul-sdk builds. r=gps
2013-11-07 10:37:44 +09:00
9bd5fc0064
Bug 927837 - Don't manage generated files in configure; r=glandium
...
--HG--
extra : rebase_source : b502ce209de6a0ae10e130644e424687e4fae85e
2013-10-23 14:43:32 -07:00
a989b6e990
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
7e043134db
Merge mozilla-inbound to mozilla-central
2013-10-17 13:43:37 +02:00
ca1b5bf42a
Bug 926906 - Kill core_abspath, core_realpath and core_winabspath. r=gps
2013-10-17 07:55:16 +09:00
e0f324428d
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
9b06f11e0d
Bug 917753 - Add XPIDL files to clean target; r=glandium
2013-10-11 07:32:49 -07:00
dfb77e1fbd
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
dab294a319
Bug 923306 - Follow-up: Address review comment. r=me
2013-10-09 17:14:20 -07:00
bfb957cc0c
Bug 923306 - Add JAVA_JAR_TARGETS. r=glandium
2013-10-09 17:05:36 -07:00
44f174e6d5
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
47e2956ad0
Bug 923488 - Avoid binaries dependency on backend.mk when there isn't one. r=gps
2013-10-04 22:29:15 +09:00
fe52c2ade4
Bug 921307 - Aggregate dependencies in subdirectories that are still recursed with pseudo derecurse. r=gps
2013-10-03 05:51:19 +09:00
f16d44a104
Merge m-c to inbound
2013-10-01 18:54:45 -07:00
190b98c019
Bug 905973 part 3 - Add a "binaries" tier that optimizes for recompilation times. r=gps
2013-10-02 08:53:23 +09:00
dc2e144b17
Bug 919563 - Standardize APK generation. r=glandium
...
This only handles the simple cases: no mobile/android/base (yet).
2013-10-01 12:43:30 -07:00
d03c8a0359
Bug 921070 - Remove precompile tier; r=glandium
...
It made sense at the time. We now have inverted tiers and will soon have
derecursified building. This doesn't make sense any more.
2013-09-26 16:05:10 -07:00
5bb409fdd5
Bug 901990 - Part 1: Integrate test manifests with build config; r=ted
2013-09-24 11:50:04 -07:00
207f5374fb
Bug 909432 - Unify RESFILES and RES_FILES, and rename both to ANDROID_RESFILES. r=gps
2013-09-23 09:02:08 -07:00
fdcd66734e
Bug 917622 - Use INSTALL_TARGETS for mochitests. r=gps
2013-09-19 07:39:58 +09:00
61416bf7d3
Bug 912832 - Inverse tiers and subtiers for build traversal. r=gps
2013-09-06 09:17:59 +09:00
bc09ab2cd9
Merge inbound to m-c.
2013-09-05 15:42:49 -04:00
de97d52db6
Merge mozilla-central and b2g-inbound
2013-09-05 14:53:25 +01:00
fcef679c82
Bug 891766 - Add gecko's git commit info in B2G build. r=gps
2013-09-05 11:31:31 +08:00
f8bc7fa754
Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps
2013-09-05 09:01:46 +09:00
04daefa195
Back out changeset 6fe5a446b775 (bug 903118)
2013-09-05 09:01:44 +09:00
a6a6502733
Bug 911924 - Remove MAKE_DIRS leftovers. r=ted
2013-09-05 09:01:44 +09:00
9e730ecb1e
Bug 908977 - Generate XPIDL-derived headers directly into dist/include; r=glandium
2013-09-04 16:52:56 -07:00
95b7b7aab1
Bug 903118 - set mozconfig environment variables for sub-makes; r=gps
2013-08-14 09:34:18 -04:00
de6de9a266
Bug 912292 - Always traverse sub-directories after executing rules in the current directory. r=gps
2013-09-05 15:08:43 +09:00
962efc1ea1
Bug 906101 - Move tier make logic into own .mk file and don't use from rules.mk; r=glandium
...
The existing tier traversal logic is only used in the top-level Makefile
but was present in rules.mk. This meant it was getting evaluated for
every Makefile. This was silly and thus the logic has mostly been moved into
its own .mk file and is only included for the root Makefile.
2013-08-20 13:03:39 -07:00
61a66aa0f0
Bug 905879 - More robust tier tracking; r=glandium
2013-08-20 00:06:32 -07:00
0922ea8af6
Bug 905938 - Use explicit rules for {export,libs,tools}_tier_%. r=gps
2013-08-20 15:22:42 +09:00
4855b2abb9
Bug 905938 - Remove Java rules from rules.mk. r=gps
2013-08-20 15:22:33 +09:00
Nick Alexander
Ryan VanderMeulen
Ehsan Akhgari
Sylvestre Ledru
Mike Hommey
Carsten "Tomcat" Book
Gregory Szorc
Marco Castelluccio
Wes Kocher
Ed Morley
Askeing Yen
Mike Shal