wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
184,309 Commits 1 Branch 166 Tags 1.2 GiB
31ce7ef213
Commit Graph

133 Commits

Author SHA1 Message Date
Wes Kocher
029a6912b6 Merge m-c to fx-team 2014-03-12 21:23:37 -07:00
Nick Alexander
947f8f4ee9 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
b491b5d0d8 Bug 980015 - Remove MOCHITEST_FILES et. al. r=gps 2014-03-05 15:51:39 -05:00
Ryan VanderMeulen
9ced6c9188 Backed out changeset 88780b5a201e (bug 980015) for test_property_database.html failures. 
CLOSED TREE
 2014-03-10 15:31:23 -04:00
Ted Mielczarek
c0e5c0cfe5 Bug 980015 - Remove MOCHITEST_FILES et. al. r=gps 
--HG--
extra : rebase_source : 3825abc63eb0901bc1422aa00aed3680dbe3e44c
 2014-03-05 15:51:39 -05:00
Nick Alexander
aea81467c8 Bug 978587 - Pre: Let Java JARs contain either sources or generated sources. r=blassey 2014-03-05 08:57:09 -08:00
Nick Alexander
b5a10ff343 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
3fa2a0ba88 Bug 903528 - Pre: Make classes.dex depend on ANDROID_EXTRA_JARS. r=glandium 2014-02-24 18:24:45 -08:00
Nick Alexander
e5066e3a09 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
38f8bae105 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
f5a61798ef 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
396bcc8ca2 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
82ebdc883f 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
c144ac82cf Bug 777378 - Remove SUPPRESS_DEFAULT_RULES. r=gps 2014-01-23 09:38:29 -05:00
Nick Alexander
42814c41ba 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
e4999fcf01 Bug 947083 - Kill elf-dynstr-gc. r=ted 2013-12-07 07:47:27 +09:00
Mike Hommey
06d6d3c5cf 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
5cba7be6e4 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
bdc4a5eb02 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
ea34b572fc 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
bf5fdbbd38 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
47f95a5be2 Bug 921816 - Handle idls in --with-libxul-sdk builds. r=gps 2013-11-07 10:37:44 +09:00
Gregory Szorc
8a2d15ca5d 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
f7a94d6205 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
e0e6d5915e Merge mozilla-inbound to mozilla-central 2013-10-17 13:43:37 +02:00
Mike Hommey
5badab1842 Bug 926906 - Kill core_abspath, core_realpath and core_winabspath. r=gps 2013-10-17 07:55:16 +09:00
Nick Alexander
6c5fc4e94c 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
c194b3b09b Bug 917753 - Add XPIDL files to clean target; r=glandium 2013-10-11 07:32:49 -07:00
Gregory Szorc
ec3d3cdf0d 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
12792a1daa Bug 923306 - Follow-up: Address review comment. r=me 2013-10-09 17:14:20 -07:00
Nick Alexander
b04068da45 Bug 923306 - Add JAVA_JAR_TARGETS. r=glandium 2013-10-09 17:05:36 -07:00
Marco Castelluccio
4778ce1568 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
22e60c17f3 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
1e42ec5de9 Bug 921307 - Aggregate dependencies in subdirectories that are still recursed with pseudo derecurse. r=gps 2013-10-03 05:51:19 +09:00
Wes Kocher
548b3fc608 Merge m-c to inbound 2013-10-01 18:54:45 -07:00
Mike Hommey
9ff9ef374e Bug 905973 part 3 - Add a "binaries" tier that optimizes for recompilation times. r=gps 2013-10-02 08:53:23 +09:00
Nick Alexander
101b9c3adf 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
Gregory Szorc
2b2720f0c8 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
Gregory Szorc
e1e6f1327a Bug 901990 - Part 1: Integrate test manifests with build config; r=ted 2013-09-24 11:50:04 -07:00
Nick Alexander
6060c746db Bug 909432 - Unify RESFILES and RES_FILES, and rename both to ANDROID_RESFILES. r=gps 2013-09-23 09:02:08 -07:00
Mike Hommey
153c82610c Bug 917622 - Use INSTALL_TARGETS for mochitests. r=gps 2013-09-19 07:39:58 +09:00
Mike Hommey
b72cb335fd Bug 912832 - Inverse tiers and subtiers for build traversal. r=gps 2013-09-06 09:17:59 +09:00
Ryan VanderMeulen
4a441f3db3 Merge inbound to m-c. 2013-09-05 15:42:49 -04:00
Ed Morley
5806f3fb9f Merge mozilla-central and b2g-inbound 2013-09-05 14:53:25 +01:00
Askeing Yen
b98610d2b6 Bug 891766 - Add gecko's git commit info in B2G build. r=gps 2013-09-05 11:31:31 +08:00
Mike Hommey
05b3f24e0e Bug 912293 - Remove now redundant boilerplate from Makefile.in. r=gps 2013-09-05 09:01:46 +09:00
Mike Hommey
ac78d3f835 Back out changeset 6fe5a446b775 (bug 903118) 2013-09-05 09:01:44 +09:00
Mike Hommey
ce1cb59268 Bug 911924 - Remove MAKE_DIRS leftovers. r=ted 2013-09-05 09:01:44 +09:00
Gregory Szorc
2a957a50ed Bug 908977 - Generate XPIDL-derived headers directly into dist/include; r=glandium 2013-09-04 16:52:56 -07:00
Mike Shal
f62d01a145 Bug 903118 - set mozconfig environment variables for sub-makes; r=gps 2013-08-14 09:34:18 -04:00