Bug 1028557 - Part 1: Flatten xpcom/reflect/xptinfo/{public,src}/ directories. r=bsmedberg

--HG--
rename : xpcom/reflect/xptinfo/src/ShimInterfaceInfo.cpp => xpcom/reflect/xptinfo/ShimInterfaceInfo.cpp
rename : xpcom/reflect/xptinfo/src/ShimInterfaceInfo.h => xpcom/reflect/xptinfo/ShimInterfaceInfo.h
rename : xpcom/reflect/xptinfo/src/TODO => xpcom/reflect/xptinfo/TODO
rename : xpcom/reflect/xptinfo/public/XPTInterfaceInfoManager.h => xpcom/reflect/xptinfo/XPTInterfaceInfoManager.h
rename : xpcom/reflect/xptinfo/public/nsIInterfaceInfo.idl => xpcom/reflect/xptinfo/nsIInterfaceInfo.idl
rename : xpcom/reflect/xptinfo/public/nsIInterfaceInfoManager.idl => xpcom/reflect/xptinfo/nsIInterfaceInfoManager.idl
rename : xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp => xpcom/reflect/xptinfo/xptiInterfaceInfo.cpp
rename : xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp => xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp
rename : xpcom/reflect/xptinfo/src/xptiTypelibGuts.cpp => xpcom/reflect/xptinfo/xptiTypelibGuts.cpp
rename : xpcom/reflect/xptinfo/src/xptiWorkingSet.cpp => xpcom/reflect/xptinfo/xptiWorkingSet.cpp
rename : xpcom/reflect/xptinfo/public/xptinfo.h => xpcom/reflect/xptinfo/xptinfo.h
rename : xpcom/reflect/xptinfo/src/xptiprivate.h => xpcom/reflect/xptinfo/xptiprivate.h

js/xpconnect/src/moz.build

@@ -90,7 +90,7 @@ LOCAL_INCLUDES += [
     '/js/ipc',
     '/layout/base',
     '/layout/style',
-    '/xpcom/reflect/xptinfo/src',
+    '/xpcom/reflect/xptinfo',
 ]
 
 if CONFIG['MOZ_B2G_BT']:

xpcom/build/moz.build

@@ -89,7 +89,7 @@ LOCAL_INCLUDES += [
     '../ds',
     '../glue',
     '../io',
-    '../reflect/xptinfo/src',
+    '../reflect/xptinfo',
     '../threads',
     '/chrome/src',
     '/docshell/base',

xpcom/components/moz.build

@@ -49,7 +49,7 @@ LOCAL_INCLUDES += [
     '../base',
     '../build',
     '../ds',
-    '../reflect/xptinfo/src',
+    '../reflect/xptinfo',
     '/chrome/src',
     '/modules/libjar',
 ]

xpcom/reflect/xptcall/public/genstubs.pl

@@ -16,7 +16,7 @@
 #    as a result of the limitations of immediate values in ARM assembly.
 #
 # This number is verified by the IDL parser in xpcom/idl-parser/xpidl.py, as
-# well as in xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp, to
+# well as in xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp, to
 # prevent generating interfaces or loading xpt files that would cause the
 # stubs to run off the entries.
 # If you change this number, please update that location.

xpcom/reflect/xptcall/src/md/unix/moz.build

@@ -331,7 +331,7 @@ FINAL_LIBRARY = 'xpcom_core'
 
 LOCAL_INCLUDES += [
     '../..',
-    '../../../../xptinfo/src',
+    '../../../../xptinfo',
 ]
 
 NO_PGO = True

xpcom/reflect/xptcall/src/md/win32/moz.build

@@ -38,7 +38,7 @@ FINAL_LIBRARY = 'xpcom_core'
 
 LOCAL_INCLUDES += [
     '../..',
-    '../../../../xptinfo/src',
+    '../../../../xptinfo',
 ]
 
 if CONFIG['TARGET_CPU'] != 'x86_64':

xpcom/reflect/xptcall/src/moz.build

@@ -13,7 +13,7 @@ SOURCES += [
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
-    '/xpcom/reflect/xptinfo/src',
+    '/xpcom/reflect/xptinfo',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'

xpcom/reflect/xptinfo/moz.build

@@ -4,5 +4,33 @@
 # 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']
+UNIFIED_SOURCES += [
+    'ShimInterfaceInfo.cpp',
+    'xptiInterfaceInfo.cpp',
+    'xptiInterfaceInfoManager.cpp',
+    'xptiTypelibGuts.cpp',
+    'xptiWorkingSet.cpp',
+]
 
+XPIDL_SOURCES += [
+    'nsIInterfaceInfo.idl',
+    'nsIInterfaceInfoManager.idl',
+]
+
+XPIDL_MODULE = 'xpcom_xpti'
+
+EXPORTS += [
+    'xptinfo.h',
+]
+
+EXPORTS.mozilla += [
+    'XPTInterfaceInfoManager.h',
+]
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+]
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xpcom_core'

xpcom/reflect/xptinfo/public/moz.build

@@ -1,20 +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 += [
-    'nsIInterfaceInfo.idl',
-    'nsIInterfaceInfoManager.idl',
-]
-
-XPIDL_MODULE = 'xpcom_xpti'
-
-EXPORTS += [
-    'xptinfo.h',
-]
-
-EXPORTS.mozilla += [
-    'XPTInterfaceInfoManager.h',
-]

xpcom/reflect/xptinfo/src/moz.build

@@ -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/.
-
-UNIFIED_SOURCES += [
-    'ShimInterfaceInfo.cpp',
-    'xptiInterfaceInfo.cpp',
-    'xptiInterfaceInfoManager.cpp',
-    'xptiTypelibGuts.cpp',
-    'xptiWorkingSet.cpp',
-]
-
-LOCAL_INCLUDES += [
-    '/dom/base',
-]
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xpcom_core'