Bug 1209398 - Make AC_SUBST_SET emit a list of unique items instead of an actual set. r=gps

While the name AC_SUBST_SET suggests the underlying type would be a set, it does
not actually matter that much in moz.build, and is not used that much anyways.
This commit is contained in:
Mike Hommey 2015-09-29 15:03:26 +09:00
parent 19c798623d
commit a4a5079554
2 changed files with 10 additions and 5 deletions

View File

@ -28,7 +28,7 @@ define([AC_SUBST_SET],
[ifdef([AC_SUBST_SET_$1], ,
[define([AC_SUBST_SET_$1], )dnl
AC_DIVERT_PUSH(MOZ_DIVERSION_SUBST)dnl
(''' $1 ''', set(r''' [$]$1 '''.split()))
(''' $1 ''', unique_list(r''' [$]$1 '''.split()))
AC_DIVERT_POP()dnl
])])])])
@ -129,6 +129,13 @@ topsrcdir = os.path.normpath(topsrcdir)
topobjdir = os.path.abspath(os.path.dirname(<<<__file__>>>))
def unique_list(l):
result = []
for i in l:
if l not in result:
result.append(i)
return result
dnl All defines and substs are stored with an additional space at the beginning
dnl and at the end of the string, to avoid any problem with values starting or
dnl ending with quotes.

View File

@ -28,11 +28,9 @@ LOCAL_INCLUDES += [
'/netwerk/streamconv/converters',
]
protocols = CONFIG['NECKO_PROTOCOLS'].copy()
if 'about' in protocols:
protocols.remove('about')
protocols = CONFIG['NECKO_PROTOCOLS']
LOCAL_INCLUDES += sorted([
'/netwerk/protocol/%s' % d for d in protocols
'/netwerk/protocol/%s' % d for d in protocols if d != 'about'
])
if CONFIG['OS_ARCH'] == 'WINNT':