Bug 1100184 - Use absolute paths in /network local includes. r=gps
authorJames Kitchener <jkitch.bug@internode.on.net>
Fri, 16 Jan 2015 20:41:06 +1030
changeset 251968 f778e224ff2793bbee3bf6b38af99cfdca4bf1c0
parent 251967 3de3af63a33f315e94b29963667184b9e067574a
child 251969 147d4f71335e066d23dbdf954662c215a615acb4
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1100184
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1100184 - Use absolute paths in /network local includes. r=gps
CLOBBER
netwerk/build/moz.build
netwerk/cache/moz.build
netwerk/cache2/moz.build
netwerk/dns/moz.build
netwerk/ipc/moz.build
netwerk/protocol/about/moz.build
netwerk/protocol/app/moz.build
netwerk/protocol/data/moz.build
netwerk/protocol/device/moz.build
netwerk/protocol/file/moz.build
netwerk/protocol/ftp/moz.build
netwerk/protocol/http/moz.build
netwerk/protocol/rtsp/moz.build
netwerk/protocol/viewsource/moz.build
netwerk/protocol/websocket/moz.build
netwerk/protocol/wyciwyg/moz.build
netwerk/sctp/datachannel/moz.build
netwerk/sctp/src/moz.build
netwerk/system/android/moz.build
netwerk/system/qt/moz.build
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,10 +17,10 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # 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.
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -16,68 +16,68 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 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',
 ]
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -43,10 +43,10 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../base',
+    '/netwerk/base',
 ]
--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -43,17 +43,17 @@ UNIFIED_SOURCES += [
 ]
 
 # AppCacheStorage.cpp cannot be built in unified mode because it uses plarena.h.
 SOURCES += [
     'AppCacheStorage.cpp',
 ]
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../cache',
+    '/netwerk/base',
+    '/netwerk/cache',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -57,10 +57,10 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 
 GENERATED_FILES = [
     'etld_data.inc',
 ]
 
 # need to include etld_data.inc
 LOCAL_INCLUDES += [
-    '../base',
+    '/netwerk/base',
 ]
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -40,13 +40,13 @@ IPDL_SOURCES = [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../protocol/http',
     '/caps',
     '/modules/libjar',
+    '/netwerk/base',
+    '/netwerk/protocol/http',
 ]
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -24,11 +24,11 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base',
-    '../../cache2',
+    '/netwerk/base',
+    '/netwerk/cache2',
 ]
--- a/netwerk/protocol/app/moz.build
+++ b/netwerk/protocol/app/moz.build
@@ -7,13 +7,13 @@
 SOURCES += [
     'AppProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../../modules/libjar',
-    '../../base',
     '/caps',
+    '/modules/libjar',
+    '/netwerk/base',
 ]
 
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -8,11 +8,11 @@ UNIFIED_SOURCES += [
     'nsDataChannel.cpp',
     'nsDataHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../base',
+    '/netwerk/base',
 ]
 
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -20,10 +20,10 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base/',
+    '/netwerk/base/',
 ]
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -18,10 +18,10 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base',
+    '/netwerk/base',
 ]
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -36,10 +36,10 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base',
+    '/netwerk/base',
 ]
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -103,11 +103,11 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base',
     '/dom/base',
+    '/netwerk/base',
 ]
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -55,18 +55,18 @@ if CONFIG['GNU_CC']:
   CXXFLAGS += ['-Wno-error=attributes']
 
 FINAL_LIBRARY = 'xul'
 
 DEFINES['IMPL_NS_NET'] = True
 DEFINES['FORCE_PR_LOG'] = True
 
 LOCAL_INCLUDES += [
-    '../../base',
     '/dom/base',
+    '/netwerk/base',
     'controller',
     'rtsp',
 ]
 
 for var in ('IMPL_NS_NET', 'FORCE_PR_LOG'):
     DEFINES[var] = True
 
 if CONFIG['ANDROID_VERSION'] == '15':
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -14,11 +14,11 @@ UNIFIED_SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../base',
+    '/netwerk/base',
 ]
 
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -35,11 +35,11 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base',
     '/dom/base',
+    '/netwerk/base',
 ]
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -31,10 +31,10 @@ IPDL_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base',
+    '/netwerk/base',
 ]
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@@ -16,18 +16,18 @@ SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../src',
     '/media/mtransport',
+    '/netwerk/sctp/src',
 ]
 
 DEFINES['INET'] = 1
 DEFINES['SCTP_DEBUG'] = 1
 
 if CONFIG['OS_TARGET'] != 'Android':
     DEFINES['INET6'] = 1
 
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -41,18 +41,18 @@ if CONFIG['OS_TARGET'] == 'Android':
 
 Library('nksctp_s')
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '../../base',
     '/dom/base',
+    '/netwerk/base',
 ]
 
 for var in ('SCTP_SIMPLE_ALLOCATOR',
             'SCTP_PROCESS_LEVEL_LOCKS', '__Userspace__', 'INET',
             'CALLBACK_API', 'SCTP_DEBUG'):
     DEFINES[var] = 1
 
 # Android NDK r5c, used on the builders at the time of this writing, doesn't
--- a/netwerk/system/android/moz.build
+++ b/netwerk/system/android/moz.build
@@ -7,11 +7,11 @@
 SOURCES += [
     'nsAndroidNetworkLinkService.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../base',
+    '/netwerk/base',
 ]
 
--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@@ -12,12 +12,12 @@ SOURCES += [
 GENERATED_SOURCES += [
     'moc_nsQtNetworkManager.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../../base',
+    '/netwerk/base',
 ]
 
 CXXFLAGS += CONFIG['MOZ_QT_CFLAGS']