e7f516869b
Merge from mozilla-central.
2012-07-30 13:15:39 -07:00
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
5d9c217299
Bug 777892 - Link CPP_UNIT_TESTS against zlib when linking js statically. r=khuey
2012-08-07 09:30:01 +02:00
b30445d148
Bug 773202 - Generic install/copy rule. r=ted
2012-08-07 09:29:59 +02:00
6a5b86abf8
Bug 777379 - Ensure that default is always the default target. r=ted
2012-08-08 09:33:16 +02:00
b8519fb4f1
Merge from mozilla-central.
2012-07-26 18:19:02 -07:00
8e99468375
Merge from mozilla-central.
2012-07-25 14:30:08 -07:00
8027cb08c0
Merge from mozilla-central.
2012-07-24 16:32:08 -07:00
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
2f44f610f5
Bug 776035 part 3 - Use the new MockedOpen in unit-Preprocessor.py. r=ted
2012-07-25 07:44:08 +02:00
4c48c001f8
Bug 776035 part 2 - Add an enhanced MockedOpen facility to mozunit.py. r=ted
2012-07-25 07:44:08 +02:00
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
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
9033126795
Bug 770426 - Replace double colon rules with dependency chains for preprocessing rules. r=khuey
2012-07-23 07:42:22 +02:00
f719e34902
Bug 742795 - Autogenerate autoconf.mk. r=ted
2012-08-06 15:19:50 +02:00
194096e28a
Backout rules.mk part of changeset 1f4eae8d9e08 (bug 777379) for bustage on CLOSED TREE
2012-08-06 20:20:26 +02:00
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
0e9ed7fa01
Backout 7f8928077ed4 (bug 742795) for make-package & find filepath failures
2012-08-06 16:05:07 +01:00
e9c3f71f8f
Bug 777379 - Ensure that default is always the default target. r=ted
2012-08-06 15:21:10 +02:00
014e0b483d
Bug 742795 - Autogenerate autoconf.mk. r=ted
2012-08-06 15:19:50 +02:00
c70f2d98fa
Bug 770426 - Replace double colon rules with dependency chains for preprocessing rules. r=khuey
2012-07-23 07:42:22 +02:00
96140f4c0f
Bug 776805 - Remove unused NO_GEN_XPT from rules.mk; r=glandium
2012-07-24 10:57:13 -07:00
07f7d8e680
Merge from mozilla-central.
2012-07-20 12:02:04 -07:00
c4c18a9031
Bug 769908 - Switch DIR_INSTALL to INSTALL. r=ted
2012-07-23 20:02:20 -04:00
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
868aee25e8
Bug 780446 - touch Makefile after invoking config.status. r=glandium
2012-08-05 12:43:00 +02:00
91d92e952e
Bug 780421 - Use $(PYTHON) to run config.status. r=glandium
2012-08-05 12:42:57 +02:00
4264d447f8
Merge from mozilla-central.
2012-07-12 13:23:26 -07:00
12f86be1b6
Merge from mozilla-central.
...
--HG--
rename : editor/libeditor/base/DeleteElementTxn.cpp => editor/libeditor/base/DeleteNodeTxn.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicBuffers.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicCanvasLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicColorLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicContainerLayer.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicImageLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayerManager.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicLayersImpl.h
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.cpp
rename : gfx/layers/basic/BasicLayers.cpp => gfx/layers/basic/BasicThebesLayer.h
rename : js/src/jsobj.cpp => js/src/builtin/Eval.cpp
2012-07-10 19:45:14 -07:00
f5170992cb
Bug 777710 - Remove platform and OS identifiers from B2G UA. r=bz
...
--HG--
extra : rebase_source : 75ddd7a0e75f22a065fc0e7efad3a749511b813d
2012-07-31 17:37:26 +02:00
2297111f2b
Bug 776552 - Remove the MOZ_SVG_DLISTS build time flag. r=longsonr.
...
--HG--
extra : rebase_source : 97193f758ba70730f3d35a6e67ea63cebfb3fb60
2012-07-23 16:39:15 +01:00
b270bbc902
Backout deb1e2c80f84 (bug 770426) for causing bug 776503 on a CLOSED TREE
2012-07-23 14:28:32 +01:00
7cd0a9092a
Bug 770426 - Replace double colon rules with dependency chains for preprocessing rules. r=khuey
2012-07-23 07:42:22 +02:00
8cbbd5d19a
Bug 775410 - Remove nsinstall.exe.manifest. r=khuey
2012-07-23 14:40:12 +09:00
b1596d3ff1
Bug 773933 - Remove libs rules from browser/components/sessionstore/src/Makefile.in; r=ted
2012-08-04 09:43:58 +02:00
70d7c821af
Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted
2012-08-04 20:26:44 +02:00
f4181983a1
Revert inbound to 3d5d1daa2505 to stop OS X M5 failures (backout not clean/could have been a bad merge) on a CLOSED TREE
2012-08-04 18:05:15 +01:00
97155ba331
Merge m-c to m-i.
2012-08-04 13:02:15 +02:00
03af8b0c50
Backout changeset 2ef51674316a (bug 774032 bonus) for various Mochitest bustages on a CLOSED TREE
2012-08-04 10:38:41 +02:00
9191ab4c5b
Bug 773933 - Remove libs rules from browser/components/sessionstore/src/Makefile.in; r=ted
2012-08-04 09:43:58 +02:00
3a5adea6f7
Bug 780159 - Remove obsolete REGCHROME. r=ted
2012-08-04 08:55:00 +02:00
7096160830
Bug 774032 bonus - Use @DEPTH@ and @relativesrcdir@ in Makefile.in. r=ted
2012-08-04 08:48:56 +02:00
e5d69586e3
Bug 774032 part 6 - Replace autoconf handling of config files and headers with our own. r=ted
2012-08-04 08:47:28 +02:00
dfeeeed10a
Bug 774032 part 3 - Remove variables with no AC_SUBST in autoconf.mk.in. r=ted
2012-08-04 08:47:28 +02:00
1032512213
Bug 774032 part 2 - Allow to disable markers in Preprocessor.py. r=ted
2012-08-04 08:47:28 +02:00
94f8e1708f
Bug 774032 part 1 - Avoid Preprocessor.py replacing undefined variables with the attemptSubstitution filter. r=ted
2012-08-04 08:47:28 +02:00
d4c32c1306
Bug 780241 - pythonpath.py should not be a native command. r=ted over IRC.
2012-08-04 00:39:54 +05:30
f3842022cf
Bug 774054 - Switch mochitest file $(INSTALL) to install_cmd. r=glandium
...
--HG--
extra : rebase_source : f01a7f0ab55c32256c641dbfa33024132ad0cc79
2012-07-20 01:07:10 +05:30
acf9bca19f
Bug 755145 - Define CCACHE_CPP2 when using ccache and Clang. r=glandium.
2012-07-19 09:20:46 -04:00
7a4740ceb8
Bug 781479 - Remove unused Tru64 and QNX rules. r=khuey
2012-08-13 15:41:04 +09:00
bfff055672
Bug 370750 - consolidate mochitest files installation; r=glandium
...
With assistance on the patch from Ms2ger, Waldo, and Mossop.
2012-07-03 16:49:02 -04:00
971a4f9c02
Bug 769460 - Add a build time option for enabling per-window private browsing; r=glandium
2012-07-06 15:07:51 -04:00
1edc7b1c90
Bug 771870 - Avoid js/src/Makefile being created with wrong topsrcdir. r=khuey
2012-07-09 15:47:26 +02:00
7c181001da
Bug 762864 - Ship webapprt locale files in webapprt chrome. r=bsmedberg
2012-07-12 08:30:58 +02:00
79907c742a
Bug 777166 - Use CFLAGS from pkgconfig for system libvpx, r=derf
...
From c445b9ab36a0c79aa1be2dfbd91438e994bccb4e Mon Sep 17 00:00:00 2001
---
config/autoconf.mk.in | 2 +-
configure.in | 8 +++++---
content/media/webm/Makefile.in | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
2012-07-25 19:54:23 +00:00
31fe3efb2e
Bug 778414. Fix clang builds on OpenBSD/i386. r=glandium
2012-07-30 17:57:04 +02:00
6a427d0056
Merge from mozilla-central.
2012-06-26 15:37:34 -07:00
1222b46c77
Merge from mozilla-central.
...
--HG--
extra : rebase_source : 521cbf2f434cad88106f32be797faae4861afc39
2012-06-25 13:09:36 -07:00
76d894b2f9
Merge mozilla-central into services-central
2012-06-25 13:40:04 -07:00
b71c8ae6be
Bug 765294 - Fix packaging of services components; r=ted
2012-06-22 09:27:01 -07:00
4e5eecb03d
Bug 763987 - Normalize autoconf.mk.in. r=ted
2012-06-20 09:00:48 +02:00
a93eb5a48f
Backout changeset 6984dace6afb (bug 763987) because of OSX opt jsreftest bustage
2012-06-20 10:55:59 +02:00
cd69374e33
Bug 763987 - Normalize autoconf.mk.in. r=ted
2012-06-20 09:00:48 +02:00
a937af094c
Bug 755724 part A - add makefile variable DIST_SUBDIR to ship code to a subdirectory of dist/bin, r=ted
...
--HG--
extra : rebase_source : ef52dff3c4f42b99148e99335ee82d9a207faf46
2012-06-19 10:45:24 -04:00
691604f920
Bug 766793: Look for .pp files for shared libraries. r=ted a=philor for landing on a CLOSED TREE
2012-08-23 13:32:37 -07:00
9f50415300
Bug 784262 - Use generic install/copy rule in rules.mk. r=ted
2012-08-29 08:55:57 +02:00
cf3261c683
Bug 781498 - Conditionally install TESTING_JS_MODULES; r=glandium
...
Previously, installation was unconditional. It should be conditional on
ENABLE_TESTS.
--HG--
extra : rebase_source : 8fb11f96f4c776ee13ede2320ecc6b67d7e68971
2012-09-10 11:46:03 -07:00
749ac7a88d
bug 786708: remove unmatched paren from AUTOUPDATE_CONFIGURE
2012-08-30 14:29:38 -04:00
2e039591ee
Merge from mozilla-central.
...
--HG--
rename : js/xpconnect/src/XPCThreadContext.cpp => js/xpconnect/src/XPCJSContextStack.cpp
2012-06-22 14:26:15 -07:00
1a676b6d41
Merge from mozilla-central.
2012-06-21 14:02:16 -07:00
99dd2a9400
Merge from mozilla-central.
...
--HG--
rename : accessible/src/msaa/CAccessibleText.cpp => accessible/src/msaa/ia2AccessibleText.cpp
rename : accessible/src/msaa/CAccessibleText.h => accessible/src/msaa/ia2AccessibleText.h
2012-06-20 17:36:56 -07:00
0dd273f1b9
Merge from mozilla-central.
2012-06-15 15:23:58 -07:00
b974a76383
Merge from mozilla-central.
...
--HG--
rename : accessible/src/html/nsHTMLTableAccessible.cpp => accessible/src/html/HTMLTableAccessible.cpp
rename : accessible/src/html/nsHTMLTableAccessible.h => accessible/src/html/HTMLTableAccessible.h
rename : accessible/src/xul/nsXULAlertAccessible.cpp => accessible/src/xul/XULAlertAccessible.cpp
rename : accessible/src/xul/nsXULAlertAccessible.h => accessible/src/xul/XULAlertAccessible.h
rename : accessible/src/xul/nsXULColorPickerAccessible.cpp => accessible/src/xul/XULColorPickerAccessible.cpp
rename : accessible/src/xul/nsXULColorPickerAccessible.h => accessible/src/xul/XULColorPickerAccessible.h
rename : accessible/src/xul/nsXULComboboxAccessible.cpp => accessible/src/xul/XULComboboxAccessible.cpp
rename : accessible/src/xul/nsXULComboboxAccessible.h => accessible/src/xul/XULComboboxAccessible.h
rename : accessible/src/xul/nsXULMenuAccessible.cpp => accessible/src/xul/XULMenuAccessible.cpp
rename : accessible/src/xul/nsXULMenuAccessible.h => accessible/src/xul/XULMenuAccessible.h
rename : accessible/src/xul/nsXULSliderAccessible.cpp => accessible/src/xul/XULSliderAccessible.cpp
rename : accessible/src/xul/nsXULSliderAccessible.h => accessible/src/xul/XULSliderAccessible.h
rename : accessible/src/xul/nsXULTabAccessible.cpp => accessible/src/xul/XULTabAccessible.cpp
rename : accessible/src/xul/nsXULTreeAccessible.cpp => accessible/src/xul/XULTreeAccessible.cpp
rename : accessible/src/xul/nsXULTreeAccessible.h => accessible/src/xul/XULTreeAccessible.h
rename : accessible/src/xul/nsXULTreeGridAccessible.cpp => accessible/src/xul/XULTreeGridAccessible.cpp
rename : accessible/src/xul/nsXULTreeGridAccessible.h => accessible/src/xul/XULTreeGridAccessible.h
2012-06-12 17:44:22 -07:00
73e00c8b3b
Merge m-c to ionmonkey
...
--HG--
rename : accessible/src/html/nsHTMLSelectAccessible.cpp => accessible/src/html/HTMLSelectAccessible.cpp
rename : accessible/src/html/nsHTMLSelectAccessible.h => accessible/src/html/HTMLSelectAccessible.h
rename : memory/jemalloc/jemalloc.c => memory/mozjemalloc/jemalloc.c
rename : memory/jemalloc/jemalloc.h => memory/mozjemalloc/jemalloc.h
2012-06-08 11:18:39 +02:00
5f2a19ee6e
Revert c39d36167b99 due to a horribly munged backout.
2012-06-10 19:44:50 -04:00
6d6c4efbab
Backout the bug 754202 backout due to orange.
2012-06-10 19:37:47 -04:00
1510749815
Bug 580408 - Glue for jemalloc 3.0.0. r=khuey
2012-06-07 10:41:59 +02:00
4b4e7df6c1
Merge m-c to Ionmonkey.
...
--HG--
rename : accessible/src/html/nsHyperTextAccessible.cpp => accessible/src/generic/HyperTextAccessible.cpp
rename : accessible/src/html/nsHyperTextAccessible.h => accessible/src/generic/HyperTextAccessible.h
rename : accessible/src/html/nsHTMLImageAccessible.cpp => accessible/src/generic/ImageAccessible.cpp
rename : accessible/src/html/nsHTMLImageAccessible.h => accessible/src/generic/ImageAccessible.h
rename : accessible/src/msaa/nsHyperTextAccessibleWrap.cpp => accessible/src/msaa/HyperTextAccessibleWrap.cpp
rename : accessible/src/msaa/nsHyperTextAccessibleWrap.h => accessible/src/msaa/HyperTextAccessibleWrap.h
2012-06-04 13:30:29 -07:00
7fa7186c92
Merging in version bump NO BUG
2012-06-04 12:36:59 -07:00
614a99f728
Bug 747393 - Avoid race condition creating directories in JarMaker. r=ted
2012-06-14 08:14:53 +02:00
97f6c0a2cf
bug 764037: correct paren placement in unit test
2012-06-12 14:34:44 -04:00
06cfb4acae
Bug 737969 - add missing MAKEPRI entry to autoconf.mk.in. r=mh+mozilla
2012-06-13 06:59:49 -05:00
c9140ea000
Bug 761218 - Get rid of the bogus $(DIST)/include/nsprpub include path. r=bsmedberg
2012-06-09 14:22:41 -04:00
169aba0505
Merge m-c onto Ionmonkey.
...
--HG--
rename : accessible/src/atk/nsAccessibleWrap.cpp => accessible/src/atk/AccessibleWrap.cpp
rename : accessible/src/atk/nsAccessibleWrap.h => accessible/src/atk/AccessibleWrap.h
rename : accessible/src/atk/nsDocAccessibleWrap.h => accessible/src/atk/DocAccessibleWrap.h
rename : accessible/src/base/nsAccessible.cpp => accessible/src/generic/Accessible.cpp
rename : accessible/src/base/nsAccessible.h => accessible/src/generic/Accessible.h
rename : accessible/src/base/nsDocAccessible.cpp => accessible/src/generic/DocAccessible.cpp
rename : accessible/src/base/nsDocAccessible.h => accessible/src/generic/DocAccessible.h
rename : accessible/src/mac/nsAccessibleWrap.h => accessible/src/mac/AccessibleWrap.h
rename : accessible/src/mac/nsAccessibleWrap.mm => accessible/src/mac/AccessibleWrap.mm
rename : accessible/src/mac/nsDocAccessibleWrap.h => accessible/src/mac/DocAccessibleWrap.h
rename : accessible/src/mac/nsDocAccessibleWrap.mm => accessible/src/mac/DocAccessibleWrap.mm
rename : accessible/src/msaa/nsAccessibleWrap.cpp => accessible/src/msaa/AccessibleWrap.cpp
rename : accessible/src/msaa/nsDocAccessibleWrap.cpp => accessible/src/msaa/DocAccessibleWrap.cpp
rename : accessible/src/msaa/nsTextAccessibleWrap.cpp => accessible/src/msaa/TextLeafAccessibleWrap.cpp
rename : accessible/src/msaa/nsTextAccessibleWrap.h => accessible/src/msaa/TextLeafAccessibleWrap.h
rename : netwerk/protocol/http/SpdySession.cpp => netwerk/protocol/http/SpdySession2.cpp
rename : netwerk/protocol/http/SpdySession.h => netwerk/protocol/http/SpdySession2.h
rename : netwerk/protocol/http/SpdySession.cpp => netwerk/protocol/http/SpdySession3.cpp
rename : netwerk/protocol/http/SpdySession.h => netwerk/protocol/http/SpdySession3.h
rename : netwerk/protocol/http/SpdyStream.cpp => netwerk/protocol/http/SpdyStream2.cpp
rename : netwerk/protocol/http/SpdyStream.cpp => netwerk/protocol/http/SpdyStream3.cpp
2012-05-31 17:17:52 -07:00
ab29e418d9
Fixup for pymake after bug 763987. r=ted
2012-06-21 14:50:42 +02:00
68d38d677f
Bug 759095 - upgrade license to MPL 2, and other licensing cleanups.
...
--HG--
extra : rebase_source : da55a4937383eda2baf7c9a362501da8ee664146
2012-05-29 16:52:43 +01:00
0edea6e242
Bug 757637: Rollup makesystem changes for webrtc r=khuey r=ted f=glandium
2012-06-20 07:27:43 -04:00
18fd5e63bd
Merge from mozilla-central.
2012-05-23 14:33:15 -07:00
6e0f3d35c3
Merge from mozilla-central.
2012-05-22 16:56:19 -07:00
edaeadf3ad
Merge from mozilla-central.
2012-05-21 14:40:04 -07:00
82ff7027aa
Bug 716478 - update licence to MPL 2.
2012-05-21 12:12:37 +01:00
1a30fc81ab
Bug 740795 part B - make nsinstall.py accept an "-X" flag to exclude files when copying directories recursively, r=ted
...
--HG--
extra : rebase_source : 83107535ea0fa76cf35c4a70c9e9cefb4178274b
2012-05-18 12:42:01 -04:00
cadf177fc3
Bug 756944 - Import ALSA cubeb backend. r=doublec
2012-05-21 15:54:17 +12:00
025f49633e
Bug 732124 - Fix for crt link errors with VC11 - build glue using both the static and the dynamic runtime lib, and link accordingly for various components. r=ted
2012-05-21 16:31:03 -05:00
4f54c3b9c9
Bug 767024 - Allow dependentlibs.py to work when cross-compiling for Android on OSX. r=khuey
2012-06-22 18:33:17 +02:00
d107f621a7
Bug 766975 - Rename OBJS-related dependency files. r=khuey
2012-06-22 18:29:03 +02:00
e358a30437
Bug 759683 - Check for -mssse3 instead of inconditionally using it. r=glandium
2012-06-01 15:12:09 -07:00
aa216cfeec
bug 756443: Add mkdir_stem() to complement mkdir_deps. Strip extraneous slashes from given paths.
2012-06-01 17:26:50 -04:00
693dcc5c78
Merge from mozilla-central.
...
--HG--
rename : xpcom/ds/CheckedInt.h => mfbt/CheckedInt.h
2012-05-16 15:39:10 -07:00
1a6b8bf093
Merge from mozilla-central.
2012-05-15 10:22:19 -07:00
David Anderson
Simon Montagu
Mike Hommey
Ed Morley
Siddharth Agarwal
Gregory Szorc
Sean DuBois
Masatoshi Kimura
Dão Gottwald
Jonathan Watt
Makoto Kato
Ms2ger
Rafael Ávila de Espíndola
Nathan Froyd
Ehsan Akhgari
Bugmenot
Landry Breuil
Benjamin Smedberg
Kyle Huey
Joey Armstrong
Jan de Mooij
Ryan VanderMeulen
Sean Stangl
Lukas Blakk
Jim Mathies
Gervase Markham
Randell Jesup
Matthew Gregan