Bug 1038537 - Part 3: Flatten intl/locale/src/ directory. r=smontagu
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Thu, 24 Jul 2014 10:56:38 -0700
changeset 205710 b79894a533bcd2c5b742f55e0de9eff40d8b86c3
parent 205709 9230143db3b778f3a248269c7e707d7f13489d8b
child 205711 0732215ac8e87d4f4837a16373ce850766632469
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-esr52@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu
bugs1038537
milestone34.0a1
Bug 1038537 - Part 3: Flatten intl/locale/src/ directory. r=smontagu
dom/encoding/Makefile.in
dom/encoding/moz.build
intl/build/moz.build
intl/locale/Makefile.in
intl/locale/PluralForm.jsm
intl/locale/langGroups.properties
intl/locale/language.properties
intl/locale/mac/moz.build
intl/locale/mac/nsCollationMacUC.cpp
intl/locale/mac/nsCollationMacUC.h
intl/locale/mac/nsDateTimeFormatMac.cpp
intl/locale/mac/nsDateTimeFormatMac.h
intl/locale/mac/nsMacCharset.cpp
intl/locale/moz.build
intl/locale/nsCollation.cpp
intl/locale/nsCollation.h
intl/locale/nsLanguageAtomService.cpp
intl/locale/nsLanguageAtomService.h
intl/locale/nsLocale.cpp
intl/locale/nsLocale.h
intl/locale/nsLocaleConstructors.h
intl/locale/nsLocaleService.cpp
intl/locale/nsPlatformCharset.h
intl/locale/nsScriptableDateFormat.cpp
intl/locale/nsUConvPropertySearch.cpp
intl/locale/nsUConvPropertySearch.h
intl/locale/props2arrays.py
intl/locale/src/Makefile.in
intl/locale/src/PluralForm.jsm
intl/locale/src/langGroups.properties
intl/locale/src/language.properties
intl/locale/src/mac/moz.build
intl/locale/src/mac/nsCollationMacUC.cpp
intl/locale/src/mac/nsCollationMacUC.h
intl/locale/src/mac/nsDateTimeFormatMac.cpp
intl/locale/src/mac/nsDateTimeFormatMac.h
intl/locale/src/mac/nsMacCharset.cpp
intl/locale/src/moz.build
intl/locale/src/nsCollation.cpp
intl/locale/src/nsCollation.h
intl/locale/src/nsLanguageAtomService.cpp
intl/locale/src/nsLanguageAtomService.h
intl/locale/src/nsLocale.cpp
intl/locale/src/nsLocale.h
intl/locale/src/nsLocaleConstructors.h
intl/locale/src/nsLocaleService.cpp
intl/locale/src/nsPlatformCharset.h
intl/locale/src/nsScriptableDateFormat.cpp
intl/locale/src/nsUConvPropertySearch.cpp
intl/locale/src/nsUConvPropertySearch.h
intl/locale/src/props2arrays.py
intl/locale/src/unix/Makefile.in
intl/locale/src/unix/moz.build
intl/locale/src/unix/nsAndroidCharset.cpp
intl/locale/src/unix/nsCollationUnix.cpp
intl/locale/src/unix/nsCollationUnix.h
intl/locale/src/unix/nsDateTimeFormatUnix.cpp
intl/locale/src/unix/nsDateTimeFormatUnix.h
intl/locale/src/unix/nsPosixLocale.cpp
intl/locale/src/unix/nsUNIXCharset.cpp
intl/locale/src/unix/unixcharset.properties
intl/locale/src/windows/Makefile.in
intl/locale/src/windows/moz.build
intl/locale/src/windows/nsCollationWin.cpp
intl/locale/src/windows/nsCollationWin.h
intl/locale/src/windows/nsDateTimeFormatWin.cpp
intl/locale/src/windows/nsDateTimeFormatWin.h
intl/locale/src/windows/nsWin32Locale.cpp
intl/locale/src/windows/nsWinCharset.cpp
intl/locale/src/windows/wincharset.properties
intl/locale/unix/Makefile.in
intl/locale/unix/moz.build
intl/locale/unix/nsAndroidCharset.cpp
intl/locale/unix/nsCollationUnix.cpp
intl/locale/unix/nsCollationUnix.h
intl/locale/unix/nsDateTimeFormatUnix.cpp
intl/locale/unix/nsDateTimeFormatUnix.h
intl/locale/unix/nsPosixLocale.cpp
intl/locale/unix/nsUNIXCharset.cpp
intl/locale/unix/unixcharset.properties
intl/locale/windows/Makefile.in
intl/locale/windows/moz.build
intl/locale/windows/nsCollationWin.cpp
intl/locale/windows/nsCollationWin.h
intl/locale/windows/nsDateTimeFormatWin.cpp
intl/locale/windows/nsDateTimeFormatWin.h
intl/locale/windows/nsWin32Locale.cpp
intl/locale/windows/nsWinCharset.cpp
intl/locale/windows/wincharset.properties
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@@ -1,15 +1,15 @@
 # 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/.
 
 include $(topsrcdir)/config/rules.mk
 
