Bug 1047873 - Flatten xpfe/appshell/{public,src}/ directories. r=Neil
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Sat, 02 Aug 2014 13:44:23 -0700
changeset 219208 963723a2077d585c2cb00025622ed30bdd3d1148
parent 219207 e5a957b1c51031cd4fa5ca610c7eb34d745b6d7f
child 219209 dff6f7e6b7e40bb184561743d42e24d0f83628f2
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)
reviewersNeil
bugs1047873
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 1047873 - Flatten xpfe/appshell/{public,src}/ directories. r=Neil
xpfe/appshell/moz.build
xpfe/appshell/nsAppShellCID.h
xpfe/appshell/nsAppShellFactory.cpp
xpfe/appshell/nsAppShellService.cpp
xpfe/appshell/nsAppShellService.h
xpfe/appshell/nsAppShellWindowEnumerator.cpp
xpfe/appshell/nsAppShellWindowEnumerator.h
xpfe/appshell/nsChromeTreeOwner.cpp
xpfe/appshell/nsChromeTreeOwner.h
xpfe/appshell/nsContentTreeOwner.cpp
xpfe/appshell/nsContentTreeOwner.h
xpfe/appshell/nsIAppShellService.idl
xpfe/appshell/nsIPopupWindowManager.idl
xpfe/appshell/nsIWindowMediator.idl
xpfe/appshell/nsIWindowMediatorListener.idl
xpfe/appshell/nsIXULBrowserWindow.idl
xpfe/appshell/nsIXULWindow.idl
xpfe/appshell/nsWebShellWindow.cpp
xpfe/appshell/nsWebShellWindow.h
xpfe/appshell/nsWindowMediator.cpp
xpfe/appshell/nsWindowMediator.h
xpfe/appshell/nsXULWindow.cpp
xpfe/appshell/nsXULWindow.h
xpfe/appshell/public/moz.build
xpfe/appshell/public/nsAppShellCID.h
xpfe/appshell/public/nsIAppShellService.idl
xpfe/appshell/public/nsIPopupWindowManager.idl
xpfe/appshell/public/nsIWindowMediator.idl
xpfe/appshell/public/nsIWindowMediatorListener.idl
xpfe/appshell/public/nsIXULBrowserWindow.idl
xpfe/appshell/public/nsIXULWindow.idl
xpfe/appshell/src/moz.build
xpfe/appshell/src/nsAppShellFactory.cpp
xpfe/appshell/src/nsAppShellService.cpp
xpfe/appshell/src/nsAppShellService.h
xpfe/appshell/src/nsAppShellWindowEnumerator.cpp
xpfe/appshell/src/nsAppShellWindowEnumerator.h
xpfe/appshell/src/nsChromeTreeOwner.cpp
xpfe/appshell/src/nsChromeTreeOwner.h
xpfe/appshell/src/nsContentTreeOwner.cpp
xpfe/appshell/src/nsContentTreeOwner.h
xpfe/appshell/src/nsWebShellWindow.cpp
xpfe/appshell/src/nsWebShellWindow.h
xpfe/appshell/src/nsWindowMediator.cpp
xpfe/appshell/src/nsWindowMediator.h
xpfe/appshell/src/nsXULWindow.cpp
xpfe/appshell/src/nsXULWindow.h
xpfe/appshell/src/test/chrome.ini
xpfe/appshell/src/test/test_hiddenPrivateWindow.xul
xpfe/appshell/test/chrome.ini
xpfe/appshell/test/test_hiddenPrivateWindow.xul
--- a/xpfe/appshell/moz.build
+++ b/xpfe/appshell/moz.build
@@ -1,8 +1,42 @@
 # -*- 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']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+
+XPIDL_SOURCES += [
+    'nsIAppShellService.idl',
+    'nsIPopupWindowManager.idl',
+    'nsIWindowMediator.idl',
+    'nsIWindowMediatorListener.idl',
+    'nsIXULBrowserWindow.idl',
+    'nsIXULWindow.idl',
+]
+
+XPIDL_MODULE = 'appshell'
+
+EXPORTS += [
+    'nsAppShellCID.h',
+]
 
