Commit Graph

3521 Commits

Author SHA1 Message Date
David Anderson
76ab271ead Merge IonMonkey to mozilla-central. a=arewefastyet
--HG--
rename : content/base/src/nsWebSocket.cpp => content/base/src/WebSocket.cpp
rename : content/base/src/nsWebSocket.h => content/base/src/WebSocket.h
2012-09-11 10:25:14 -07:00
Mike Hommey
c652ca2011 Bug 789837 - Properly set dependencies on .deps directories. r=ted 2012-09-11 09:43:32 +02:00
David Anderson
f4bf6ff039 Merge from mozilla-central. 2012-09-06 18:28:59 -07:00
Mike Hommey
f6e238ebab Bug 788954 - Remove export-idl rule. r=ted 2012-09-06 14:46:41 +02:00
Ms2ger
88bf3ede9b No bug - Remove STRICT_CPLUSPLUS_SUFFIX; rs=ted 2012-09-06 09:14:49 +02:00
David Anderson
f6eca6c7f0 Merge from mozilla-central.
--HG--
rename : js/jsd/jsd_scpt.c => js/jsd/jsd_scpt.cpp
rename : js/jsd/jsd_stak.c => js/jsd/jsd_stak.cpp
rename : js/jsd/jsd_val.c => js/jsd/jsd_val.cpp
2012-09-05 16:18:11 -07:00
David Anderson
25cb077cb2 Merge from mozilla-central.
--HG--
rename : js/src/sharkctl.cpp => js/src/devtools/sharkctl.cpp
rename : js/src/sharkctl.h => js/src/devtools/sharkctl.h
rename : js/src/MemoryMetrics.cpp => js/src/jsmemorymetrics.cpp
2012-08-29 17:57:37 -07:00
David Anderson
a77264d9fb Merge from mozilla-central.
--HG--
rename : content/base/public/nsIFrameMessageManager.idl => content/base/public/nsIMessageManager.idl
2012-08-29 17:51:24 -07:00
Siddharth Agarwal
9e3b3ce078 Backout bug 784262 because of Pymake bustage and GNU Make "warning: overriding commands for target". 2012-08-29 20:36:23 +05:30
Mike Hommey
17b764b2f4 Bug 785622 - Only include .pp files corresponding to files we do build. r=khuey 2012-08-29 08:55:58 +02:00
Mike Hommey
99218746e3 Bug 784262 - Use generic install/copy rule in rules.mk. r=ted 2012-08-29 08:55:57 +02:00
Martin Husemann
de9ae86824 Bug 753046 - Add IPC support for BSDs, build glue. r=khuey,cjones 2012-08-28 23:16:51 +02:00
Ryan VanderMeulen
1a2865e046 Merge m-c to inbound. 2012-08-27 19:34:23 -04:00
Alex Keybl
0f6cdb0532 Merging in version bump NO BUG 2012-08-27 12:21:46 -07:00
Siddharth Agarwal
4787eb3540 Bug 740854 - Remove --disable-auto-deps, SYSTEM_MAKEDEPEND, MOZ_NATIVE_MAKEDEPEND and associated crap. r=ted
--HG--
extra : rebase_source : 6a3f3017a3674738bb89e7e7f2e55c35a3cbe231
2012-08-28 00:57:16 +05:30
Frank Yan
abf16a4365 Bug 782324 - Add support in JarMaker for file names that contain '@'. r=khuey 2012-08-31 06:36:12 -07:00
David Anderson
5c045998a5 Merge from mozilla-central. 2012-08-13 13:40:42 -07:00
David Anderson
8d084d5b2e Merge from mozilla-central. 2012-08-08 15:09:49 -07:00
David Anderson
7ab97db10e Merge from mozilla-central. 2012-08-07 15:13:28 -07:00
Marco Castelluccio
b8b3819fad Bug 783765 - Use libnotify as a dynamic library. r=glandium 2012-08-25 08:54:16 +02:00
David Anderson
f2b01e4cbb Merge from mozilla-central.
--HG--
rename : layout/base/nsFrameTraversal.cpp => layout/base/nsFrameIterator.cpp
rename : layout/base/nsFrameTraversal.h => layout/base/nsFrameIterator.h
rename : browser/modules/WebappsInstaller.jsm => toolkit/webapps/WebappsInstaller.jsm
2012-08-06 12:44:06 -07:00
David Anderson
bd3a52c3e2 Merge.
--HG--
rename : content/base/src/nsGenericElement.h => content/base/public/FragmentOrElement.h
rename : content/base/src/nsGenericElement.cpp => content/base/src/FragmentOrElement.cpp
rename : gfx/thebes/nsCoreAnimationSupport.mm => gfx/2d/QuartzSupport.mm
2012-08-01 11:30:00 -07:00
David Anderson
56597a8412 Merge from mozilla-central. 2012-07-31 17:19:41 -07:00
Mike Habicher
9e245cc9a4 Bug 740997 - ICS camera support, r=jst,gal,roc 2012-07-30 17:59:05 -04:00
David Anderson
e7f516869b Merge from mozilla-central. 2012-07-30 13:15:39 -07:00
Simon Montagu
a7fda48bc7 Use printf instead of sed to prevent lots of blank lines in console output from make -s. Bug 756382, r=ted 2012-08-07 01:42:45 -07:00
Mike Hommey
5d9c217299 Bug 777892 - Link CPP_UNIT_TESTS against zlib when linking js statically. r=khuey 2012-08-07 09:30:01 +02:00
Mike Hommey
b30445d148 Bug 773202 - Generic install/copy rule. r=ted 2012-08-07 09:29:59 +02:00
Mike Hommey
6a5b86abf8 Bug 777379 - Ensure that default is always the default target. r=ted 2012-08-08 09:33:16 +02:00
David Anderson
b8519fb4f1 Merge from mozilla-central. 2012-07-26 18:19:02 -07:00
David Anderson
8e99468375 Merge from mozilla-central. 2012-07-25 14:30:08 -07:00
David Anderson
8027cb08c0 Merge from mozilla-central. 2012-07-24 16:32:08 -07:00
Ed Morley
3d60969c38 Backout eecd3aa199e6 (bug 776305), 62facd5b3da9, c6a0ac7d47d2 & 2d56621abfee (bug 776035), e4e68cf2bd40 (bug 776016), 0853a4d49b4e & 31de6ffdedcb (bug 770426), 43a69b4981f5 (bug 756786) for Windows mochitest crashes 2012-07-25 09:35:32 +01:00
Mike Hommey
2f44f610f5 Bug 776035 part 3 - Use the new MockedOpen in unit-Preprocessor.py. r=ted 2012-07-25 07:44:08 +02:00
Mike Hommey
4c48c001f8 Bug 776035 part 2 - Add an enhanced MockedOpen facility to mozunit.py. r=ted 2012-07-25 07:44:08 +02:00
Mike Hommey
985de147d7 Bug 776035 - Make mozunit even easier to use, and use it in config/tests python unit tests. r=ted 2012-07-25 07:44:08 +02:00
Mike Hommey
987cbfa2e1 Bug 776016 - Avoid Preprocessor.py warning when no commands are processed, but filters are. r=ted 2012-07-25 07:44:08 +02:00
Mike Hommey
9033126795 Bug 770426 - Replace double colon rules with dependency chains for preprocessing rules. r=khuey 2012-07-23 07:42:22 +02:00
Mike Hommey
f719e34902 Bug 742795 - Autogenerate autoconf.mk. r=ted 2012-08-06 15:19:50 +02:00
Mike Hommey
194096e28a Backout rules.mk part of changeset 1f4eae8d9e08 (bug 777379) for bustage on CLOSED TREE 2012-08-06 20:20:26 +02:00
Siddharth Agarwal
d7ff75ed7e Bug 780508 - Avoid a bunch of process spawns with Pymake by removing a redundant shell script and switching an echo to a $(info). r=khuey 2012-08-06 21:44:13 +05:30
Ed Morley
0e9ed7fa01 Backout 7f8928077ed4 (bug 742795) for make-package & find filepath failures 2012-08-06 16:05:07 +01:00
Mike Hommey
e9c3f71f8f Bug 777379 - Ensure that default is always the default target. r=ted 2012-08-06 15:21:10 +02:00
Mike Hommey
014e0b483d Bug 742795 - Autogenerate autoconf.mk. r=ted 2012-08-06 15:19:50 +02:00
Mike Hommey
c70f2d98fa Bug 770426 - Replace double colon rules with dependency chains for preprocessing rules. r=khuey 2012-07-23 07:42:22 +02:00
Gregory Szorc
96140f4c0f Bug 776805 - Remove unused NO_GEN_XPT from rules.mk; r=glandium 2012-07-24 10:57:13 -07:00
David Anderson
07f7d8e680 Merge from mozilla-central. 2012-07-20 12:02:04 -07:00
Sean DuBois
c4c18a9031 Bug 769908 - Switch DIR_INSTALL to INSTALL. r=ted 2012-07-23 20:02:20 -04:00
David Anderson
eec7db39f5 Merge from mozilla-central.
--HG--
rename : js/xpconnect/wrappers/CrossOriginWrapper.cpp => js/xpconnect/wrappers/WaiveXrayWrapper.cpp
rename : js/xpconnect/wrappers/CrossOriginWrapper.h => js/xpconnect/wrappers/WaiveXrayWrapper.h
2012-07-18 19:02:32 -07:00
Masatoshi Kimura
868aee25e8 Bug 780446 - touch Makefile after invoking config.status. r=glandium 2012-08-05 12:43:00 +02:00