Bug 863069 - Part 4: More sorting of existing lists; r=ted
☠☠ backed out by de69327ab4e2 ☠ ☠
authorGregory Szorc <gps@mozilla.com>
Thu, 16 May 2013 09:53:27 -0700
changeset 132486 94978dab7186a4abcc3d6a51dbe3098901b6d135
parent 132485 f0661e6dd5b4e51db9002cf270d531b592a32a06
child 132487 49d1bd0e5bd85d4039b22c341d23a02811cccc3b
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewersted
bugs863069
milestone24.0a1
Bug 863069 - Part 4: More sorting of existing lists; r=ted
accessible/public/ia2/moz.build
dom/bluetooth/moz.build
dom/network/interfaces/moz.build
gfx/cairo/cairo/src/moz.build
gfx/gl/moz.build
gfx/ipc/moz.build
gfx/layers/moz.build
gfx/thebes/moz.build
toolkit/mozapps/update/common/moz.build
widget/moz.build
--- a/accessible/public/ia2/moz.build
+++ b/accessible/public/ia2/moz.build
@@ -29,11 +29,21 @@ midl_interfaces = [
 # is ported over.
 midl_enums = [
     'AccessibleEventId',
     'AccessibleRole',
     'AccessibleStates',
     'IA2CommonTypes',
 ]
 
-EXPORTS += [x + '.h' for x in midl_enums]
-EXPORTS += [x + '.h' for x in midl_interfaces]
-EXPORTS += [x + '_i.c' for x in midl_interfaces]
+# EXPORTS expects a sorted list and adding the suffix may change sort order.
+# So ensure we are always sorted.
+headers = ['%s.h' % x for x in midl_enums]
+interfaces_h = ['%s.h' % x for x in midl_interfaces]
+interfaces_c = ['%s._i.c' % x for x in midl_interfaces]
+
+headers.sort()
+interfaces_h.sort()
+interfaces_c.sort()
+
+EXPORTS += headers
+EXPORTS += interfaces_h
+EXPORTS += interfaces_c
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -13,21 +13,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 if CONFIG['MOZ_B2G_BT']:
     MODULE = 'dom'
     XPIDL_MODULE = 'dom_bluetooth'
     XPIDL_SOURCES += [
-        'nsIDOMNavigatorBluetooth.idl',
+        'nsIDOMBluetoothAdapter.idl',
+        'nsIDOMBluetoothDeviceEvent.idl'
+        'nsIDOMBluetoothDevice.idl',
         'nsIDOMBluetoothManager.idl',
-        'nsIDOMBluetoothAdapter.idl',
-        'nsIDOMBluetoothDevice.idl',
-        'nsIDOMBluetoothDeviceEvent.idl'
+        'nsIDOMNavigatorBluetooth.idl',
     ]
 
 EXPORTS.mozilla.dom.bluetooth.ipc += [
     'BluetoothMessageUtils.h',
 ]
 
 EXPORTS.mozilla.dom.bluetooth += [
     'BluetoothCommon.h',
--- a/dom/network/interfaces/moz.build
+++ b/dom/network/interfaces/moz.build
@@ -11,22 +11,22 @@ XPIDL_SOURCES += [
     'nsIDOMTCPSocket.idl',
     'nsIDOMUSSDReceivedEvent.idl',
     'nsITCPSocketChild.idl',
     'nsITCPSocketParent.idl',
 ]
 
 if CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
+        'nsIDOMCFStateChangeEvent.idl',
         'nsIDOMMobileConnection.idl',
+        'nsIDOMNetworkStats.idl',
+        'nsIDOMNetworkStatsManager.idl',
         'nsIMobileConnectionProvider.idl',
         'nsINavigatorMobileConnection.idl',
-        'nsIDOMNetworkStatsManager.idl',
-        'nsIDOMNetworkStats.idl',
-        'nsIDOMCFStateChangeEvent.idl',
     ]
 
 XPIDL_MODULE = 'dom_network'
 
 XPIDL_FLAGS += [
     '-I$(topsrcdir)/dom/interfaces/base',
     '-I$(topsrcdir)/dom/interfaces/events',
 ]
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -15,47 +15,47 @@ EXPORTS.cairo += [
     'cairo-rename.h',
     'cairo-tee.h',
     'cairo-version.h',
     'cairo.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS.cairo += [
+        'cairo-pdf.h',
         'cairo-win32.h',
-        'cairo-pdf.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     EXPORTS.cairo += [
         'cairo-os2.h',
         'cairo-os2-private.h',
         'cairo-pdf.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.cairo += [
+        'cairo-quartz-image.h',
         'cairo-quartz.h',
-        'cairo-quartz-image.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos':
     EXPORTS.cairo += [
         'cairo-beos.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
     EXPORTS.cairo += [
         'cairo-pdf.h',
         'cairo-ps.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     EXPORTS.cairo += [
         'cairo-pdf.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS.cairo += [
+        'cairo-pdf.h',
         'cairo-qt.h',
-        'cairo-pdf.h',
     ]
 
 if CONFIG['BUILD_CAIRO_SVG']:
     EXPORTS.cairo += [
         'cairo-svg.h'
     ]
 
 if CONFIG['MOZ_X11']:
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -25,13 +25,13 @@ EXPORTS += [
     'SurfaceStream.h',
     'SurfaceTypes.h',
 ]
 
 if CONFIG['MOZ_X11']:
     EXPORTS += ['GLXLibrary.h']
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += [
+        'SharedSurfaceANGLE.h',
         'WGLLibrary.h',
-        'SharedSurfaceANGLE.h',
     ]
 if CONFIG['MOZ_ENABLE_SKIA_GPU']:
     EXPORTS += ['GLContextSkia.h']
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -7,12 +7,12 @@
 MODULE = 'gfxipc'
 
 EXPORTS.mozilla.gfx += [
     'SharedDIB.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS.mozilla.gfx += [
+        'SharedDIBSurface.h',
         'SharedDIBWin.h',
-        'SharedDIBSurface.h',
     ]
 
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -42,18 +42,18 @@ EXPORTS += [
     'SharedTextureImage.h',
     'ShmemYCbCrImage.h',
     'TexturePoolOGL.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     if CONFIG['MOZ_ENABLE_D3D9_LAYER']:
         EXPORTS += [
+            'DeviceManagerD3D9.h',
             'LayerManagerD3D9.h',
-            'DeviceManagerD3D9.h',
         ]
     if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
         EXPORTS += [
             'LayerManagerD3D10.h',
             'ReadbackManagerD3D10.h',
         ]
         EXPORTS.mozilla.layers += [
             'CompositorD3D11.h',
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -93,35 +93,35 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os
         'gfxOS2Fonts.h',
         'gfxOS2Platform.h',
         'gfxOS2Surface.h',
         'gfxPDFSurface.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += [
         'gfxFT2FontBase.h',
+        'gfxPDFSurface.h',
         'gfxQPainterSurface.h',
         'gfxQtNativeRenderer.h',
         'gfxQtPlatform.h',
-        'gfxPDFSurface.h',
     ]
 
     if CONFIG['MOZ_X11']:
         EXPORTS += [
             'gfxXlibSurface.h',
         ]
 
     if CONFIG['MOZ_PANGO']:
         EXPORTS += ['gfxPangoFonts.h']
     else:
         EXPORTS += ['gfxFT2Fonts.h']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += [
+        'gfxD2DSurface.h',
+        'gfxDWriteFonts.h',
+        'gfxGDIFont.h',
+        'gfxGDIFontList.h',
         'gfxPDFSurface.h',
+        'gfxPlatformFontList.h',
+        'gfxWindowsNativeDrawing.h',
         'gfxWindowsPlatform.h',
         'gfxWindowsSurface.h',
-        'gfxWindowsNativeDrawing.h',
-        'gfxDWriteFonts.h',
-        'gfxD2DSurface.h',
-        'gfxGDIFont.h',
-        'gfxGDIFontList.h',
-        'gfxPlatformFontList.h',
     ]
--- a/toolkit/mozapps/update/common/moz.build
+++ b/toolkit/mozapps/update/common/moz.build
@@ -9,13 +9,13 @@ MODULE = 'libupdatecommon'
 EXPORTS += [
     'readstrings.h',
     'updatedefines.h',
     'updatelogging.h',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += [
-        'updatehelper.h',
-        'updatehelper.cpp',
+        'pathhash.h',
         'uachelper.h',
-        'pathhash.h',
+        'updatehelper.cpp',
+        'updatehelper.h',
     ]
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -15,23 +15,23 @@ if toolkit in ('qt', 'android', 'gonk', 
 
 if toolkit == 'windows':
     DIRS += ['windows']
 
     XPIDL_SOURCES += [
         'nsIJumpListBuilder.idl',
         'nsIJumpListItem.idl',
         'nsIPrintSettingsWin.idl',
+        'nsITaskbarOverlayIconController.idl',
         'nsITaskbarPreview.idl',
+        'nsITaskbarPreviewButton.idl',
+        'nsITaskbarPreviewController.idl',
+        'nsITaskbarProgress.idl',
         'nsITaskbarTabPreview.idl',
         'nsITaskbarWindowPreview.idl',
-        'nsITaskbarPreviewController.idl',
-        'nsITaskbarPreviewButton.idl',
-        'nsITaskbarProgress.idl',
-        'nsITaskbarOverlayIconController.idl',
         'nsIWinTaskbar.idl',
     ]
 elif toolkit == 'cocoa':
     XPIDL_SOURCES += [
         'nsIMacDockSupport.idl',
         'nsIMacWebAppUtils.idl',
         'nsIStandaloneNativeMenu.idl',
         'nsITaskbarProgress.idl',