Bug 1164706 - Flatten docshell/shistory/src/ directory. r=smaug
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Fri, 15 May 2015 15:25:39 -0700
changeset 275065 d4315c423b63778c73f8b45fe7d15e408ec8c55e
parent 275064 b14c429c72fb1b282c44045f8ed37ab67034b15c
child 275066 cf12df7923f555cdae72bba53fb8e42feacb3b74
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1164706
milestone41.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 1164706 - Flatten docshell/shistory/src/ directory. r=smaug
docshell/base/moz.build
docshell/build/moz.build
docshell/shistory/moz.build
docshell/shistory/nsSHEntry.cpp
docshell/shistory/nsSHEntry.h
docshell/shistory/nsSHEntryShared.cpp
docshell/shistory/nsSHEntryShared.h
docshell/shistory/nsSHTransaction.cpp
docshell/shistory/nsSHTransaction.h
docshell/shistory/nsSHistory.cpp
docshell/shistory/nsSHistory.h
docshell/shistory/src/moz.build
docshell/shistory/src/nsSHEntry.cpp
docshell/shistory/src/nsSHEntry.h
docshell/shistory/src/nsSHEntryShared.cpp
docshell/shistory/src/nsSHEntryShared.h
docshell/shistory/src/nsSHTransaction.cpp
docshell/shistory/src/nsSHTransaction.h
docshell/shistory/src/nsSHistory.cpp
docshell/shistory/src/nsSHistory.h
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -64,17 +64,17 @@ UNIFIED_SOURCES += [
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../shistory/src',
+    '/docshell/shistory',
     '/dom/base',
     '/layout/base',
     '/layout/generic',
     '/layout/xul',
     '/netwerk/protocol/viewsource',
     '/tools/profiler',
 ]
 
--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -8,21 +8,21 @@ EXPORTS += [
     'nsDocShellCID.h',
 ]
 
 SOURCES += [
     'nsDocShellModule.cpp',
 ]
 
 LOCAL_INCLUDES += [
-    '../base',
-    '../shistory/src/',
+    '/docshell/base',
+    '/docshell/shistory',
     '/uriloader/base',
     '/uriloader/exthandler',
     '/uriloader/prefetch',
-    ]
+]
 
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
     LOCAL_INCLUDES += ['/uriloader/exthandler/mac']
 
 FINAL_LIBRARY = 'xul'
 
 FAIL_ON_WARNINGS = True
--- a/docshell/shistory/moz.build
+++ b/docshell/shistory/moz.build
@@ -1,19 +1,36 @@
 # -*- 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 += ['src']
-
 XPIDL_SOURCES += [
     'nsIBFCacheEntry.idl',
     'nsISHContainer.idl',
     'nsISHEntry.idl',
     'nsISHistory.idl',
     'nsISHistoryInternal.idl',
     'nsISHistoryListener.idl',
     'nsISHTransaction.idl',
 ]
 
 XPIDL_MODULE = 'shistory'
+
+EXPORTS += [
+    'nsSHEntryShared.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsSHEntry.cpp',
+    'nsSHEntryShared.cpp',
+    'nsSHistory.cpp',
+    'nsSHTransaction.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+LOCAL_INCLUDES += [
+    '/docshell/base',
+]
+
+FINAL_LIBRARY = 'xul'
rename from docshell/shistory/src/nsSHEntry.cpp
rename to docshell/shistory/nsSHEntry.cpp
rename from docshell/shistory/src/nsSHEntry.h
rename to docshell/shistory/nsSHEntry.h
rename from docshell/shistory/src/nsSHEntryShared.cpp
rename to docshell/shistory/nsSHEntryShared.cpp
rename from docshell/shistory/src/nsSHEntryShared.h
rename to docshell/shistory/nsSHEntryShared.h
rename from docshell/shistory/src/nsSHTransaction.cpp
rename to docshell/shistory/nsSHTransaction.cpp
rename from docshell/shistory/src/nsSHTransaction.h
rename to docshell/shistory/nsSHTransaction.h
rename from docshell/shistory/src/nsSHistory.cpp
rename to docshell/shistory/nsSHistory.cpp
rename from docshell/shistory/src/nsSHistory.h
rename to docshell/shistory/nsSHistory.h
deleted file mode 100644
--- a/docshell/shistory/src/moz.build
+++ /dev/null
@@ -1,24 +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 += [
-    'nsSHEntryShared.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsSHEntry.cpp',
-    'nsSHEntryShared.cpp',
-    'nsSHistory.cpp',
-    'nsSHTransaction.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-LOCAL_INCLUDES += [
-    '/docshell/base',
-]
-
-FINAL_LIBRARY = 'xul'