Commit Graph

3954 Commits

Author SHA1 Message Date
Gregory Szorc
0c8ee65118 Merge mozilla-central into build-system
There were merges in configure.in and some Makefile.in. None had any
conflicts. I spot verified the Makefile.in changes and confirmed that
the changes did not touch any DIRS* variables.
2013-02-27 10:03:52 -08:00
Ms2ger
aea301eee3 Merge m-c to b-s. 2013-02-26 19:09:25 +01:00
Ed Morley
2f417022fb Merge mozilla-central to mozilla-inbound 2013-02-26 10:45:52 +00:00
Mike Hommey
487f6796a4 Bug 844785 - Fix xulrunner mac builds. r=ted 2013-02-26 08:13:30 +01:00
Gregory Szorc
2f9c3f619e Bug 784841 - Part 18θ: Convert /toolkit f=Mossop, Ms2ger; rs=ted 2013-02-25 13:19:09 -08:00
Gregory Szorc
d6eb630896 Bug 784841 - Part 17: Handle unicode during packaging; r=glandium 2013-02-25 12:47:17 -08:00
Dave Townsend
56f951cc7a Bug 824022: Forcibly timeout xpcshell tests that run too long. r=Unfocused 2013-02-23 21:55:23 -08:00
L. David Baron
49b7670edf Bug 404077: Use navigator.platform.startsWith rather than navigator.platform.indexOf, at Jesse's suggestion. 2013-02-26 22:23:08 -08:00
Marshall Culpepper
0c5e954231 Bug 833708: Correctly set the active update's errorCode when there isn't enough space in Gonk. r=dhylands 2013-02-25 21:11:14 -06:00
L. David Baron
a8ee400190 Bug 404077: Annotate known assertions in mochitests. 2013-02-25 18:39:21 -08:00
Shih-Chiang Chien
418c3fc9d7 Bug 835260 - Need B2G version number for composing update URL. r=marshall_law 2013-02-25 20:44:12 -05:00
Gavin Sharp
6a0bfaa745 Remove some unnecessary preprocessing, no bug
--HG--
extra : rebase_source : b8bfed7a5b55652fd8a9b3bf3c601accb8b2022f
2013-02-17 17:49:25 -08:00
Mike Hommey
026abf6d83 Bug 840094 - Change how nsZipArchive logging works. r=taras,r=gps
Now log in a single file given by the MOZ_JAR_LOG_FILE environment variable.
Log entries contain the URI of the Zip archive, followed by the path in the
archive.
* * *
Bug 840094 - Fixup for debug builds failure because of nsZipArchive::CloseArchive being called several times
2013-02-19 11:02:12 +01:00
John Ford
ba05c786ac bug 839298 - fix json file creation for git users r=ted 2013-02-19 10:24:16 -08:00
Hector Zhao
5350164a4e Bug 842228 - Set shell to open in AddDisabledDDEHandlerValues. r=bbondy 2013-02-18 15:53:06 +08:00
John Ford
3a684cef64 Bug 839298 - One True JSON file of build information r=ted 2013-02-15 16:16:02 -08:00
Joey Armstrong
fa3323d7f6 bug 746277: replace hg commands with functions 2013-02-15 17:00:12 -05:00
Dave Townsend
c01d1271ec Bug 554780: Make plugins provider correctly handle plugins being added and removed through detection at runtime. r=Unfocused 2013-02-15 10:12:44 -06:00
Drew Willcoxon
8715a08802 Bug 648675 - Allow comments and URL opt-in in content/plugin crash UI. r=dolske,ted 2013-02-14 15:57:50 -08:00
Ed Morley
9468e105e3 Merge mozilla-central to mozilla-inbound 2013-02-14 11:09:15 +00:00
Ed Morley
601b6ce42a Merge latest green inbound changeset to mozilla-central 2013-02-14 10:44:41 +00:00
Mike Hommey
0593722a85 Bug 840598 - Search for l10n files in all app bases during l10n-repack. r=gps 2013-02-14 08:18:18 +01:00
Tatiana Meshkova
48a6cefff5 Bug 837730 - Add missing NULL definition so that updater will compile on some Linux platforms. r=rstrong 2013-02-12 16:14:13 -08:00
Mike Hommey
26e3714874 Bug 755724 - Move browser application in a subdirectory. r=jimm 2013-02-11 14:10:16 +01:00
Bobby Holley
7adfc5e532 Bug 841067 - Fix up CertUtils. r=bz
This is yet another piece of broken code that relies on the "find the |this|
object" behavior that we're removing. Moreover, it's not caught by our compat
hack, because Components.utils is a bizarre object that implements
nsIXPCScriptable (giving it a custom JSClass->name that's not XPCWN_NoHelper)
while not implementing nsIClassInfo (which would have put the method on the
prototype and made this never work in the first place). We _could_ add special
support for the Cu JSClass name in our compat hack, but I think we should just
fix it here and assume this pattern is not particularly common in external
consumers.
2013-02-14 10:40:15 +01:00
Chris Cooper
987a19062c Bug 785392 - Upload mar and mbsdiff when present - r=aki 2013-02-13 18:50:18 -05:00
Jim Mathies
3b0065b274 Bug 839793 - TelemetryTimestamps.jsm imported using the wrong path. r=glandium 2013-02-09 12:28:38 -06:00
Dave Hylands
b282b43d4f Bug 827896 - Cancel download rather than letting it fail when powering off the phone. r=rstrong 2013-02-08 19:36:16 -08:00
Mike Hommey
a2baccb09c Bug 793767 - Use the executable file location to derive the update root. r=rstrong 2013-02-08 15:58:52 +01:00
Ed Morley
558f4d9a53 Merge mozilla-inbound to mozilla-central 2013-02-08 11:00:58 +00:00
Phil Ringnalda
87e29c3174 Merge m-c to fx-team
--HG--
rename : content/media/webaudio/AudioEventTimeline.h => content/media/AudioEventTimeline.h
2013-02-07 07:16:22 -08:00
Benjamin Smedberg
7fd5eb80d5 Bug 831921 - Make the plugin UI less broken-looking for all plugins except for crashed plugins, including visual tweaks by shorlander. r=jaws 2013-02-06 15:11:36 -05:00
Robert Strong
93010c047e Bug 753730 - Intermittent test_0110_general_svc.js failure in head_update.js | UPDATE TYPE complete. r=bbondy 2013-02-05 10:48:00 -08:00
Irving Reid
7b6e49cd35 Bug 810146: Add telemetry for addon manager startup times, unpacked add-ons and various changes detected at startup r=Mossop
--HG--
rename : browser/modules/TelemetryTimestamps.jsm => toolkit/modules/TelemetryTimestamps.jsm
rename : browser/modules/test/browser_TelemetryTimestamps.js => toolkit/modules/tests/browser_TelemetryTimestamps.js
2013-02-07 16:47:33 -05:00
Robert Strong
9a183a6846 Bug 767968 - Intermittent test_0201_app_launch_apply_update.js, test_0203_app_launch_apply_update.js | WindowsError: [Error 13] The process cannot access the file because it is being used by another process: '...\maintenanceservice_installer.exe'. r=bbondy 2013-02-04 17:54:13 -08:00
Robert Strong
9a0dfb1304 Bug 762032 - Intermittent test_0201_app_launch_apply_update_svc.js | WindowsError: [Error 13] The process cannot access the file because it is being used by another process: '...\ExecutableDir.tmp\bin\uninstall\helper.exe'. r=bbondy 2013-02-04 17:54:02 -08:00
Ehsan Akhgari
d42a56f46f Merge mozilla-central into mozilla-inbound 2013-02-03 12:43:44 -05:00
Mike Hommey
092a9fa25e Bug 836218 - Always copy files instead of skipping when destination is newer when doing l10n-repacks. r=ted 2013-02-03 07:20:24 +01:00
Mike Hommey
0d5b94986e Bug 835309 - Look at .xpi file contents when unifying them for universal builds. r=gps 2013-02-03 07:19:15 +01:00
Mike Hommey
aec48ba2bc Bug 835309 - Fix JarFileReader.readlines() and make flake8 happier. r=gps 2013-02-03 07:18:55 +01:00
Robert Strong
8023ac8117 Bug 837345 - Cleanup unused code that is no longer needed with NSIS 2.46. r=bbondy 2013-02-01 20:18:07 -08:00
Robert Strong
7c9873feef Bug 695811 - Checking for updates logs two warnings about deprecated XMLHttpRequest attributes. r=bbondy, r=dhylands 2013-02-01 18:58:48 -08:00
Margaret Leibovic
ce0533c704 Bug 834681 - Add support for basic distribution modifications. r=mfinkle 2013-02-01 15:45:33 -08:00
Jeff Muizelaar
91cbf694b0 Bug 808785. Stop shipping d3dx9_43.dll. r=bjacob
Since ANGLE revision 1314 / issue 311:
http://code.google.com/p/angleproject/issues/detail?id=311 d3dx9_43.dll is no
longer needed.

--HG--
extra : rebase_source : cb02a61730f4a24f807662269693be2dde673ff0
2013-01-28 11:52:06 -05:00
Robert Strong
7cb6bbba42 Bug 836620 - Cleanup app binary copies used by app update xpcshell tests. r=bbondy 2013-01-31 12:31:52 -08:00
Ryan VanderMeulen
6c7aa941d0 Backed out changesets 9aadf7e35e70 (bug 836517) and 493805ba1c85 (bug 834681) for Android test hangs. 2013-01-31 15:15:50 -05:00
Margaret Leibovic
f69a887e4e Bug 834681 - Add support for basic distribution modifications. r=mfinkle 2013-01-31 10:28:00 -08:00
Ehsan Akhgari
565d0479c3 Bug 817477 - Remove support for global private browsing mode; r=jdm,glandium
--HG--
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js
2013-01-29 13:12:13 -05:00
Robert Strong
fef84673e2 Significantly increase timeout to see if it makes a difference for Bug 814535 and bug 774014 - Intermittent test_0203_app_launch_apply_update.js, test_0203_app_launch_apply_update_svc.js Intermittent test_0201_app_launch_apply_update.js, test_0201_app_launch_apply_update_svc.js | launch application timer expired. r=bbondy 2013-01-28 12:23:27 -08:00
Robert Strong
6c87bd7e6a Bug 835090 - Where possible app update xpcshell tests should run on xulrunner. r=bbondy 2013-01-28 12:23:10 -08:00