Bug 1028565 - Part 2: Flatten editor/txmgr/{idl,public,src}/ directories. r=ehsan
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Wed, 25 Jun 2014 15:08:29 -0700
changeset 191040 1f9ddc6738f63865f02dd7823df817ae51e29f7e
parent 191039 015a4d8eb89fc88b4a56876ab2d40ca90d7e4ef6
child 191041 852cf6f6780e845fefb66f6fa55d0e34b5b914ba
push id27024
push userryanvm@gmail.com
push dateThu, 26 Jun 2014 21:13:08 +0000
treeherdermozilla-central@3519e987aa3b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1028565
milestone33.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 1028565 - Part 2: Flatten editor/txmgr/{idl,public,src}/ directories. r=ehsan
content/html/content/src/moz.build
editor/libeditor/base/moz.build
editor/libeditor/html/moz.build
editor/libeditor/text/moz.build
editor/txmgr/idl/moz.build
editor/txmgr/idl/nsITransaction.idl
editor/txmgr/idl/nsITransactionList.idl
editor/txmgr/idl/nsITransactionListener.idl
editor/txmgr/idl/nsITransactionManager.idl
editor/txmgr/moz.build
editor/txmgr/nsITransaction.idl
editor/txmgr/nsITransactionList.idl
editor/txmgr/nsITransactionListener.idl
editor/txmgr/nsITransactionManager.idl
editor/txmgr/nsTransactionItem.cpp
editor/txmgr/nsTransactionItem.h
editor/txmgr/nsTransactionList.cpp
editor/txmgr/nsTransactionList.h
editor/txmgr/nsTransactionManager.cpp
editor/txmgr/nsTransactionManager.h
editor/txmgr/nsTransactionManagerCID.h
editor/txmgr/nsTransactionManagerFactory.cpp
editor/txmgr/nsTransactionStack.cpp
editor/txmgr/nsTransactionStack.h
editor/txmgr/public/moz.build
editor/txmgr/public/nsTransactionManagerCID.h
editor/txmgr/src/moz.build
editor/txmgr/src/nsTransactionItem.cpp
editor/txmgr/src/nsTransactionItem.h
editor/txmgr/src/nsTransactionList.cpp
editor/txmgr/src/nsTransactionList.h
editor/txmgr/src/nsTransactionManager.cpp
editor/txmgr/src/nsTransactionManager.h
editor/txmgr/src/nsTransactionManagerFactory.cpp
editor/txmgr/src/nsTransactionStack.cpp
editor/txmgr/src/nsTransactionStack.h
layout/build/moz.build
layout/forms/moz.build
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -172,17 +172,17 @@ LOCAL_INCLUDES += [
     '/content/canvas/src',
     '/content/html/document/src',
     '/content/media/',
     '/content/xul/content/src',
     '/dom/base',
     '/dom/xbl',
     '/editor/libeditor/base',
     '/editor/libeditor/text',
-    '/editor/txmgr/src',
+    '/editor/txmgr',
     '/layout/forms',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
     '/netwerk/base/src',
 ]
 
