Bug 1028565 - Part 3: Flatten editor/txtsvc/{public,src}/ directories. r=ehsan
--- a/editor/txtsvc/moz.build
+++ b/editor/txtsvc/moz.build
@@ -1,8 +1,28 @@
# -*- 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/.
-PARALLEL_DIRS += ['public', 'src']
+XPIDL_SOURCES += [
+ 'nsIInlineSpellChecker.idl',
+ 'nsITextServicesFilter.idl',
+]
+
+XPIDL_MODULE = 'txtsvc'
+EXPORTS += [
+ 'nsISpellChecker.h',
+ 'nsITextService.h',
+ 'nsITextServicesDocument.h',
+ 'nsTextServicesCID.h',
+]
+
+UNIFIED_SOURCES += [
+ 'nsFilteredContentIterator.cpp',
+ 'nsTextServicesDocument.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'gklayout'
rename from editor/txtsvc/src/nsFilteredContentIterator.cpp
rename to editor/txtsvc/nsFilteredContentIterator.cpp
rename from editor/txtsvc/src/nsFilteredContentIterator.h
rename to editor/txtsvc/nsFilteredContentIterator.h
rename from editor/txtsvc/public/nsIInlineSpellChecker.idl
rename to editor/txtsvc/nsIInlineSpellChecker.idl
rename from editor/txtsvc/public/nsISpellChecker.h
rename to editor/txtsvc/nsISpellChecker.h
rename from editor/txtsvc/public/nsITextService.h
rename to editor/txtsvc/nsITextService.h
rename from editor/txtsvc/public/nsITextServicesDocument.h
rename to editor/txtsvc/nsITextServicesDocument.h
rename from editor/txtsvc/public/nsITextServicesFilter.idl
rename to editor/txtsvc/nsITextServicesFilter.idl
rename from editor/txtsvc/src/nsTSAtomList.h
rename to editor/txtsvc/nsTSAtomList.h
rename from editor/txtsvc/public/nsTextServicesCID.h
rename to editor/txtsvc/nsTextServicesCID.h
rename from editor/txtsvc/src/nsTextServicesDocument.cpp
rename to editor/txtsvc/nsTextServicesDocument.cpp
rename from editor/txtsvc/src/nsTextServicesDocument.h
rename to editor/txtsvc/nsTextServicesDocument.h
rename from editor/txtsvc/src/nsTextServicesFactory.cpp
rename to editor/txtsvc/nsTextServicesFactory.cpp
deleted file mode 100644
--- a/editor/txtsvc/public/moz.build
+++ /dev/null
@@ -1,20 +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 += [
- 'nsIInlineSpellChecker.idl',
- 'nsITextServicesFilter.idl',
-]
-
-XPIDL_MODULE = 'txtsvc'
-
-EXPORTS += [
- 'nsISpellChecker.h',
- 'nsITextService.h',
- 'nsITextServicesDocument.h',
- 'nsTextServicesCID.h',
-]
-
deleted file mode 100644
--- a/editor/txtsvc/src/moz.build
+++ /dev/null
@@ -1,14 +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/.
-
-UNIFIED_SOURCES += [
- 'nsFilteredContentIterator.cpp',
- 'nsTextServicesDocument.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'gklayout'
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -66,17 +66,17 @@ LOCAL_INCLUDES += [
'/dom/xslt/xml',
'/dom/xslt/xpath',
'/dom/xslt/xslt',
'/editor/composer',
'/editor/libeditor/base',
'/editor/libeditor/html',
'/editor/libeditor/text',
'/editor/txmgr',
- '/editor/txtsvc/src',
+ '/editor/txtsvc',
'/extensions/cookie',
'/js/xpconnect/loader',
'/js/xpconnect/src',
'/netwerk/base/src',
'/netwerk/cookie',
'/view/src',
]