From 4b45bf9e76a9d44c72726e1e08b6051735ae83bb Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Thu, 16 May 2013 09:53:27 -0700 Subject: [PATCH] Bug 863069 - Part 4: More sorting of existing lists; r=ted --- accessible/public/ia2/moz.build | 16 +++++++++++++--- dom/bluetooth/moz.build | 6 +++--- dom/network/interfaces/moz.build | 6 +++--- gfx/cairo/cairo/src/moz.build | 6 +++--- gfx/gl/moz.build | 2 +- gfx/ipc/moz.build | 2 +- gfx/layers/moz.build | 2 +- gfx/thebes/moz.build | 12 ++++++------ toolkit/mozapps/update/common/moz.build | 6 +++--- widget/moz.build | 8 ++++---- 10 files changed, 38 insertions(+), 28 deletions(-) diff --git a/accessible/public/ia2/moz.build b/accessible/public/ia2/moz.build index 07d875014de7..5be61b830d41 100644 --- a/accessible/public/ia2/moz.build +++ b/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 diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index 4ae4a99da70d..cc47a47f83a1 100644 --- a/dom/bluetooth/moz.build +++ b/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 += [ diff --git a/dom/network/interfaces/moz.build b/dom/network/interfaces/moz.build index 88ccaa65f512..0b90873af852 100644 --- a/dom/network/interfaces/moz.build +++ b/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' diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index b82e8a0dfb6c..9be74d3b53f5 100644 --- a/gfx/cairo/cairo/src/moz.build +++ b/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']: diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index b819dd16c995..223986ae4813 100644 --- a/gfx/gl/moz.build +++ b/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'] diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build index a24937cf37b6..1fd53dc4c21e 100644 --- a/gfx/ipc/moz.build +++ b/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', ] diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index d8d23b6db847..f71a9eab26b2 100644 --- a/gfx/layers/moz.build +++ b/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 += [ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index 40145e8870c8..0c10c0a07920 100644 --- a/gfx/thebes/moz.build +++ b/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', ] diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build index 69a8da7277d5..ea12c167a12f 100644 --- a/toolkit/mozapps/update/common/moz.build +++ b/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', ] diff --git a/widget/moz.build b/widget/moz.build index 4b01ceca8482..e0abb6c78713 100644 --- a/widget/moz.build +++ b/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':