Skip to content

Commit 2f7c2dc

Browse files
harthurharthur
committed
Merge branch 'fx-team' of git://github.com/mozilla/mozilla-central
2 parents af2956a + d5b57b6 commit 2f7c2dc

File tree

17,540 files changed

+1664220
-328635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

17,540 files changed

+1664220
-328635
lines changed

‎.hgtags‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,4 @@ fd72dbbd692012224145be1bf13df1d7675fd277 FIREFOX_AURORA_17_BASE
9090
2704e441363fe2a48e992dfac694482dfd82664a FIREFOX_AURORA_18_BASE
9191
cf8750abee06cde395c659f8ecd8ae019d7512e3 FIREFOX_AURORA_19_BASE
9292
5bb309998e7050c9ee80b0147de1e473f008e221 FIREFOX_AURORA_20_BASE
93+
cc37417e2c284aed960f98ffa479de4ccdd5c7c3 FIREFOX_AURORA_21_BASE

‎CLOBBER‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515
#
1616
# Note: The description below will be part of the error message shown to users.
1717
#
18-
Bug 793928 - Move the promise library to a new location
18+
Bug 847890 appears to need a clobber

‎Makefile.in‎

Lines changed: 7 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -21,43 +21,6 @@ include $(DEPTH)/config/autoconf.mk
2121

2222
default::
2323

24-
TIERS += base
25-
26-
#
27-
# tier "base" - basic setup
28-
#
29-
tier_base_dirs = \
30-
config \
31-
build \
32-
probes \
33-
mfbt \
34-
python \
35-
$(NULL)
36-
37-
ifndef LIBXUL_SDK
38-
ifeq (android,$(MOZ_WIDGET_TOOLKIT))
39-
tier_base_dirs += \
40-
other-licenses/android \
41-
$(NULL)
42-
endif
43-
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
44-
tier_base_dirs += \
45-
other-licenses/android \
46-
$(NULL)
47-
endif
48-
49-
ifdef MOZ_MEMORY
50-
tier_base_dirs += memory
51-
endif
52-
ifndef MOZ_NATIVE_ZLIB
53-
tier_base_dirs += modules/zlib
54-
endif
55-
tier_base_dirs += \
56-
mozglue \
57-
memory/mozalloc \
58-
$(NULL)
59-
endif
60-
6124
ifdef COMPILE_ENVIRONMENT
6225
include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
6326
endif
@@ -210,3 +173,10 @@ scheck::
210173
endif
211174

212175
js/src/Makefile: subsrcdir := js/src
176+
177+
ifdef ENABLE_TESTS
178+
# Incorporate static tier directories into tests. This should be incorporated
179+
# into moz.build files someday.
180+
check::
181+
$(call SUBMAKE,$@,js/src)
182+
endif

‎accessible/Makefile.in‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ VPATH = @srcdir@
1111
include $(DEPTH)/config/autoconf.mk
1212

1313
MODULE = accessibility
14-
DIRS = public src build
15-
16-
TEST_DIRS += tests
1714

1815
include $(topsrcdir)/config/rules.mk
1916

‎accessible/build/Makefile.in‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,19 @@ SHARED_LIBRARY_LIBS = \
2828
../src/generic/$(LIB_PREFIX)accessibility_generic_s.$(LIB_SUFFIX) \
2929
../src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \
3030
../src/xpcom/$(LIB_PREFIX)accessibility_xpcom_s.$(LIB_SUFFIX) \
31-
../src/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \
3231
$(NULL)
3332

3433
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
3534
SHARED_LIBRARY_LIBS += \
35+
../src/windows/msaa/$(LIB_PREFIX)accessibility_toolkit_msaa_s.$(LIB_SUFFIX) \
3636
../src/windows/ia2/$(LIB_PREFIX)accessibility_toolkit_ia2_s.$(LIB_SUFFIX) \
3737
../src/windows/sdn/$(LIB_PREFIX)accessibility_toolkit_sdn_s.$(LIB_SUFFIX) \
3838
../src/windows/uia/$(LIB_PREFIX)accessibility_toolkit_uia_s.$(LIB_SUFFIX) \
3939
$(NULL)
40+
else
41+
SHARED_LIBRARY_LIBS += \
42+
../src/$(LIB_PREFIX)accessibility_toolkit_s.$(LIB_SUFFIX) \
43+
$(NULL)
4044
endif
4145

4246
ifdef MOZ_XUL

‎accessible/build/moz.build‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# vim: set filetype=python:
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
5+

‎accessible/moz.build‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# vim: set filetype=python:
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
5+
6+
DIRS += ['public', 'src', 'build']
7+
TEST_DIRS += ['tests']

‎accessible/public/Makefile.in‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,9 @@ VPATH = @srcdir@
1010

1111
include $(DEPTH)/config/autoconf.mk
1212

13-
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
14-
DIRS = msaa ia2
15-
endif
16-
1713
MODULE = accessibility
18-
XPIDL_MODULE= accessibility
1914
GRE_MODULE = 1
2015

21-
XPIDLSRCS = \
22-
nsIAccessibleTypes.idl \
23-
nsIAccessibleRetrieval.idl \
24-
nsIAccessible.idl \
25-
nsIAccessibleApplication.idl \
26-
nsIAccessibleRelation.idl \
27-
nsIAccessibleRole.idl \
28-
nsIAccessibleStates.idl \
29-
nsIAccessibleDocument.idl \
30-
nsIAccessibleProvider.idl \
31-
nsIAccessibleSelectable.idl \
32-
nsIAccessibleCursorable.idl \
33-
nsIAccessibleEvent.idl \
34-
nsIAccessibleEditableText.idl \
35-
nsIAccessibleHyperLink.idl \
36-
nsIAccessibleHyperText.idl \
37-
nsIAccessiblePivot.idl \
38-
nsIAccessibleTable.idl \
39-
nsIAccessibleText.idl \
40-
nsIAccessibleValue.idl \
41-
nsIAccessibleImage.idl \
42-
nsIXBLAccessible.idl \
43-
$(NULL)
44-
4516
EXPORTS = \
4617
nsIAccessibilityService.h \
4718
$(NULL)

‎accessible/public/ia2/moz.build‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# vim: set filetype=python:
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
5+

‎accessible/public/moz.build‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# vim: set filetype=python:
2+
# This Source Code Form is subject to the terms of the Mozilla Public
3+
# License, v. 2.0. If a copy of the MPL was not distributed with this
4+
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
5+
6+
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
7+
DIRS += ['msaa', 'ia2']
8+
9+
XPIDL_SOURCES += [
10+
'nsIAccessible.idl',
11+
'nsIAccessibleApplication.idl',
12+
'nsIAccessibleCursorable.idl',
13+
'nsIAccessibleDocument.idl',
14+
'nsIAccessibleEditableText.idl',
15+
'nsIAccessibleEvent.idl',
16+
'nsIAccessibleHyperLink.idl',
17+
'nsIAccessibleHyperText.idl',
18+
'nsIAccessibleImage.idl',
19+
'nsIAccessiblePivot.idl',
20+
'nsIAccessibleProvider.idl',
21+
'nsIAccessibleRelation.idl',
22+
'nsIAccessibleRetrieval.idl',
23+
'nsIAccessibleRole.idl',
24+
'nsIAccessibleSelectable.idl',
25+
'nsIAccessibleStates.idl',
26+
'nsIAccessibleTable.idl',
27+
'nsIAccessibleText.idl',
28+
'nsIAccessibleTypes.idl',
29+
'nsIAccessibleValue.idl',
30+
'nsIXBLAccessible.idl',
31+
]
32+

0 commit comments

Comments
 (0)