From fbc73fc3b938e62afe856b0fb505fcffb18fec52 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Sat, 19 Jul 2014 12:43:38 -0700 Subject: [PATCH] Bug 1041208 - Flatten chrome/{public,src}/ directories. r=mossop --HG-- rename : chrome/src/Makefile.in => chrome/Makefile.in rename : chrome/src/RegistryMessageUtils.h => chrome/RegistryMessageUtils.h rename : chrome/src/nsChromeProtocolHandler.cpp => chrome/nsChromeProtocolHandler.cpp rename : chrome/src/nsChromeProtocolHandler.h => chrome/nsChromeProtocolHandler.h rename : chrome/src/nsChromeRegistry.cpp => chrome/nsChromeRegistry.cpp rename : chrome/src/nsChromeRegistry.h => chrome/nsChromeRegistry.h rename : chrome/src/nsChromeRegistryChrome.cpp => chrome/nsChromeRegistryChrome.cpp rename : chrome/src/nsChromeRegistryChrome.h => chrome/nsChromeRegistryChrome.h rename : chrome/src/nsChromeRegistryContent.cpp => chrome/nsChromeRegistryContent.cpp rename : chrome/src/nsChromeRegistryContent.h => chrome/nsChromeRegistryContent.h rename : chrome/public/nsIChromeRegistry.idl => chrome/nsIChromeRegistry.idl rename : chrome/public/nsIToolkitChromeRegistry.idl => chrome/nsIToolkitChromeRegistry.idl --- chrome/{src => }/Makefile.in | 0 chrome/{src => }/RegistryMessageUtils.h | 0 chrome/moz.build | 35 ++++++++++++++++++- chrome/{src => }/nsChromeProtocolHandler.cpp | 0 chrome/{src => }/nsChromeProtocolHandler.h | 0 chrome/{src => }/nsChromeRegistry.cpp | 0 chrome/{src => }/nsChromeRegistry.h | 0 chrome/{src => }/nsChromeRegistryChrome.cpp | 0 chrome/{src => }/nsChromeRegistryChrome.h | 0 chrome/{src => }/nsChromeRegistryContent.cpp | 0 chrome/{src => }/nsChromeRegistryContent.h | 0 chrome/{public => }/nsIChromeRegistry.idl | 0 .../{public => }/nsIToolkitChromeRegistry.idl | 0 chrome/public/moz.build | 13 ------- chrome/src/moz.build | 32 ----------------- dom/ipc/moz.build | 2 +- xpcom/build/moz.build | 2 +- xpcom/components/moz.build | 2 +- 18 files changed, 37 insertions(+), 49 deletions(-) rename chrome/{src => }/Makefile.in (100%) rename chrome/{src => }/RegistryMessageUtils.h (100%) rename chrome/{src => }/nsChromeProtocolHandler.cpp (100%) rename chrome/{src => }/nsChromeProtocolHandler.h (100%) rename chrome/{src => }/nsChromeRegistry.cpp (100%) rename chrome/{src => }/nsChromeRegistry.h (100%) rename chrome/{src => }/nsChromeRegistryChrome.cpp (100%) rename chrome/{src => }/nsChromeRegistryChrome.h (100%) rename chrome/{src => }/nsChromeRegistryContent.cpp (100%) rename chrome/{src => }/nsChromeRegistryContent.h (100%) rename chrome/{public => }/nsIChromeRegistry.idl (100%) rename chrome/{public => }/nsIToolkitChromeRegistry.idl (100%) delete mode 100644 chrome/public/moz.build delete mode 100644 chrome/src/moz.build diff --git a/chrome/src/Makefile.in b/chrome/Makefile.in similarity index 100% rename from chrome/src/Makefile.in rename to chrome/Makefile.in diff --git a/chrome/src/RegistryMessageUtils.h b/chrome/RegistryMessageUtils.h similarity index 100% rename from chrome/src/RegistryMessageUtils.h rename to chrome/RegistryMessageUtils.h diff --git a/chrome/moz.build b/chrome/moz.build index 92950f537287..ba16eb24737c 100644 --- a/chrome/moz.build +++ b/chrome/moz.build @@ -4,5 +4,38 @@ # 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'] TEST_DIRS += ['test'] + +XPIDL_SOURCES += [ + 'nsIChromeRegistry.idl', + 'nsIToolkitChromeRegistry.idl', +] + +XPIDL_MODULE = 'chrome' + +EXPORTS.mozilla.chrome += [ + 'RegistryMessageUtils.h', +] + +UNIFIED_SOURCES += [ + 'nsChromeProtocolHandler.cpp', + 'nsChromeRegistry.cpp', + 'nsChromeRegistryChrome.cpp', + 'nsChromeRegistryContent.cpp', +] + +MSVC_ENABLE_PGO = True + +include('/ipc/chromium/chromium-config.mozbuild') + +FINAL_LIBRARY = 'xpcom_core' + +GENERATED_INCLUDES += [ + '/xpcom', +] + +LOCAL_INCLUDES += [ + '/netwerk/base/src', + '/netwerk/protocol/res', + '/xpcom/components' +] diff --git a/chrome/src/nsChromeProtocolHandler.cpp b/chrome/nsChromeProtocolHandler.cpp similarity index 100% rename from chrome/src/nsChromeProtocolHandler.cpp rename to chrome/nsChromeProtocolHandler.cpp diff --git a/chrome/src/nsChromeProtocolHandler.h b/chrome/nsChromeProtocolHandler.h similarity index 100% rename from chrome/src/nsChromeProtocolHandler.h rename to chrome/nsChromeProtocolHandler.h diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/nsChromeRegistry.cpp similarity index 100% rename from chrome/src/nsChromeRegistry.cpp rename to chrome/nsChromeRegistry.cpp diff --git a/chrome/src/nsChromeRegistry.h b/chrome/nsChromeRegistry.h similarity index 100% rename from chrome/src/nsChromeRegistry.h rename to chrome/nsChromeRegistry.h diff --git a/chrome/src/nsChromeRegistryChrome.cpp b/chrome/nsChromeRegistryChrome.cpp similarity index 100% rename from chrome/src/nsChromeRegistryChrome.cpp rename to chrome/nsChromeRegistryChrome.cpp diff --git a/chrome/src/nsChromeRegistryChrome.h b/chrome/nsChromeRegistryChrome.h similarity index 100% rename from chrome/src/nsChromeRegistryChrome.h rename to chrome/nsChromeRegistryChrome.h diff --git a/chrome/src/nsChromeRegistryContent.cpp b/chrome/nsChromeRegistryContent.cpp similarity index 100% rename from chrome/src/nsChromeRegistryContent.cpp rename to chrome/nsChromeRegistryContent.cpp diff --git a/chrome/src/nsChromeRegistryContent.h b/chrome/nsChromeRegistryContent.h similarity index 100% rename from chrome/src/nsChromeRegistryContent.h rename to chrome/nsChromeRegistryContent.h diff --git a/chrome/public/nsIChromeRegistry.idl b/chrome/nsIChromeRegistry.idl similarity index 100% rename from chrome/public/nsIChromeRegistry.idl rename to chrome/nsIChromeRegistry.idl diff --git a/chrome/public/nsIToolkitChromeRegistry.idl b/chrome/nsIToolkitChromeRegistry.idl similarity index 100% rename from chrome/public/nsIToolkitChromeRegistry.idl rename to chrome/nsIToolkitChromeRegistry.idl diff --git a/chrome/public/moz.build b/chrome/public/moz.build deleted file mode 100644 index ab333b726680..000000000000 --- a/chrome/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 += [ - 'nsIChromeRegistry.idl', - 'nsIToolkitChromeRegistry.idl', -] - -XPIDL_MODULE = 'chrome' - diff --git a/chrome/src/moz.build b/chrome/src/moz.build deleted file mode 100644 index 3e1e9d642491..000000000000 --- a/chrome/src/moz.build +++ /dev/null @@ -1,32 +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.mozilla.chrome += [ - 'RegistryMessageUtils.h', -] - -UNIFIED_SOURCES += [ - 'nsChromeProtocolHandler.cpp', - 'nsChromeRegistry.cpp', - 'nsChromeRegistryChrome.cpp', - 'nsChromeRegistryContent.cpp', -] - -MSVC_ENABLE_PGO = True - -include('/ipc/chromium/chromium-config.mozbuild') - -FINAL_LIBRARY = 'xpcom_core' - -GENERATED_INCLUDES += [ - '/xpcom', -] - -LOCAL_INCLUDES += [ - '/netwerk/base/src', - '/netwerk/protocol/res', - '/xpcom/components' -] diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index 2fa35ed83c23..acf4092c96b7 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -106,7 +106,7 @@ LOCAL_INCLUDES += [ '../src/base', '../src/geolocation', '../src/storage', - '/chrome/src', + '/chrome', '/content/base/src', '/content/media/webspeech/synth/ipc', '/docshell/base', diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build index a415eb14d7bd..c43028c606ad 100644 --- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -91,7 +91,7 @@ LOCAL_INCLUDES += [ '../io', '../reflect/xptinfo', '../threads', - '/chrome/src', + '/chrome', '/docshell/base', ] diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build index b5ed112e02e7..4825978887c6 100644 --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build @@ -50,6 +50,6 @@ LOCAL_INCLUDES += [ '../build', '../ds', '../reflect/xptinfo', - '/chrome/src', + '/chrome', '/modules/libjar', ]