Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1100184 - Use absolute paths in /network local includes. r=gps

Browse Source 
--HG--
extra : rebase_source : d7c10a04b8d3822ea20ca37537c7947c3ba88b3f
This commit is contained in:
James Kitchener 2015-01-16 20:41:06 +10:30
parent afbc3ea6ed
commit 1bd934d3a1
21 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CLOBBER
View File

@ -22,5 +22,5 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Bug 1061240 - Lots of file renames in the libjpeg-turbo update and zero faith
Bug 1100184 - Lots of file moves from the /netwerk flattening and zero faith
in the build system to properly handle them.

38
netwerk/build/moz.build
View File

@ -21,63 +21,63 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../base',
'../cache',
'../dns',
'../mime',
'../protocol/about',
'../protocol/app',
'../socket',
'../streamconv',
'../streamconv/converters',
'/netwerk/base',
'/netwerk/cache',
'/netwerk/dns',
'/netwerk/mime',
'/netwerk/protocol/about',
'/netwerk/protocol/app',
'/netwerk/socket',
'/netwerk/streamconv',
'/netwerk/streamconv/converters',
]
protocols = CONFIG['NECKO_PROTOCOLS'].copy()
protocols.remove("about")
LOCAL_INCLUDES += sorted([
'../protocol/%s' % d for d in protocols
'/netwerk/protocol/%s' % d for d in protocols
])
if CONFIG['OS_ARCH'] == 'WINNT':
LOCAL_INCLUDES += [
'../system/win32',
'/netwerk/system/win32',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
LOCAL_INCLUDES += [
'../system/mac',
'/netwerk/system/mac',
]
if CONFIG['MOZ_ENABLE_QTNETWORK']:
LOCAL_INCLUDES += [
'../system/qt',
'/netwerk/system/qt',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
LOCAL_INCLUDES += [
'../system/android',
'/netwerk/system/android',
]
elif CONFIG['OS_ARCH'] == 'Linux':
LOCAL_INCLUDES += [
'../system/linux',
'/netwerk/system/linux',
]
if CONFIG['NECKO_COOKIES']:
LOCAL_INCLUDES += [
'../cookie',
'/netwerk/cookie',
]
if CONFIG['NECKO_WIFI']:
LOCAL_INCLUDES += [
'../wifi',
'/netwerk/wifi',
]
if CONFIG['MOZ_RTSP']:
LOCAL_INCLUDES += [
'../protocol/rtsp',
'/netwerk/protocol/rtsp',
]
GENERATED_INCLUDES += [
'../dns',
'/netwerk/dns',
]

2
netwerk/cache/moz.build vendored
View File

@ -48,5 +48,5 @@ MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../base',
'/netwerk/base',
]

4
netwerk/cache2/moz.build
View File

@ -48,8 +48,8 @@ SOURCES += [
]
LOCAL_INCLUDES += [
'../base',
'../cache',
'/netwerk/base',
'/netwerk/cache',
]
FAIL_ON_WARNINGS = True

2
netwerk/dns/moz.build
View File

@ -62,5 +62,5 @@ GENERATED_FILES = [
# need to include etld_data.inc
LOCAL_INCLUDES += [
'../base',
'/netwerk/base',
]

4
netwerk/ipc/moz.build
View File

@ -45,8 +45,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../base',
'../protocol/http',
'/caps',
'/modules/libjar',
'/netwerk/base',
'/netwerk/protocol/http',
]

4
netwerk/protocol/about/moz.build
View File

@ -29,6 +29,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'../../cache2',
'/netwerk/base',
'/netwerk/cache2',
]

4
netwerk/protocol/app/moz.build
View File

@ -12,8 +12,8 @@ FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../../modules/libjar',
'../../base',
'/caps',
'/modules/libjar',
'/netwerk/base',
]

2
netwerk/protocol/data/moz.build
View File

@ -13,6 +13,6 @@ FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/netwerk/base',
]

2
netwerk/protocol/device/moz.build
View File

@ -25,5 +25,5 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base/',
'/netwerk/base/',
]

2
netwerk/protocol/file/moz.build
View File

@ -23,5 +23,5 @@ MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/netwerk/base',
]

2
netwerk/protocol/ftp/moz.build
View File

@ -41,5 +41,5 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/netwerk/base',
]

2
netwerk/protocol/http/moz.build
View File

@ -108,6 +108,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/dom/base',
'/netwerk/base',
]

2
netwerk/protocol/rtsp/moz.build
View File

@ -60,8 +60,8 @@ DEFINES['IMPL_NS_NET'] = True
DEFINES['FORCE_PR_LOG'] = True
LOCAL_INCLUDES += [
'../../base',
'/dom/base',
'/netwerk/base',
'controller',
'rtsp',
]

2
netwerk/protocol/viewsource/moz.build
View File

@ -19,6 +19,6 @@ FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/netwerk/base',
]

2
netwerk/protocol/websocket/moz.build
View File

@ -40,6 +40,6 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/dom/base',
'/netwerk/base',
]

2
netwerk/protocol/wyciwyg/moz.build
View File

@ -36,5 +36,5 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/netwerk/base',
]

2
netwerk/sctp/datachannel/moz.build
View File

@ -21,8 +21,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../src',
'/media/mtransport',
'/netwerk/sctp/src',
]
DEFINES['INET'] = 1

2
netwerk/sctp/src/moz.build
View File

@ -46,8 +46,8 @@ include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/dom/base',
'/netwerk/base',
]
for var in ('SCTP_SIMPLE_ALLOCATOR',

2
netwerk/system/android/moz.build
View File

@ -12,6 +12,6 @@ FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/netwerk/base',
]

2
netwerk/system/qt/moz.build
View File

@ -17,7 +17,7 @@ FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../base',
'/netwerk/base',
]
CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']