Bug 1058101 - Flatten dom/network/src/ into parent directory. r=mccr8
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Wed, 27 Aug 2014 10:13:39 -0700
changeset 224373 9bfbf136a398b5d33635a62e0d173dce6e887546
parent 224372 dbc8333984a32a6037b149cfafd038729c2bdf90
child 224374 e013edc6ea0dff6cc1c2bbca48e6971ed560e6d6
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1058101
milestone34.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 1058101 - Flatten dom/network/src/ into parent directory. r=mccr8
dom/base/moz.build
dom/bluetooth/moz.build
dom/bluetooth2/moz.build
dom/network/Connection.cpp
dom/network/Connection.h
dom/network/Constants.h
dom/network/NetUtils.cpp
dom/network/NetUtils.h
dom/network/NetworkStatsDB.jsm
dom/network/NetworkStatsManager.js
dom/network/NetworkStatsManager.manifest
dom/network/NetworkStatsService.jsm
dom/network/NetworkStatsServiceProxy.js
dom/network/NetworkStatsServiceProxy.manifest
dom/network/PTCPServerSocket.ipdl
dom/network/PTCPSocket.ipdl
dom/network/PUDPSocket.ipdl
dom/network/TCPServerSocket.js
dom/network/TCPServerSocketChild.cpp
dom/network/TCPServerSocketChild.h
dom/network/TCPServerSocketParent.cpp
dom/network/TCPServerSocketParent.h
dom/network/TCPSocket.js
dom/network/TCPSocket.manifest
dom/network/TCPSocketChild.cpp
dom/network/TCPSocketChild.h
dom/network/TCPSocketParent.cpp
dom/network/TCPSocketParent.h
dom/network/TCPSocketParentIntermediary.js
dom/network/Types.h
dom/network/UDPSocket.cpp
dom/network/UDPSocket.h
dom/network/UDPSocketChild.cpp
dom/network/UDPSocketChild.h
dom/network/UDPSocketParent.cpp
dom/network/UDPSocketParent.h
dom/network/moz.build
dom/network/src/Connection.cpp
dom/network/src/Connection.h
dom/network/src/Constants.h
dom/network/src/NetUtils.cpp
dom/network/src/NetUtils.h
dom/network/src/NetworkStatsDB.jsm
dom/network/src/NetworkStatsManager.js
dom/network/src/NetworkStatsManager.manifest
dom/network/src/NetworkStatsService.jsm
dom/network/src/NetworkStatsServiceProxy.js
dom/network/src/NetworkStatsServiceProxy.manifest
dom/network/src/PTCPServerSocket.ipdl
dom/network/src/PTCPSocket.ipdl
dom/network/src/PUDPSocket.ipdl
dom/network/src/TCPServerSocket.js
dom/network/src/TCPServerSocketChild.cpp
dom/network/src/TCPServerSocketChild.h
dom/network/src/TCPServerSocketParent.cpp
dom/network/src/TCPServerSocketParent.h
dom/network/src/TCPSocket.js
dom/network/src/TCPSocket.manifest
dom/network/src/TCPSocketChild.cpp
dom/network/src/TCPSocketChild.h
dom/network/src/TCPSocketParent.cpp
dom/network/src/TCPSocketParent.h
dom/network/src/TCPSocketParentIntermediary.js
dom/network/src/Types.h
dom/network/src/UDPSocket.cpp
dom/network/src/UDPSocket.h
dom/network/src/UDPSocketChild.cpp
dom/network/src/UDPSocketChild.h
dom/network/src/UDPSocketParent.cpp
dom/network/src/UDPSocketParent.h
dom/network/src/moz.build
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -145,17 +145,17 @@ FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../battery',
     '../bluetooth',
     '../events',
     '../media',
