Bug 1044448 - Flatten view/{public,src}/ directories. r=roc
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Mon, 28 Jul 2014 18:02:44 -0700
changeset 196588 9da5faf8048598041e20a43f2db4df8aaf37fc30
parent 196587 eab8aaee409ea9e82458efff6a2e2cfaa8382f8b
child 196589 e31206802483005b5c6ec86506295dab4db7186e
push id46915
push userbirunthan@mohanathas.com
push dateTue, 29 Jul 2014 15:57:06 +0000
treeherdermozilla-inbound@9da5faf80485 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs1044448
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 1044448 - Flatten view/{public,src}/ directories. r=roc
layout/base/moz.build
layout/build/moz.build
view/Makefile.in
view/moz.build
view/nsView.cpp
view/nsView.h
view/nsViewManager.cpp
view/nsViewManager.h
view/public/moz.build
view/public/nsView.h
view/public/nsViewManager.h
view/src/Makefile.in
view/src/moz.build
view/src/nsView.cpp
view/src/nsViewManager.cpp
widget/xpwidgets/moz.build
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -111,28 +111,28 @@ FAIL_ON_WARNINGS = True
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '../../content/base/src',
     '../../content/html/content/src',
     '../../content/svg/content/src',
-    '../../view/src',
     '../forms',
     '../generic',
     '../mathml',
     '../printing',
     '../style',
     '../svg',
     '../tables',
     '../xul',
     '../xul/tree/',
     '/docshell/base',
     '/dom/base',
     '/dom/xbl',
+    '/view',
 ]
 
 FINAL_LIBRARY = 'xul'
 
 MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
 BROWSER_CHROME_MANIFESTS += ['tests/browser.ini']
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -70,17 +70,17 @@ LOCAL_INCLUDES += [
     '/editor/libeditor/text',
     '/editor/txmgr',
     '/editor/txtsvc',
     '/extensions/cookie',
     '/js/xpconnect/loader',
     '/js/xpconnect/src',
     '/netwerk/base/src',
     '/netwerk/cookie',
-    '/view/src',
+    '/view',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3'):
     LOCAL_INCLUDES += [
         '/dom/system/unix',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
rename from view/src/Makefile.in
rename to view/Makefile.in
--- a/view/moz.build
+++ b/view/moz.build
@@ -1,8 +1,22 @@
 # -*- 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']
+EXPORTS += [
+    'nsView.h',
+    'nsViewManager.h',
+]
 
+# nsViewManager.cpp cannot be built in unified mode because it uses PL_ARENA_CONST_ALIGN_MASK.
+SOURCES += [
+    'nsView.cpp',
+    'nsViewManager.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'
rename from view/src/nsView.cpp
rename to view/nsView.cpp
rename from view/public/nsView.h
rename to view/nsView.h
rename from view/src/nsViewManager.cpp
rename to view/nsViewManager.cpp
rename from view/public/nsViewManager.h
rename to view/nsViewManager.h
deleted file mode 100644
--- a/view/public/moz.build
+++ /dev/null
@@ -1,11 +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 += [
-    'nsView.h',
-    'nsViewManager.h',
-]
-
deleted file mode 100644
--- a/view/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/.
-
-# nsViewManager.cpp cannot be built in unified mode because it uses PL_ARENA_CONST_ALIGN_MASK.
-SOURCES += [
-    'nsView.cpp',
-    'nsViewManager.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'
--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -77,17 +77,17 @@ MSVC_ENABLE_PGO = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '../shared',
     '/layout/base',
     '/layout/forms',
     '/layout/generic',
     '/layout/xul',
-    '/view/src',
+    '/view',
 ]
 
 widget_dir = CONFIG['MOZ_WIDGET_TOOLKIT']
 if widget_dir in ('gtk3', 'gtk2'):
     # gtk3 shares includes with gtk2
     widget_dir = 'gtk'
 
 LOCAL_INCLUDES += [