-PROPS2ARRAYS = $(topsrcdir)/intl/locale/src/props2arrays.py
+PROPS2ARRAYS = $(topsrcdir)/intl/locale/props2arrays.py
 labelsencodings.properties.h: $(PROPS2ARRAYS) labelsencodings.properties
 	$(PYTHON) $^ $@
 localesfallbacks.properties.h: $(PROPS2ARRAYS) localesfallbacks.properties
 	$(PYTHON) $^ $@
 domainsfallbacks.properties.h: $(PROPS2ARRAYS) domainsfallbacks.properties
 	$(PYTHON) $^ $@
 encodingsgroups.properties.h: $(PROPS2ARRAYS) encodingsgroups.properties
 	$(PYTHON) $^ $@
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -19,17 +19,17 @@ UNIFIED_SOURCES += [
     'TextDecoder.cpp',
     'TextEncoder.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '/intl/locale/src',
+    '/intl/locale',
 ]
 
 GENERATED_FILES += [
     'domainsfallbacks.properties.h',
     'encodingsgroups.properties.h',
     'labelsencodings.properties.h',
     'localesfallbacks.properties.h',
     'nonparticipatingdomains.properties.h',
--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -5,15 +5,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsI18nModule.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
-    '../locale/src',
+    '../locale',
     '../lwbrk/src',
     '../strres/src',
     '../uconv/src',
     '../unicharutil/src',
 ]
 
rename from intl/locale/src/Makefile.in
rename to intl/locale/Makefile.in
rename from intl/locale/src/PluralForm.jsm
rename to intl/locale/PluralForm.jsm
rename from intl/locale/src/langGroups.properties
rename to intl/locale/langGroups.properties
rename from intl/locale/src/language.properties
rename to intl/locale/language.properties
rename from intl/locale/src/mac/moz.build
rename to intl/locale/mac/moz.build
rename from intl/locale/src/mac/nsCollationMacUC.cpp
rename to intl/locale/mac/nsCollationMacUC.cpp
rename from intl/locale/src/mac/nsCollationMacUC.h
rename to intl/locale/mac/nsCollationMacUC.h
rename from intl/locale/src/mac/nsDateTimeFormatMac.cpp
rename to intl/locale/mac/nsDateTimeFormatMac.cpp
rename from intl/locale/src/mac/nsDateTimeFormatMac.h
rename to intl/locale/mac/nsDateTimeFormatMac.h
rename from intl/locale/src/mac/nsMacCharset.cpp
rename to intl/locale/mac/nsMacCharset.cpp
--- a/intl/locale/moz.build
+++ b/intl/locale/moz.build
@@ -1,9 +1,47 @@
 # -*- 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', 'src']
+DIRS += ['public', 'idl']
 TEST_DIRS += ['tests']
 
+toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
+
+if toolkit == 'windows':
+    DIRS += ['windows']
+elif toolkit == 'cocoa':
+    DIRS += ['mac']
+else:
+    DIRS += ['unix']
+
+EXPORTS += [
+    'nsCollation.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsCollation.cpp',
+    'nsLanguageAtomService.cpp',
+    'nsLocale.cpp',
+    'nsLocaleService.cpp',
+    'nsScriptableDateFormat.cpp',
+    'nsUConvPropertySearch.cpp',
+]
+
+EXTRA_JS_MODULES += [
+    'PluralForm.jsm',
+]
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '/intl/uconv/src',
+]
+
+RESOURCE_FILES += [
+    'langGroups.properties',
+    'language.properties',
+]
rename from intl/locale/src/nsCollation.cpp
rename to intl/locale/nsCollation.cpp
rename from intl/locale/src/nsCollation.h
rename to intl/locale/nsCollation.h
rename from intl/locale/src/nsLanguageAtomService.cpp
rename to intl/locale/nsLanguageAtomService.cpp
rename from intl/locale/src/nsLanguageAtomService.h
rename to intl/locale/nsLanguageAtomService.h
rename from intl/locale/src/nsLocale.cpp
rename to intl/locale/nsLocale.cpp
rename from intl/locale/src/nsLocale.h
rename to intl/locale/nsLocale.h
rename from intl/locale/src/nsLocaleConstructors.h
rename to intl/locale/nsLocaleConstructors.h
rename from intl/locale/src/nsLocaleService.cpp
rename to intl/locale/nsLocaleService.cpp
rename from intl/locale/src/nsPlatformCharset.h
rename to intl/locale/nsPlatformCharset.h
rename from intl/locale/src/nsScriptableDateFormat.cpp
rename to intl/locale/nsScriptableDateFormat.cpp
rename from intl/locale/src/nsUConvPropertySearch.cpp
rename to intl/locale/nsUConvPropertySearch.cpp
rename from intl/locale/src/nsUConvPropertySearch.h
rename to intl/locale/nsUConvPropertySearch.h
rename from intl/locale/src/props2arrays.py
rename to intl/locale/props2arrays.py
deleted file mode 100644
--- a/intl/locale/src/moz.build
+++ /dev/null
@@ -1,44 +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/.
-
-toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
-
-if toolkit == 'windows':
-    DIRS += ['windows']
-elif toolkit == 'cocoa':
-    DIRS += ['mac']
-else:
-    DIRS += ['unix']
-
-EXPORTS += [
-    'nsCollation.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsCollation.cpp',
-    'nsLanguageAtomService.cpp',
-    'nsLocale.cpp',
-    'nsLocaleService.cpp',
-    'nsScriptableDateFormat.cpp',
-    'nsUConvPropertySearch.cpp',
-]
-
-EXTRA_JS_MODULES += [
-    'PluralForm.jsm',
-]
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'
-
-LOCAL_INCLUDES += [
-    '/intl/uconv/src',
-]
-
-RESOURCE_FILES += [
-    'langGroups.properties',
-    'language.properties',
-]
rename from intl/locale/src/unix/Makefile.in
rename to intl/locale/unix/Makefile.in
rename from intl/locale/src/unix/moz.build
rename to intl/locale/unix/moz.build
rename from intl/locale/src/unix/nsAndroidCharset.cpp
rename to intl/locale/unix/nsAndroidCharset.cpp
rename from intl/locale/src/unix/nsCollationUnix.cpp
rename to intl/locale/unix/nsCollationUnix.cpp
rename from intl/locale/src/unix/nsCollationUnix.h
rename to intl/locale/unix/nsCollationUnix.h
rename from intl/locale/src/unix/nsDateTimeFormatUnix.cpp
rename to intl/locale/unix/nsDateTimeFormatUnix.cpp
rename from intl/locale/src/unix/nsDateTimeFormatUnix.h
rename to intl/locale/unix/nsDateTimeFormatUnix.h
rename from intl/locale/src/unix/nsPosixLocale.cpp
rename to intl/locale/unix/nsPosixLocale.cpp
rename from intl/locale/src/unix/nsUNIXCharset.cpp
rename to intl/locale/unix/nsUNIXCharset.cpp
rename from intl/locale/src/unix/unixcharset.properties
rename to intl/locale/unix/unixcharset.properties
rename from intl/locale/src/windows/Makefile.in
rename to intl/locale/windows/Makefile.in
rename from intl/locale/src/windows/moz.build
rename to intl/locale/windows/moz.build
rename from intl/locale/src/windows/nsCollationWin.cpp
rename to intl/locale/windows/nsCollationWin.cpp
rename from intl/locale/src/windows/nsCollationWin.h
rename to intl/locale/windows/nsCollationWin.h
rename from intl/locale/src/windows/nsDateTimeFormatWin.cpp
rename to intl/locale/windows/nsDateTimeFormatWin.cpp
rename from intl/locale/src/windows/nsDateTimeFormatWin.h
rename to intl/locale/windows/nsDateTimeFormatWin.h
rename from intl/locale/src/windows/nsWin32Locale.cpp
rename to intl/locale/windows/nsWin32Locale.cpp
rename from intl/locale/src/windows/nsWinCharset.cpp
rename to intl/locale/windows/nsWinCharset.cpp
rename from intl/locale/src/windows/wincharset.properties
rename to intl/locale/windows/wincharset.properties