Backed out 4 changeset (bug 1284406) for build bustage on CLOSED TREE

--HG--
extra : amend_source : 9ad3b754789e60fe021f5b1989d7063cea8ca457
extra : histedit_source : 66c8b4fc923335e88a4593fd900c6c2cf57f6123%2C0f634c3c453a5d922de0e4e66dac69deec9f729c

build/autoconf/icu.m4

@@ -16,10 +16,11 @@ MOZ_ARG_WITH_BOOL(system-icu,
 
 if test -n "$MOZ_SYSTEM_ICU"; then
     PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
-    CFLAGS="$CFLAGS $MOZ_ICU_CFLAGS"
-    CXXFLAGS="$CXXFLAGS $MOZ_ICU_CFLAGS"
+else
+    MOZ_ICU_INCLUDES="/intl/icu/source/common /intl/icu/source/i18n"
 fi
 
+AC_SUBST_LIST(MOZ_ICU_INCLUDES)
 AC_SUBST(MOZ_SYSTEM_ICU)
 
 MOZ_ARG_WITH_STRING(intl-api,

config/external/icu/common/moz.build

@@ -17,7 +17,7 @@ DEFINES['U_COMMON_IMPLEMENTATION'] = True
 #FIXME: should probably stop including mozilla-config.h
 DEFINES['LOCALE_SNAME'] = 0x5c
 
-LOCAL_INCLUDES += ['/intl/icu/source/i18n']
+LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
 
 include('../defs.mozbuild')
 include('sources.mozbuild')

config/external/icu/common/sources.mozbuild

@@ -179,92 +179,3 @@ SOURCES += [
    '/intl/icu/source/common/uvectr64.cpp',
    '/intl/icu/source/common/wintz.c',
 ]
-
-EXPORTS.unicode += [
-   '/intl/icu/source/common/unicode/appendable.h',
-   '/intl/icu/source/common/unicode/brkiter.h',
-   '/intl/icu/source/common/unicode/bytestream.h',
-   '/intl/icu/source/common/unicode/bytestrie.h',
-   '/intl/icu/source/common/unicode/bytestriebuilder.h',
-   '/intl/icu/source/common/unicode/caniter.h',
-   '/intl/icu/source/common/unicode/chariter.h',
-   '/intl/icu/source/common/unicode/dbbi.h',
-   '/intl/icu/source/common/unicode/docmain.h',
-   '/intl/icu/source/common/unicode/dtintrv.h',
-   '/intl/icu/source/common/unicode/enumset.h',
-   '/intl/icu/source/common/unicode/errorcode.h',
-   '/intl/icu/source/common/unicode/filteredbrk.h',
-   '/intl/icu/source/common/unicode/icudataver.h',
-   '/intl/icu/source/common/unicode/icuplug.h',
-   '/intl/icu/source/common/unicode/idna.h',
-   '/intl/icu/source/common/unicode/listformatter.h',
-   '/intl/icu/source/common/unicode/localpointer.h',
-   '/intl/icu/source/common/unicode/locid.h',
-   '/intl/icu/source/common/unicode/messagepattern.h',
-   '/intl/icu/source/common/unicode/normalizer2.h',
-   '/intl/icu/source/common/unicode/normlzr.h',
-   '/intl/icu/source/common/unicode/parseerr.h',
-   '/intl/icu/source/common/unicode/parsepos.h',
-   '/intl/icu/source/common/unicode/platform.h',
-   '/intl/icu/source/common/unicode/ptypes.h',
-   '/intl/icu/source/common/unicode/putil.h',
-   '/intl/icu/source/common/unicode/rbbi.h',
-   '/intl/icu/source/common/unicode/rep.h',
-   '/intl/icu/source/common/unicode/resbund.h',
-   '/intl/icu/source/common/unicode/schriter.h',
-   '/intl/icu/source/common/unicode/std_string.h',
-   '/intl/icu/source/common/unicode/strenum.h',
-   '/intl/icu/source/common/unicode/stringpiece.h',
-   '/intl/icu/source/common/unicode/stringtriebuilder.h',
-   '/intl/icu/source/common/unicode/symtable.h',
-   '/intl/icu/source/common/unicode/ubidi.h',
-   '/intl/icu/source/common/unicode/ubrk.h',
-   '/intl/icu/source/common/unicode/ucasemap.h',
-   '/intl/icu/source/common/unicode/ucat.h',
-   '/intl/icu/source/common/unicode/uchar.h',
-   '/intl/icu/source/common/unicode/ucharstrie.h',
-   '/intl/icu/source/common/unicode/ucharstriebuilder.h',
-   '/intl/icu/source/common/unicode/uchriter.h',
-   '/intl/icu/source/common/unicode/uclean.h',
-   '/intl/icu/source/common/unicode/ucnv.h',
-   '/intl/icu/source/common/unicode/ucnv_cb.h',
-   '/intl/icu/source/common/unicode/ucnv_err.h',
-   '/intl/icu/source/common/unicode/ucnvsel.h',
-   '/intl/icu/source/common/unicode/uconfig.h',
-   '/intl/icu/source/common/unicode/udata.h',
-   '/intl/icu/source/common/unicode/uenum.h',
-   '/intl/icu/source/common/unicode/uidna.h',
-   '/intl/icu/source/common/unicode/uiter.h',
-   '/intl/icu/source/common/unicode/ulistformatter.h',
-   '/intl/icu/source/common/unicode/uloc.h',
-   '/intl/icu/source/common/unicode/umachine.h',
-   '/intl/icu/source/common/unicode/umisc.h',
-   '/intl/icu/source/common/unicode/unifilt.h',
-   '/intl/icu/source/common/unicode/unifunct.h',
-   '/intl/icu/source/common/unicode/unimatch.h',
-   '/intl/icu/source/common/unicode/uniset.h',
-   '/intl/icu/source/common/unicode/unistr.h',
-   '/intl/icu/source/common/unicode/unorm.h',
-   '/intl/icu/source/common/unicode/unorm2.h',
-   '/intl/icu/source/common/unicode/uobject.h',
-   '/intl/icu/source/common/unicode/urename.h',
-   '/intl/icu/source/common/unicode/urep.h',
-   '/intl/icu/source/common/unicode/ures.h',
-   '/intl/icu/source/common/unicode/uscript.h',
-   '/intl/icu/source/common/unicode/uset.h',
-   '/intl/icu/source/common/unicode/usetiter.h',
-   '/intl/icu/source/common/unicode/ushape.h',
-   '/intl/icu/source/common/unicode/usprep.h',
-   '/intl/icu/source/common/unicode/ustring.h',
-   '/intl/icu/source/common/unicode/ustringtrie.h',
-   '/intl/icu/source/common/unicode/utext.h',
-   '/intl/icu/source/common/unicode/utf.h',
-   '/intl/icu/source/common/unicode/utf16.h',
-   '/intl/icu/source/common/unicode/utf32.h',
-   '/intl/icu/source/common/unicode/utf8.h',
-   '/intl/icu/source/common/unicode/utf_old.h',
-   '/intl/icu/source/common/unicode/utrace.h',
-   '/intl/icu/source/common/unicode/utypes.h',
-   '/intl/icu/source/common/unicode/uvernum.h',
-   '/intl/icu/source/common/unicode/uversion.h',
-]

config/external/icu/i18n/moz.build

@@ -9,7 +9,7 @@ FINAL_LIBRARY = 'icu'
 
 DEFINES['U_I18N_IMPLEMENTATION'] = True
 
-LOCAL_INCLUDES += ['/intl/icu/source/common']
+LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
 
 include('../defs.mozbuild')
 include('sources.mozbuild')

config/external/icu/i18n/sources.mozbuild

@@ -199,87 +199,3 @@ SOURCES += [
    '/intl/icu/source/i18n/zrule.cpp',
    '/intl/icu/source/i18n/ztrans.cpp',
 ]
-
-EXPORTS.unicode += [
-   '/intl/icu/source/i18n/unicode/alphaindex.h',
-   '/intl/icu/source/i18n/unicode/basictz.h',
-   '/intl/icu/source/i18n/unicode/calendar.h',
-   '/intl/icu/source/i18n/unicode/choicfmt.h',
-   '/intl/icu/source/i18n/unicode/coleitr.h',
-   '/intl/icu/source/i18n/unicode/coll.h',
-   '/intl/icu/source/i18n/unicode/compactdecimalformat.h',
-   '/intl/icu/source/i18n/unicode/curramt.h',
-   '/intl/icu/source/i18n/unicode/currpinf.h',
-   '/intl/icu/source/i18n/unicode/currunit.h',
-   '/intl/icu/source/i18n/unicode/datefmt.h',
-   '/intl/icu/source/i18n/unicode/dcfmtsym.h',
-   '/intl/icu/source/i18n/unicode/decimfmt.h',
-   '/intl/icu/source/i18n/unicode/dtfmtsym.h',
-   '/intl/icu/source/i18n/unicode/dtitvfmt.h',
-   '/intl/icu/source/i18n/unicode/dtitvinf.h',
-   '/intl/icu/source/i18n/unicode/dtptngen.h',
-   '/intl/icu/source/i18n/unicode/dtrule.h',
-   '/intl/icu/source/i18n/unicode/fieldpos.h',
-   '/intl/icu/source/i18n/unicode/fmtable.h',
-   '/intl/icu/source/i18n/unicode/format.h',
-   '/intl/icu/source/i18n/unicode/fpositer.h',
-   '/intl/icu/source/i18n/unicode/gender.h',
-   '/intl/icu/source/i18n/unicode/gregocal.h',
-   '/intl/icu/source/i18n/unicode/locdspnm.h',
-   '/intl/icu/source/i18n/unicode/measfmt.h',
-   '/intl/icu/source/i18n/unicode/measunit.h',
-   '/intl/icu/source/i18n/unicode/measure.h',
-   '/intl/icu/source/i18n/unicode/msgfmt.h',
-   '/intl/icu/source/i18n/unicode/numfmt.h',
-   '/intl/icu/source/i18n/unicode/numsys.h',
-   '/intl/icu/source/i18n/unicode/plurfmt.h',
-   '/intl/icu/source/i18n/unicode/plurrule.h',
-   '/intl/icu/source/i18n/unicode/rbnf.h',
-   '/intl/icu/source/i18n/unicode/rbtz.h',
-   '/intl/icu/source/i18n/unicode/regex.h',
-   '/intl/icu/source/i18n/unicode/region.h',
-   '/intl/icu/source/i18n/unicode/reldatefmt.h',
-   '/intl/icu/source/i18n/unicode/scientificnumberformatter.h',
-   '/intl/icu/source/i18n/unicode/search.h',
-   '/intl/icu/source/i18n/unicode/selfmt.h',
-   '/intl/icu/source/i18n/unicode/simpletz.h',
-   '/intl/icu/source/i18n/unicode/smpdtfmt.h',
-   '/intl/icu/source/i18n/unicode/sortkey.h',
-   '/intl/icu/source/i18n/unicode/stsearch.h',
-   '/intl/icu/source/i18n/unicode/tblcoll.h',
-   '/intl/icu/source/i18n/unicode/timezone.h',
-   '/intl/icu/source/i18n/unicode/tmunit.h',
-   '/intl/icu/source/i18n/unicode/tmutamt.h',
-   '/intl/icu/source/i18n/unicode/tmutfmt.h',
-   '/intl/icu/source/i18n/unicode/translit.h',
-   '/intl/icu/source/i18n/unicode/tzfmt.h',
-   '/intl/icu/source/i18n/unicode/tznames.h',
-   '/intl/icu/source/i18n/unicode/tzrule.h',
-   '/intl/icu/source/i18n/unicode/tztrans.h',
-   '/intl/icu/source/i18n/unicode/ucal.h',
-   '/intl/icu/source/i18n/unicode/ucol.h',
-   '/intl/icu/source/i18n/unicode/ucoleitr.h',
-   '/intl/icu/source/i18n/unicode/ucsdet.h',
-   '/intl/icu/source/i18n/unicode/ucurr.h',
-   '/intl/icu/source/i18n/unicode/udat.h',
-   '/intl/icu/source/i18n/unicode/udateintervalformat.h',
-   '/intl/icu/source/i18n/unicode/udatpg.h',
-   '/intl/icu/source/i18n/unicode/udisplaycontext.h',
-   '/intl/icu/source/i18n/unicode/ufieldpositer.h',
-   '/intl/icu/source/i18n/unicode/uformattable.h',
-   '/intl/icu/source/i18n/unicode/ugender.h',
-   '/intl/icu/source/i18n/unicode/uldnames.h',
-   '/intl/icu/source/i18n/unicode/ulocdata.h',
-   '/intl/icu/source/i18n/unicode/umsg.h',
-   '/intl/icu/source/i18n/unicode/unirepl.h',
-   '/intl/icu/source/i18n/unicode/unum.h',
-   '/intl/icu/source/i18n/unicode/unumsys.h',
-   '/intl/icu/source/i18n/unicode/upluralrules.h',
-   '/intl/icu/source/i18n/unicode/uregex.h',
-   '/intl/icu/source/i18n/unicode/uregion.h',
-   '/intl/icu/source/i18n/unicode/usearch.h',
-   '/intl/icu/source/i18n/unicode/uspoof.h',
-   '/intl/icu/source/i18n/unicode/utmscale.h',
-   '/intl/icu/source/i18n/unicode/utrans.h',
-   '/intl/icu/source/i18n/unicode/vtzone.h',
-]

config/external/icu/stubdata/moz.build

@@ -10,4 +10,6 @@
 
 Library('icustubdata')
 
+LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
+
 SOURCES += ['/intl/icu/source/stubdata/stubdata.c']

dom/indexedDB/moz.build

@@ -100,6 +100,10 @@ if CONFIG['GNU_CC']:
     SOURCES['Key.cpp'].flags += ['-Wno-error=type-limits']
     CXXFLAGS += ['-Wno-error=shadow']
 
+if CONFIG['_MSC_VER']:
+    # This is intended as a temporary hack to support building with VS2015.
+    CXXFLAGS += ['-wd4577']
+
 LOCAL_INCLUDES += [
     '/db/sqlite3/src',
     '/dom/base',
@@ -109,3 +113,7 @@ LOCAL_INCLUDES += [
     '/xpcom/build',
     '/xpcom/threads',
 ]
+
+if CONFIG['ENABLE_INTL_API']:
+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+    LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']

gfx/thebes/moz.build

@@ -236,6 +236,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
 # We prefer to use ICU for normalization functions, but currently it is only
 # available if we're building with the Intl API enabled:
 if CONFIG['ENABLE_INTL_API']:
+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+    CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+    LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
     USE_LIBS += [
         'icu',
     ]
@@ -288,3 +291,7 @@ DEFINES['GRAPHITE2_STATIC'] = True
 if CONFIG['CLANG_CXX']:
     # Suppress warnings from Skia header files.
     SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
+
+if CONFIG['_MSC_VER']:
+    # This is intended as a temporary hack to support building with VS2015.
+    CXXFLAGS += ['-wd4577']

intl/build/moz.build

@@ -9,6 +9,8 @@ SOURCES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
 LOCAL_INCLUDES += [
     '../locale',
     '../lwbrk',

intl/icu_sources_data.py

@@ -44,24 +44,12 @@ def get_sources_from_makefile(makefile):
                           key=lambda x: x.lower())
 
 
-def list_headers(path):
-    result = []
-    for name in os.listdir(path):
-        f = mozpath.join(path, name)
-        if os.path.isfile(f):
-            result.append(f)
-    return sorted(result, key=lambda x: x.lower())
-
-
-def write_sources(mozbuild, sources, headers):
+def write_sources(mozbuild, sources):
     with open(mozbuild, 'wb') as f:
         f.write('# THIS FILE IS GENERATED BY /intl/icu_sources_data.py ' +
                 'DO NOT EDIT\n' +
                 'SOURCES += [\n')
         f.write(''.join("   '/%s',\n" % s for s in sources))
-        f.write(']\n\n')
-        f.write('EXPORTS.unicode += [\n')
-        f.write(''.join("   '/%s',\n" % s for s in headers))
         f.write(']\n')
 
 
@@ -69,15 +57,13 @@ def update_sources(topsrcdir):
     print('Updating ICU sources lists...')
     sys.path.append(mozpath.join(topsrcdir, 'build/pymake'))
     for d in ['common', 'i18n']:
-        base_path = mozpath.join(topsrcdir, 'intl/icu/source/%s' % d)
-        makefile = mozpath.join(base_path, 'Makefile.in')
+        makefile = mozpath.join(topsrcdir,
+                                'intl/icu/source/%s/Makefile.in' % d)
         mozbuild = mozpath.join(topsrcdir,
                                 'config/external/icu/%s/sources.mozbuild' % d)
         sources = [mozpath.relpath(s, topsrcdir)
                    for s in get_sources_from_makefile(makefile)]
-        headers = [mozpath.normsep(os.path.relpath(s, topsrcdir))
-                   for s in list_headers(mozpath.join(base_path, 'unicode'))]
-        write_sources(mozbuild, sources, headers)
+        write_sources(mozbuild, sources)
 
 
 def try_run(name, command, cwd=None, **kwargs):

intl/locale/mac/moz.build

@@ -11,6 +11,8 @@ UNIFIED_SOURCES += [
 ]
 
 FINAL_LIBRARY = 'xul'
+CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
 LOCAL_INCLUDES += [
     '..',
 ]

intl/unicharutil/util/internal/moz.build

@@ -18,4 +18,14 @@ LOCAL_INCLUDES += [
     '..',
 ]
 
+if CONFIG['ENABLE_INTL_API']:
+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+    LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
+
 DIST_INSTALL = True
+
+if CONFIG['_MSC_VER']:
+    # This is intended as a temporary hack to support building with VS2015.
+    # 'noexcept' used with no exception handling mode specified;
+    # termination on exception is not guaranteed. Specify /EHsc
+    CXXFLAGS += ['-wd4577']

intl/unicharutil/util/moz.build

@@ -40,6 +40,8 @@ if CONFIG['_MSC_VER']:
     CXXFLAGS += ['-Zl']
 
 if CONFIG['ENABLE_INTL_API']:
+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+    LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
     USE_LIBS += ['icu']
 
 DIST_INSTALL = True

js/src/moz.build

@@ -731,6 +731,7 @@ OS_LIBS += CONFIG['REALTIME_LIBS']
 
 CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
 CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
 
 NO_EXPAND_LIBS = True
 

layout/forms/moz.build

@@ -52,5 +52,17 @@ LOCAL_INCLUDES += [
     '/dom/html',
 ]
 
+if CONFIG['ENABLE_INTL_API']:
+    # nsNumberControlFrame.cpp requires ICUUtils.h which in turn requires
+    # i18n/unum.h
+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+    LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
+
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['_MSC_VER']:
+    # This is intended as a temporary hack to support building with VS2015.
+    # 'noexcept' used with no exception handling mode specified;
+    # termination on exception is not guaranteed. Specify /EHsc
+    CXXFLAGS += ['-wd4577']

netwerk/dns/moz.build

@@ -68,6 +68,9 @@ LOCAL_INCLUDES += [
 
 if CONFIG['ENABLE_INTL_API']:
     DEFINES['IDNA2008'] = True
+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+    CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+    LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
     USE_LIBS += ['icu']
 else:
     UNIFIED_SOURCES += [
@@ -76,3 +79,10 @@ else:
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
+
+if CONFIG['_MSC_VER']:
+    # This is intended as a temporary hack to support building with VS2015.
+    # icu\source\common\unicode/ucasemap.h(93): warning C4577:
+    # 'noexcept' used with no exception handling mode specified;
+    # termination on exception is not guaranteed. Specify /EHsc from unified dns
+    CXXFLAGS += ['-wd4577']

old-configure.in

@@ -339,11 +339,6 @@ case "$target" in
             CFLAGS="$CFLAGS -wd4091"
             CXXFLAGS="$CXXFLAGS -wd4091"
 
-            # This is intended as a temporary hack to support building with VS2015.
-            # 'noexcept' used with no exception handling mode specified;
-            # termination on exception is not guaranteed. Specify /EHsc
-            CXXFLAGS="$CXXFLAGS -wd4577"
-
             if test -n "$WIN_UCRT_REDIST_DIR"; then
               if test ! -d "$WIN_UCRT_REDIST_DIR"; then
                 AC_MSG_ERROR([Invalid Windows UCRT Redist directory: ${WIN_UCRT_REDIST_DIR}])

xpcom/build/moz.build

@@ -100,3 +100,6 @@ if CONFIG['MOZ_VPX']:
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CXXFLAGS += CONFIG['TK_CFLAGS']
+
+CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
+LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']