Bug 1038537 - Part 6: Flatten intl/strres/{public,src}/ directories. r=smontagu

--HG--
rename : intl/strres/public/nsIStringBundle.idl => intl/strres/nsIStringBundle.idl
rename : intl/strres/public/nsIStringBundleOverride.idl => intl/strres/nsIStringBundleOverride.idl
rename : intl/strres/src/nsStringBundle.cpp => intl/strres/nsStringBundle.cpp
rename : intl/strres/src/nsStringBundle.h => intl/strres/nsStringBundle.h
rename : intl/strres/src/nsStringBundleService.h => intl/strres/nsStringBundleService.h
rename : intl/strres/src/nsStringBundleTextOverride.cpp => intl/strres/nsStringBundleTextOverride.cpp
rename : intl/strres/src/nsStringBundleTextOverride.h => intl/strres/nsStringBundleTextOverride.h

intl/build/moz.build

@@ -12,7 +12,7 @@ FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../locale',
     '../lwbrk',
-    '../strres/src',
+    '../strres',
     '../uconv/src',
     '../unicharutil/src',
 ]

intl/strres/moz.build

@@ -4,6 +4,20 @@
 # 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', 'src']
 TEST_TOOL_DIRS += ['tests']
 
+XPIDL_SOURCES += [
+    'nsIStringBundle.idl',
+    'nsIStringBundleOverride.idl',
+]
+
+XPIDL_MODULE = 'intl'
+
+UNIFIED_SOURCES += [
+    'nsStringBundle.cpp',
+    'nsStringBundleTextOverride.cpp',
+]
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'

intl/strres/public/moz.build

@@ -1,13 +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 += [
-    'nsIStringBundle.idl',
-    'nsIStringBundleOverride.idl',
-]
-
-XPIDL_MODULE = 'intl'
-

intl/strres/src/moz.build

@@ -1,14 +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/.
-
-UNIFIED_SOURCES += [
-    'nsStringBundle.cpp',
-    'nsStringBundleTextOverride.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'