+UNIFIED_SOURCES += [
+    'nsAppShellFactory.cpp',
+    'nsAppShellService.cpp',
+    'nsAppShellWindowEnumerator.cpp',
+    'nsChromeTreeOwner.cpp',
+    'nsContentTreeOwner.cpp',
+    'nsWebShellWindow.cpp',
+    'nsWindowMediator.cpp',
+    'nsXULWindow.cpp',
+]
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+]
+
+FAIL_ON_WARNINGS = True
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'
rename from xpfe/appshell/public/nsAppShellCID.h
rename to xpfe/appshell/nsAppShellCID.h
rename from xpfe/appshell/src/nsAppShellFactory.cpp
rename to xpfe/appshell/nsAppShellFactory.cpp
rename from xpfe/appshell/src/nsAppShellService.cpp
rename to xpfe/appshell/nsAppShellService.cpp
rename from xpfe/appshell/src/nsAppShellService.h
rename to xpfe/appshell/nsAppShellService.h
rename from xpfe/appshell/src/nsAppShellWindowEnumerator.cpp
rename to xpfe/appshell/nsAppShellWindowEnumerator.cpp
rename from xpfe/appshell/src/nsAppShellWindowEnumerator.h
rename to xpfe/appshell/nsAppShellWindowEnumerator.h
rename from xpfe/appshell/src/nsChromeTreeOwner.cpp
rename to xpfe/appshell/nsChromeTreeOwner.cpp
rename from xpfe/appshell/src/nsChromeTreeOwner.h
rename to xpfe/appshell/nsChromeTreeOwner.h
rename from xpfe/appshell/src/nsContentTreeOwner.cpp
rename to xpfe/appshell/nsContentTreeOwner.cpp
rename from xpfe/appshell/src/nsContentTreeOwner.h
rename to xpfe/appshell/nsContentTreeOwner.h
rename from xpfe/appshell/public/nsIAppShellService.idl
rename to xpfe/appshell/nsIAppShellService.idl
rename from xpfe/appshell/public/nsIPopupWindowManager.idl
rename to xpfe/appshell/nsIPopupWindowManager.idl
rename from xpfe/appshell/public/nsIWindowMediator.idl
rename to xpfe/appshell/nsIWindowMediator.idl
rename from xpfe/appshell/public/nsIWindowMediatorListener.idl
rename to xpfe/appshell/nsIWindowMediatorListener.idl
rename from xpfe/appshell/public/nsIXULBrowserWindow.idl
rename to xpfe/appshell/nsIXULBrowserWindow.idl
rename from xpfe/appshell/public/nsIXULWindow.idl
rename to xpfe/appshell/nsIXULWindow.idl
rename from xpfe/appshell/src/nsWebShellWindow.cpp
rename to xpfe/appshell/nsWebShellWindow.cpp
rename from xpfe/appshell/src/nsWebShellWindow.h
rename to xpfe/appshell/nsWebShellWindow.h
rename from xpfe/appshell/src/nsWindowMediator.cpp
rename to xpfe/appshell/nsWindowMediator.cpp
rename from xpfe/appshell/src/nsWindowMediator.h
rename to xpfe/appshell/nsWindowMediator.h
rename from xpfe/appshell/src/nsXULWindow.cpp
rename to xpfe/appshell/nsXULWindow.cpp
rename from xpfe/appshell/src/nsXULWindow.h
rename to xpfe/appshell/nsXULWindow.h
deleted file mode 100644
--- a/xpfe/appshell/public/moz.build
+++ /dev/null
@@ -1,21 +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 += [
-    'nsIAppShellService.idl',
-    'nsIPopupWindowManager.idl',
-    'nsIWindowMediator.idl',
-    'nsIWindowMediatorListener.idl',
-    'nsIXULBrowserWindow.idl',
-    'nsIXULWindow.idl',
-]
-
-XPIDL_MODULE = 'appshell'
-
-EXPORTS += [
-    'nsAppShellCID.h',
-]
-
deleted file mode 100644
--- a/xpfe/appshell/src/moz.build
+++ /dev/null
@@ -1,27 +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/.
-
-MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
-
-UNIFIED_SOURCES += [
-    'nsAppShellFactory.cpp',
-    'nsAppShellService.cpp',
-    'nsAppShellWindowEnumerator.cpp',
-    'nsChromeTreeOwner.cpp',
-    'nsContentTreeOwner.cpp',
-    'nsWebShellWindow.cpp',
-    'nsWindowMediator.cpp',
-    'nsXULWindow.cpp',
-]
-
-LOCAL_INCLUDES += [
-    '/dom/base',
-]
-
-FAIL_ON_WARNINGS = True
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'
rename from xpfe/appshell/src/test/chrome.ini
rename to xpfe/appshell/test/chrome.ini
rename from xpfe/appshell/src/test/test_hiddenPrivateWindow.xul
rename to xpfe/appshell/test/test_hiddenPrivateWindow.xul