Bug 1100184 - Flatten netwerk/streamconv/(public|src)/ directories. r=mcmanus, r=poiru
authorJames Kitchener <jkitch.bug@internode.on.net>
Sat, 03 Jan 2015 17:42:00 -0500
changeset 224815 3de3af63a33f315e94b29963667184b9e067574a
parent 224814 4ec37503ea6a752baf92e053ede5f0ff7750ff36
child 224816 f778e224ff2793bbee3bf6b38af99cfdca4bf1c0
push id54354
push userryanvm@gmail.com
push dateWed, 21 Jan 2015 04:56:43 +0000
treeherdermozilla-inbound@d11387c52d67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus, poiru
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 - Flatten netwerk/streamconv/(public|src)/ directories. r=mcmanus, r=poiru
netwerk/build/moz.build
netwerk/streamconv/moz.build
netwerk/streamconv/mozITXTToHTMLConv.idl
netwerk/streamconv/nsIDirIndex.idl
netwerk/streamconv/nsIDirIndexListener.idl
netwerk/streamconv/nsIStreamConverter.idl
netwerk/streamconv/nsIStreamConverterService.idl
netwerk/streamconv/nsITXTToHTMLConv.idl
netwerk/streamconv/nsStreamConverterService.cpp
netwerk/streamconv/nsStreamConverterService.h
netwerk/streamconv/public/moz.build
netwerk/streamconv/public/mozITXTToHTMLConv.idl
netwerk/streamconv/public/nsIDirIndex.idl
netwerk/streamconv/public/nsIDirIndexListener.idl
netwerk/streamconv/public/nsIStreamConverter.idl
netwerk/streamconv/public/nsIStreamConverterService.idl
netwerk/streamconv/public/nsITXTToHTMLConv.idl
netwerk/streamconv/src/moz.build
netwerk/streamconv/src/nsStreamConverterService.cpp
netwerk/streamconv/src/nsStreamConverterService.h
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -23,18 +23,18 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../base',
     '../cache',
     '../dns',
     '../mime',
     '../protocol/about',
     '../protocol/app',
     '../socket',
+    '../streamconv',
     '../streamconv/converters',
-    '../streamconv/src',
 ]
 
 protocols = CONFIG['NECKO_PROTOCOLS'].copy()
 protocols.remove("about")
 LOCAL_INCLUDES += sorted([
     '../protocol/%s' % d for d in protocols
 ])
 
--- a/netwerk/streamconv/moz.build
+++ b/netwerk/streamconv/moz.build
@@ -1,8 +1,29 @@
 # -*- 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 += ['public', 'src', 'converters']
+DIRS += ['converters']
 TEST_DIRS += ['test']
+
+XPIDL_SOURCES += [
+    'mozITXTToHTMLConv.idl',
+    'nsIDirIndex.idl',
+    'nsIDirIndexListener.idl',
+    'nsIStreamConverter.idl',
+    'nsIStreamConverterService.idl',
+    'nsITXTToHTMLConv.idl',
+]
+
+SOURCES += [
+    'nsStreamConverterService.cpp',
+]
+
+XPIDL_MODULE = 'necko_strconv'
+
+FAIL_ON_WARNINGS = True
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'
rename from netwerk/streamconv/public/mozITXTToHTMLConv.idl
rename to netwerk/streamconv/mozITXTToHTMLConv.idl
rename from netwerk/streamconv/public/nsIDirIndex.idl
rename to netwerk/streamconv/nsIDirIndex.idl
rename from netwerk/streamconv/public/nsIDirIndexListener.idl
rename to netwerk/streamconv/nsIDirIndexListener.idl
rename from netwerk/streamconv/public/nsIStreamConverter.idl
rename to netwerk/streamconv/nsIStreamConverter.idl
rename from netwerk/streamconv/public/nsIStreamConverterService.idl
rename to netwerk/streamconv/nsIStreamConverterService.idl
rename from netwerk/streamconv/public/nsITXTToHTMLConv.idl
rename to netwerk/streamconv/nsITXTToHTMLConv.idl
rename from netwerk/streamconv/src/nsStreamConverterService.cpp
rename to netwerk/streamconv/nsStreamConverterService.cpp
rename from netwerk/streamconv/src/nsStreamConverterService.h
rename to netwerk/streamconv/nsStreamConverterService.h
deleted file mode 100644
--- a/netwerk/streamconv/public/moz.build
+++ /dev/null
@@ -1,19 +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/.
-
-XPIDL_SOURCES += [
-    'mozITXTToHTMLConv.idl',
-    'nsIDirIndex.idl',
-    'nsIDirIndexListener.idl',
-    'nsIStreamConverter.idl',
-    'nsIStreamConverterService.idl',
-    'nsITXTToHTMLConv.idl',
-]
-
-XPIDL_MODULE = 'necko_strconv'
-
-FAIL_ON_WARNINGS = True
-
deleted file mode 100644
--- a/netwerk/streamconv/src/moz.build
+++ /dev/null
@@ -1,15 +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/.
-
-FAIL_ON_WARNINGS = True
-
-SOURCES += [
-    'nsStreamConverterService.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'