--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -31,14 +31,14 @@ UNIFIED_SOURCES += [
     'SplitElementTxn.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../text',
     '/content/base/src',
-    '/editor/txmgr/src',
+    '/editor/txmgr',
     '/extensions/spellcheck/src',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -27,16 +27,16 @@ UNIFIED_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',
     '../text',
     '/content/base/src',
-    '/editor/txmgr/src',
+    '/editor/txmgr',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',
     '/layout/xul',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -13,16 +13,16 @@ UNIFIED_SOURCES += [
     'nsTextEditUtils.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',
     '/content/base/src',
-    '/editor/txmgr/src',
+    '/editor/txmgr',
 ]
 
 FINAL_LIBRARY = 'gklayout'
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
deleted file mode 100644
--- a/editor/txmgr/idl/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/.
-
-XPIDL_SOURCES += [
-    'nsITransaction.idl',
-    'nsITransactionList.idl',
-    'nsITransactionListener.idl',
-    'nsITransactionManager.idl',
-]
-
-XPIDL_MODULE = 'txmgr'
-
--- a/editor/txmgr/moz.build
+++ b/editor/txmgr/moz.build
@@ -1,9 +1,32 @@
 # -*- 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', 'idl']
 TEST_TOOL_DIRS += ['tests']
 
+XPIDL_SOURCES += [
+    'nsITransaction.idl',
+    'nsITransactionList.idl',
+    'nsITransactionListener.idl',
+    'nsITransactionManager.idl',
+]
+
+XPIDL_MODULE = 'txmgr'
+
+EXPORTS += [
+    'nsTransactionManagerCID.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsTransactionItem.cpp',
+    'nsTransactionList.cpp',
+    'nsTransactionManager.cpp',
+    'nsTransactionManagerFactory.cpp',
+    'nsTransactionStack.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
rename from editor/txmgr/idl/nsITransaction.idl
rename to editor/txmgr/nsITransaction.idl
rename from editor/txmgr/idl/nsITransactionList.idl
rename to editor/txmgr/nsITransactionList.idl
rename from editor/txmgr/idl/nsITransactionListener.idl
rename to editor/txmgr/nsITransactionListener.idl
rename from editor/txmgr/idl/nsITransactionManager.idl
rename to editor/txmgr/nsITransactionManager.idl
rename from editor/txmgr/src/nsTransactionItem.cpp
rename to editor/txmgr/nsTransactionItem.cpp
rename from editor/txmgr/src/nsTransactionItem.h
rename to editor/txmgr/nsTransactionItem.h
rename from editor/txmgr/src/nsTransactionList.cpp
rename to editor/txmgr/nsTransactionList.cpp
rename from editor/txmgr/src/nsTransactionList.h
rename to editor/txmgr/nsTransactionList.h
rename from editor/txmgr/src/nsTransactionManager.cpp
rename to editor/txmgr/nsTransactionManager.cpp
rename from editor/txmgr/src/nsTransactionManager.h
rename to editor/txmgr/nsTransactionManager.h
rename from editor/txmgr/public/nsTransactionManagerCID.h
rename to editor/txmgr/nsTransactionManagerCID.h
rename from editor/txmgr/src/nsTransactionManagerFactory.cpp
rename to editor/txmgr/nsTransactionManagerFactory.cpp
rename from editor/txmgr/src/nsTransactionStack.cpp
rename to editor/txmgr/nsTransactionStack.cpp
rename from editor/txmgr/src/nsTransactionStack.h
rename to editor/txmgr/nsTransactionStack.h
deleted file mode 100644
--- a/editor/txmgr/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 += [
-    'nsTransactionManagerCID.h',
-]
-
deleted file mode 100644
--- a/editor/txmgr/src/moz.build
+++ /dev/null
@@ -1,17 +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 += [
-    'nsTransactionItem.cpp',
-    'nsTransactionList.cpp',
-    'nsTransactionManager.cpp',
-    'nsTransactionManagerFactory.cpp',
-    'nsTransactionStack.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -65,17 +65,17 @@ LOCAL_INCLUDES += [
     '/dom/xslt/base',
     '/dom/xslt/xml',
     '/dom/xslt/xpath',
     '/dom/xslt/xslt',
     '/editor/composer',
     '/editor/libeditor/base',
     '/editor/libeditor/html',
     '/editor/libeditor/text',
-    '/editor/txmgr/src',
+    '/editor/txmgr',
     '/editor/txtsvc/src',
     '/extensions/cookie',
     '/js/xpconnect/loader',
     '/js/xpconnect/src',
     '/netwerk/base/src',
     '/netwerk/cookie',
     '/view/src',
 ]
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -42,17 +42,17 @@ MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
     '../../editor/libeditor/base',
     '../../editor/libeditor/text',
-    '../../editor/txmgr/src',
+    '../../editor/txmgr',
     '../base',
     '../generic',
     '../xul',
 ]
 
 if CONFIG['ENABLE_INTL_API']:
     # nsNumberControlFrame.cpp requires ICUUtils.h which in turn requires
     # i18n/unum.h