Bug 1028565 - Part 5: Flatten editor/{idl,public}/ directories. r=ehsan
deleted file mode 100644
--- a/editor/idl/moz.build
+++ /dev/null
@@ -1,29 +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 += [
- 'nsIContentFilter.idl',
- 'nsIDocumentStateListener.idl',
- 'nsIEditActionListener.idl',
- 'nsIEditor.idl',
- 'nsIEditorIMESupport.idl',
- 'nsIEditorMailSupport.idl',
- 'nsIEditorObserver.idl',
- 'nsIEditorSpellCheck.idl',
- 'nsIEditorStyleSheets.idl',
- 'nsIHTMLAbsPosEditor.idl',
- 'nsIHTMLEditor.idl',
- 'nsIHTMLInlineTableEditor.idl',
- 'nsIHTMLObjectResizeListener.idl',
- 'nsIHTMLObjectResizer.idl',
- 'nsIPlaintextEditor.idl',
- 'nsITableEditor.idl',
- 'nsIURIRefObject.idl',
- 'nsPIEditorTransaction.idl',
-]
-
-XPIDL_MODULE = 'editor'
-
--- a/editor/moz.build
+++ b/editor/moz.build
@@ -1,18 +1,43 @@
# -*- 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',
- 'idl',
'txtsvc',
'libeditor',
'txmgr',
'composer',
]
+XPIDL_SOURCES += [
+ 'nsIContentFilter.idl',
+ 'nsIDocumentStateListener.idl',
+ 'nsIEditActionListener.idl',
+ 'nsIEditor.idl',
+ 'nsIEditorIMESupport.idl',
+ 'nsIEditorMailSupport.idl',
+ 'nsIEditorObserver.idl',
+ 'nsIEditorSpellCheck.idl',
+ 'nsIEditorStyleSheets.idl',
+ 'nsIHTMLAbsPosEditor.idl',
+ 'nsIHTMLEditor.idl',
+ 'nsIHTMLInlineTableEditor.idl',
+ 'nsIHTMLObjectResizeListener.idl',
+ 'nsIHTMLObjectResizer.idl',
+ 'nsIPlaintextEditor.idl',
+ 'nsITableEditor.idl',
+ 'nsIURIRefObject.idl',
+ 'nsPIEditorTransaction.idl',
+]
+
+XPIDL_MODULE = 'editor'
+
+EXPORTS += [
+ 'nsEditorCID.h',
+]
+
EXTRA_JS_MODULES += [
'AsyncSpellCheckTestHelper.jsm',
]
rename from editor/public/nsEditorCID.h
rename to editor/nsEditorCID.h
rename from editor/idl/nsIContentFilter.idl
rename to editor/nsIContentFilter.idl
rename from editor/idl/nsIDocumentStateListener.idl
rename to editor/nsIDocumentStateListener.idl
rename from editor/idl/nsIEditActionListener.idl
rename to editor/nsIEditActionListener.idl
rename from editor/idl/nsIEditor.idl
rename to editor/nsIEditor.idl
rename from editor/idl/nsIEditorIMESupport.idl
rename to editor/nsIEditorIMESupport.idl
rename from editor/idl/nsIEditorMailSupport.idl
rename to editor/nsIEditorMailSupport.idl
rename from editor/idl/nsIEditorObserver.idl
rename to editor/nsIEditorObserver.idl
rename from editor/idl/nsIEditorSpellCheck.idl
rename to editor/nsIEditorSpellCheck.idl
rename from editor/idl/nsIEditorStyleSheets.idl
rename to editor/nsIEditorStyleSheets.idl
rename from editor/idl/nsIHTMLAbsPosEditor.idl
rename to editor/nsIHTMLAbsPosEditor.idl
rename from editor/idl/nsIHTMLEditor.idl
rename to editor/nsIHTMLEditor.idl
rename from editor/idl/nsIHTMLInlineTableEditor.idl
rename to editor/nsIHTMLInlineTableEditor.idl
rename from editor/idl/nsIHTMLObjectResizeListener.idl
rename to editor/nsIHTMLObjectResizeListener.idl
rename from editor/idl/nsIHTMLObjectResizer.idl
rename to editor/nsIHTMLObjectResizer.idl
rename from editor/idl/nsIPlaintextEditor.idl
rename to editor/nsIPlaintextEditor.idl
rename from editor/idl/nsITableEditor.idl
rename to editor/nsITableEditor.idl
rename from editor/idl/nsIURIRefObject.idl
rename to editor/nsIURIRefObject.idl
rename from editor/idl/nsPIEditorTransaction.idl
rename to editor/nsPIEditorTransaction.idl
deleted file mode 100644
--- a/editor/public/moz.build
+++ /dev/null
@@ -1,10 +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 += [
- 'nsEditorCID.h',
-]
-