Bug 863069 - Part 4: More sorting of existing lists; r=ted

accessible/public/ia2/moz.build

@@ -34,6 +34,16 @@ midl_enums = [
     '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

dom/bluetooth/moz.build

@@ -18,11 +18,11 @@ if CONFIG['MOZ_B2G_BT']:
     MODULE = 'dom'
     XPIDL_MODULE = 'dom_bluetooth'
     XPIDL_SOURCES += [
-        'nsIDOMNavigatorBluetooth.idl',
-        'nsIDOMBluetoothManager.idl',
         'nsIDOMBluetoothAdapter.idl',
-        'nsIDOMBluetoothDevice.idl',
         'nsIDOMBluetoothDeviceEvent.idl'
+        'nsIDOMBluetoothDevice.idl',
+        'nsIDOMBluetoothManager.idl',
+        'nsIDOMNavigatorBluetooth.idl',
     ]
 
 EXPORTS.mozilla.dom.bluetooth.ipc += [

dom/network/interfaces/moz.build

@@ -16,12 +16,12 @@ XPIDL_SOURCES += [
 
 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'

gfx/cairo/cairo/src/moz.build

@@ -20,8 +20,8 @@ EXPORTS.cairo += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS.cairo += [
-        'cairo-win32.h',
         'cairo-pdf.h',
+        'cairo-win32.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     EXPORTS.cairo += [
@@ -31,8 +31,8 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS.cairo += [
-        'cairo-quartz.h',
         'cairo-quartz-image.h',
+        'cairo-quartz.h',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos':
     EXPORTS.cairo += [
@@ -49,8 +49,8 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS.cairo += [
-        'cairo-qt.h',
         'cairo-pdf.h',
+        'cairo-qt.h',
     ]
 
 if CONFIG['BUILD_CAIRO_SVG']:

gfx/gl/moz.build

@@ -30,8 +30,8 @@ if CONFIG['MOZ_X11']:
     EXPORTS += ['GLXLibrary.h']
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += [
-        'WGLLibrary.h',
         'SharedSurfaceANGLE.h',
+        'WGLLibrary.h',
     ]
 if CONFIG['MOZ_ENABLE_SKIA_GPU']:
     EXPORTS += ['GLContextSkia.h']

gfx/ipc/moz.build

@@ -12,7 +12,7 @@ EXPORTS.mozilla.gfx += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS.mozilla.gfx += [
-        'SharedDIBWin.h',
         'SharedDIBSurface.h',
+        'SharedDIBWin.h',
     ]
 

gfx/layers/moz.build

@@ -47,8 +47,8 @@ EXPORTS += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     if CONFIG['MOZ_ENABLE_D3D9_LAYER']:
         EXPORTS += [
-            'LayerManagerD3D9.h',
             'DeviceManagerD3D9.h',
+            'LayerManagerD3D9.h',
         ]
     if CONFIG['MOZ_ENABLE_D3D10_LAYER']:
         EXPORTS += [

gfx/thebes/moz.build

@@ -98,10 +98,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += [
         'gfxFT2FontBase.h',
+        'gfxPDFSurface.h',
         'gfxQPainterSurface.h',
         'gfxQtNativeRenderer.h',
         'gfxQtPlatform.h',
-        'gfxPDFSurface.h',
     ]
 
     if CONFIG['MOZ_X11']:
@@ -115,13 +115,13 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
         EXPORTS += ['gfxFT2Fonts.h']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += [
-        'gfxPDFSurface.h',
-        'gfxWindowsPlatform.h',
-        'gfxWindowsSurface.h',
-        'gfxWindowsNativeDrawing.h',
-        'gfxDWriteFonts.h',
         'gfxD2DSurface.h',
+        'gfxDWriteFonts.h',
         'gfxGDIFont.h',
         'gfxGDIFontList.h',
+        'gfxPDFSurface.h',
         'gfxPlatformFontList.h',
+        'gfxWindowsNativeDrawing.h',
+        'gfxWindowsPlatform.h',
+        'gfxWindowsSurface.h',
     ]

toolkit/mozapps/update/common/moz.build

@@ -14,8 +14,8 @@ EXPORTS += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXPORTS += [
-        'updatehelper.h',
-        'updatehelper.cpp',
-        'uachelper.h',
         'pathhash.h',
+        'uachelper.h',
+        'updatehelper.cpp',
+        'updatehelper.h',
     ]

widget/moz.build

@@ -20,13 +20,13 @@ if toolkit == 'windows':
         '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':