Bug 1038537 - Part 4: Flatten intl/locale/{public,idl}/ directories. r=smontagu
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Thu, 24 Jul 2014 10:56:38 -0700
changeset 217663 0732215ac8e87d4f4837a16373ce850766632469
parent 217662 b79894a533bcd2c5b742f55e0de9eff40d8b86c3
child 217664 345f6e3e6972e786242960703ad5b6cdc4348602
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu
bugs1038537
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1038537 - Part 4: Flatten intl/locale/{public,idl}/ directories. r=smontagu
intl/locale/idl/moz.build
intl/locale/idl/nsICollation.idl
intl/locale/idl/nsILocale.idl
intl/locale/idl/nsILocaleService.idl
intl/locale/idl/nsIScriptableDateFormat.idl
intl/locale/moz.build
intl/locale/nsCollationCID.h
intl/locale/nsDateTimeFormatCID.h
intl/locale/nsICollation.idl
intl/locale/nsIDateTimeFormat.h
intl/locale/nsILanguageAtomService.h
intl/locale/nsILocale.idl
intl/locale/nsILocaleService.idl
intl/locale/nsIPlatformCharset.h
intl/locale/nsIScriptableDateFormat.idl
intl/locale/nsPosixLocale.h
intl/locale/nsWin32Locale.h
intl/locale/public/moz.build
intl/locale/public/nsCollationCID.h
intl/locale/public/nsDateTimeFormatCID.h
intl/locale/public/nsIDateTimeFormat.h
intl/locale/public/nsILanguageAtomService.h
intl/locale/public/nsIPlatformCharset.h
intl/locale/public/nsPosixLocale.h
intl/locale/public/nsWin32Locale.h
deleted file mode 100644
--- a/intl/locale/idl/moz.build
+++ /dev/null
@@ -1,15 +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 += [
-    'nsICollation.idl',
-    'nsILocale.idl',
-    'nsILocaleService.idl',
-    'nsIScriptableDateFormat.idl',
-]
-
-XPIDL_MODULE = 'locale'
-
--- a/intl/locale/moz.build
+++ b/intl/locale/moz.build
@@ -1,28 +1,43 @@
 # -*- 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/.
 
-DIRS += ['public', 'idl']
 TEST_DIRS += ['tests']
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 if toolkit == 'windows':
     DIRS += ['windows']
 elif toolkit == 'cocoa':
     DIRS += ['mac']
 else:
     DIRS += ['unix']
 
+XPIDL_SOURCES += [
+    'nsICollation.idl',
+    'nsILocale.idl',
+    'nsILocaleService.idl',
+    'nsIScriptableDateFormat.idl',
+]
+
+XPIDL_MODULE = 'locale'
+
 EXPORTS += [
     'nsCollation.h',
+    'nsCollationCID.h',
+    'nsDateTimeFormatCID.h',
+    'nsIDateTimeFormat.h',
+    'nsILanguageAtomService.h',
+    'nsIPlatformCharset.h',
+    'nsPosixLocale.h',
+    'nsWin32Locale.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsCollation.cpp',
     'nsLanguageAtomService.cpp',
     'nsLocale.cpp',
     'nsLocaleService.cpp',
     'nsScriptableDateFormat.cpp',
rename from intl/locale/public/nsCollationCID.h
rename to intl/locale/nsCollationCID.h
rename from intl/locale/public/nsDateTimeFormatCID.h
rename to intl/locale/nsDateTimeFormatCID.h
rename from intl/locale/idl/nsICollation.idl
rename to intl/locale/nsICollation.idl
rename from intl/locale/public/nsIDateTimeFormat.h
rename to intl/locale/nsIDateTimeFormat.h
rename from intl/locale/public/nsILanguageAtomService.h
rename to intl/locale/nsILanguageAtomService.h
rename from intl/locale/idl/nsILocale.idl
rename to intl/locale/nsILocale.idl
rename from intl/locale/idl/nsILocaleService.idl
rename to intl/locale/nsILocaleService.idl
rename from intl/locale/public/nsIPlatformCharset.h
rename to intl/locale/nsIPlatformCharset.h
rename from intl/locale/idl/nsIScriptableDateFormat.idl
rename to intl/locale/nsIScriptableDateFormat.idl
rename from intl/locale/public/nsPosixLocale.h
rename to intl/locale/nsPosixLocale.h
rename from intl/locale/public/nsWin32Locale.h
rename to intl/locale/nsWin32Locale.h
deleted file mode 100644
--- a/intl/locale/public/moz.build
+++ /dev/null
@@ -1,16 +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 += [
-    'nsCollationCID.h',
-    'nsDateTimeFormatCID.h',
-    'nsIDateTimeFormat.h',
-    'nsILanguageAtomService.h',
-    'nsIPlatformCharset.h',
-    'nsPosixLocale.h',
-    'nsWin32Locale.h',
-]
-