Bug 1054703 - Part 6: Flatten embedding/components/webbrowserpersist/{public,src}/ into parent directory. r=bsmedberg
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Wed, 20 Aug 2014 10:27:17 -0700
changeset 200682 f07d131868b5389da2f38677a7ae947367136f30
parent 200681 8d1e5bb14a799df4ef5264d96cca9f235333d42c
child 200683 057489bb1a6934499c2f1b6048702867ae59ba84
push id27353
push useremorley@mozilla.com
push dateThu, 21 Aug 2014 12:33:28 +0000
treeherdermozilla-central@479ec85d9e6f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1054703
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 1054703 - Part 6: Flatten embedding/components/webbrowserpersist/{public,src}/ into parent directory. r=bsmedberg
embedding/components/build/moz.build
embedding/components/webbrowserpersist/moz.build
embedding/components/webbrowserpersist/nsCWebBrowserPersist.idl
embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl
embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
embedding/components/webbrowserpersist/nsWebBrowserPersist.h
embedding/components/webbrowserpersist/public/moz.build
embedding/components/webbrowserpersist/public/nsCWebBrowserPersist.idl
embedding/components/webbrowserpersist/public/nsIWebBrowserPersist.idl
embedding/components/webbrowserpersist/src/moz.build
embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h
--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -10,17 +10,17 @@ SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../appstartup',
     '../commandhandler',
     '../find',
-    '../webbrowserpersist/src',
+    '../webbrowserpersist',
     '../windowwatcher/src',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     LOCAL_INCLUDES += [
         '../printingui/win',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
--- a/embedding/components/webbrowserpersist/moz.build
+++ b/embedding/components/webbrowserpersist/moz.build
@@ -1,8 +1,24 @@
 # -*- 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']
+XPIDL_SOURCES += [
+    'nsCWebBrowserPersist.idl',
+    'nsIWebBrowserPersist.idl',
+]
+
+XPIDL_MODULE = 'webbrowserpersist'
 
+SOURCES += [
+    'nsWebBrowserPersist.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
+LOCAL_INCLUDES += [
+    '/content/base/src',
+    '/content/html/content/src',
+]
rename from embedding/components/webbrowserpersist/public/nsCWebBrowserPersist.idl
rename to embedding/components/webbrowserpersist/nsCWebBrowserPersist.idl
rename from embedding/components/webbrowserpersist/public/nsIWebBrowserPersist.idl
rename to embedding/components/webbrowserpersist/nsIWebBrowserPersist.idl
rename from embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
rename to embedding/components/webbrowserpersist/nsWebBrowserPersist.cpp
rename from embedding/components/webbrowserpersist/src/nsWebBrowserPersist.h
rename to embedding/components/webbrowserpersist/nsWebBrowserPersist.h
deleted file mode 100644
--- a/embedding/components/webbrowserpersist/public/moz.build
+++ /dev/null
@@ -1,13 +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 += [
-    'nsCWebBrowserPersist.idl',
-    'nsIWebBrowserPersist.idl',
-]
-
-XPIDL_MODULE = 'webbrowserpersist'
-
deleted file mode 100644
--- a/embedding/components/webbrowserpersist/src/moz.build
+++ /dev/null
@@ -1,18 +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/.
-
-SOURCES += [
-    'nsWebBrowserPersist.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/content/base/src',
-    '/content/html/content/src',
-]
-