-    '../network/src',
+    '../network',
     '../src/geolocation',
     '../src/storage',
     '../time',
     '../workers',
     '../xbl',
     '/content/base/src',
     '/content/html/document/src',
     '/content/xul/document/src',
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -108,13 +108,13 @@ IPDL_SOURCES += [
     'ipc/PBluetooth.ipdl',
     'ipc/PBluetoothRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',
-    '../network/src',
+    '../network',
     '../system/gonk',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
--- a/dom/bluetooth2/moz.build
+++ b/dom/bluetooth2/moz.build
@@ -115,13 +115,13 @@ IPDL_SOURCES += [
     'ipc/PBluetooth.ipdl',
     'ipc/PBluetoothRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',
-    '../network/src',
+    '../network',
     '../system/gonk',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
rename from dom/network/src/Connection.cpp
rename to dom/network/Connection.cpp
rename from dom/network/src/Connection.h
rename to dom/network/Connection.h
rename from dom/network/src/Constants.h
rename to dom/network/Constants.h
rename from dom/network/src/NetUtils.cpp
rename to dom/network/NetUtils.cpp
rename from dom/network/src/NetUtils.h
rename to dom/network/NetUtils.h
rename from dom/network/src/NetworkStatsDB.jsm
rename to dom/network/NetworkStatsDB.jsm
rename from dom/network/src/NetworkStatsManager.js
rename to dom/network/NetworkStatsManager.js
rename from dom/network/src/NetworkStatsManager.manifest
rename to dom/network/NetworkStatsManager.manifest
rename from dom/network/src/NetworkStatsService.jsm
rename to dom/network/NetworkStatsService.jsm
rename from dom/network/src/NetworkStatsServiceProxy.js
rename to dom/network/NetworkStatsServiceProxy.js
rename from dom/network/src/NetworkStatsServiceProxy.manifest
rename to dom/network/NetworkStatsServiceProxy.manifest
rename from dom/network/src/PTCPServerSocket.ipdl
rename to dom/network/PTCPServerSocket.ipdl
rename from dom/network/src/PTCPSocket.ipdl
rename to dom/network/PTCPSocket.ipdl
rename from dom/network/src/PUDPSocket.ipdl
rename to dom/network/PUDPSocket.ipdl
rename from dom/network/src/TCPServerSocket.js
rename to dom/network/TCPServerSocket.js
rename from dom/network/src/TCPServerSocketChild.cpp
rename to dom/network/TCPServerSocketChild.cpp
rename from dom/network/src/TCPServerSocketChild.h
rename to dom/network/TCPServerSocketChild.h
rename from dom/network/src/TCPServerSocketParent.cpp
rename to dom/network/TCPServerSocketParent.cpp
rename from dom/network/src/TCPServerSocketParent.h
rename to dom/network/TCPServerSocketParent.h
rename from dom/network/src/TCPSocket.js
rename to dom/network/TCPSocket.js
rename from dom/network/src/TCPSocket.manifest
rename to dom/network/TCPSocket.manifest
rename from dom/network/src/TCPSocketChild.cpp
rename to dom/network/TCPSocketChild.cpp
rename from dom/network/src/TCPSocketChild.h
rename to dom/network/TCPSocketChild.h
rename from dom/network/src/TCPSocketParent.cpp
rename to dom/network/TCPSocketParent.cpp
rename from dom/network/src/TCPSocketParent.h
rename to dom/network/TCPSocketParent.h
rename from dom/network/src/TCPSocketParentIntermediary.js
rename to dom/network/TCPSocketParentIntermediary.js
rename from dom/network/src/Types.h
rename to dom/network/Types.h
rename from dom/network/src/UDPSocket.cpp
rename to dom/network/UDPSocket.cpp
rename from dom/network/src/UDPSocket.h
rename to dom/network/UDPSocket.h
rename from dom/network/src/UDPSocketChild.cpp
rename to dom/network/UDPSocketChild.cpp
rename from dom/network/src/UDPSocketChild.h
rename to dom/network/UDPSocketChild.h
rename from dom/network/src/UDPSocketParent.cpp
rename to dom/network/UDPSocketParent.cpp
rename from dom/network/src/UDPSocketParent.h
rename to dom/network/UDPSocketParent.h
--- a/dom/network/moz.build
+++ b/dom/network/moz.build
@@ -1,17 +1,86 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['interfaces', 'src']
+DIRS += ['interfaces']
 
 XPCSHELL_TESTS_MANIFESTS += [
     'tests/unit/xpcshell.ini',
     'tests/unit_ipc/xpcshell.ini',
 ]
 
 if CONFIG['MOZ_B2G_RIL']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/unit_stats/xpcshell.ini']
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
+
+EXPORTS.mozilla.dom += [
+    'UDPSocket.h',
+]
+
+EXPORTS.mozilla.dom.network += [
+    'Connection.h',
+    'Constants.h',
+    'TCPServerSocketChild.h',
+    'TCPServerSocketParent.h',
+    'TCPSocketChild.h',
+    'TCPSocketParent.h',
+    'Types.h',
+    'UDPSocketChild.h',
+    'UDPSocketParent.h',
+]
+
+UNIFIED_SOURCES += [
+    'Connection.cpp',
+    'TCPServerSocketChild.cpp',
+    'TCPServerSocketParent.cpp',
+    'TCPSocketChild.cpp',
+    'TCPSocketParent.cpp',
+    'UDPSocket.cpp',
+    'UDPSocketChild.cpp',
+    'UDPSocketParent.cpp',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    EXTRA_JS_MODULES += [
+        'NetworkStatsDB.jsm',
+        'NetworkStatsService.jsm',
+    ]
+
+EXTRA_COMPONENTS += [
+    'TCPServerSocket.js',
+    'TCPSocket.manifest',
+    'TCPSocketParentIntermediary.js',
+]
+
+EXTRA_PP_COMPONENTS += [
+    'TCPSocket.js',
+]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    EXTRA_COMPONENTS += [
+        'NetworkStatsManager.js',
+        'NetworkStatsManager.manifest',
+        'NetworkStatsServiceProxy.js',
+        'NetworkStatsServiceProxy.manifest',
+    ]
+    EXPORTS.mozilla.dom.network += [
+        'NetUtils.h',
+    ]
+    UNIFIED_SOURCES += [
+        'NetUtils.cpp',
+    ]
+
+IPDL_SOURCES += [
+    'PTCPServerSocket.ipdl',
+    'PTCPSocket.ipdl',
+    'PUDPSocket.ipdl',
+]
+
+FAIL_ON_WARNINGS = True
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/dom/network/src/moz.build
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS.mozilla.dom += [
-    'UDPSocket.h',
-]
-
-EXPORTS.mozilla.dom.network += [
-    'Connection.h',
-    'Constants.h',
-    'TCPServerSocketChild.h',
-    'TCPServerSocketParent.h',
-    'TCPSocketChild.h',
-    'TCPSocketParent.h',
-    'Types.h',
-    'UDPSocketChild.h',
-    'UDPSocketParent.h',
-]
-
-UNIFIED_SOURCES += [
-    'Connection.cpp',
-    'TCPServerSocketChild.cpp',
-    'TCPServerSocketParent.cpp',
-    'TCPSocketChild.cpp',
-    'TCPSocketParent.cpp',
-    'UDPSocket.cpp',
-    'UDPSocketChild.cpp',
-    'UDPSocketParent.cpp',
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    EXTRA_JS_MODULES += [
-        'NetworkStatsDB.jsm',
-        'NetworkStatsService.jsm',
-    ]
-
-EXTRA_COMPONENTS += [
-    'TCPServerSocket.js',
-    'TCPSocket.manifest',
-    'TCPSocketParentIntermediary.js',
-]
-
-EXTRA_PP_COMPONENTS += [
-    'TCPSocket.js',
-]
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    EXTRA_COMPONENTS += [
-        'NetworkStatsManager.js',
-        'NetworkStatsManager.manifest',
-        'NetworkStatsServiceProxy.js',
-        'NetworkStatsServiceProxy.manifest',
-    ]
-    EXPORTS.mozilla.dom.network += [
-        'NetUtils.h',
-    ]
-    UNIFIED_SOURCES += [
-        'NetUtils.cpp',
-    ]
-
-IPDL_SOURCES += [
-    'PTCPServerSocket.ipdl',
-    'PTCPSocket.ipdl',
-    'PUDPSocket.ipdl',
-]
-
-FAIL_ON_WARNINGS = True
-
-include('/ipc/chromium/chromium-config.mozbuild')
-
-FINAL_LIBRARY = 'xul'