Bug 1028559 - Flatten xpcom/string/{public,src}/ directories. r=dbaron
☠☠ backed out by 71f6b8a9b2e8 ☠ ☠
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Sat, 21 Jun 2014 08:56:57 -0700
changeset 211393 5b1b527abe473a64fa9dedf7b487d453eb2e078a
parent 211392 bcd694f0e95dad42f9d355c2f8c8a99715b714ad
child 211394 e7557f70acfebc3d0ea300ea1d78d63854d9c3cb
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1028559
milestone33.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 1028559 - Flatten xpcom/string/{public,src}/ directories. r=dbaron
xpcom/string/moz.build
xpcom/string/nsAString.h
xpcom/string/nsAlgorithm.h
xpcom/string/nsCharTraits.h
xpcom/string/nsDependentString.cpp
xpcom/string/nsDependentString.h
xpcom/string/nsDependentSubstring.cpp
xpcom/string/nsDependentSubstring.h
xpcom/string/nsEmbedString.h
xpcom/string/nsLiteralString.h
xpcom/string/nsPrintfCString.h
xpcom/string/nsPromiseFlatString.cpp
xpcom/string/nsPromiseFlatString.h
xpcom/string/nsReadableUtils.cpp
xpcom/string/nsReadableUtils.h
xpcom/string/nsString.cpp
xpcom/string/nsString.h
xpcom/string/nsStringBuffer.h
xpcom/string/nsStringComparator.cpp
xpcom/string/nsStringFwd.h
xpcom/string/nsStringIterator.h
xpcom/string/nsStringObsolete.cpp
xpcom/string/nsSubstring.cpp
xpcom/string/nsSubstring.h
xpcom/string/nsSubstringTuple.cpp
xpcom/string/nsSubstringTuple.h
xpcom/string/nsTDependentString.cpp
xpcom/string/nsTDependentString.h
xpcom/string/nsTDependentSubstring.cpp
xpcom/string/nsTDependentSubstring.h
xpcom/string/nsTLiteralString.h
xpcom/string/nsTPromiseFlatString.cpp
xpcom/string/nsTPromiseFlatString.h
xpcom/string/nsTString.cpp
xpcom/string/nsTString.h
xpcom/string/nsTStringComparator.cpp
xpcom/string/nsTStringObsolete.cpp
xpcom/string/nsTSubstring.cpp
xpcom/string/nsTSubstring.h
xpcom/string/nsTSubstringTuple.cpp
xpcom/string/nsTSubstringTuple.h
xpcom/string/nsUTF8Utils.h
xpcom/string/nsUTF8UtilsSSE2.cpp
xpcom/string/nsXPCOMStrings.h
xpcom/string/nsXPIDLString.h
xpcom/string/public/moz.build
xpcom/string/public/nsAString.h
xpcom/string/public/nsAlgorithm.h
xpcom/string/public/nsCharTraits.h
xpcom/string/public/nsDependentString.h
xpcom/string/public/nsDependentSubstring.h
xpcom/string/public/nsEmbedString.h
xpcom/string/public/nsLiteralString.h
xpcom/string/public/nsPrintfCString.h
xpcom/string/public/nsPromiseFlatString.h
xpcom/string/public/nsReadableUtils.h
xpcom/string/public/nsString.h
xpcom/string/public/nsStringBuffer.h
xpcom/string/public/nsStringFwd.h
xpcom/string/public/nsStringIterator.h
xpcom/string/public/nsSubstring.h
xpcom/string/public/nsSubstringTuple.h
xpcom/string/public/nsTDependentString.h
xpcom/string/public/nsTDependentSubstring.h
xpcom/string/public/nsTLiteralString.h
xpcom/string/public/nsTPromiseFlatString.h
xpcom/string/public/nsTString.h
xpcom/string/public/nsTSubstring.h
xpcom/string/public/nsTSubstringTuple.h
xpcom/string/public/nsUTF8Utils.h
xpcom/string/public/nsXPCOMStrings.h
xpcom/string/public/nsXPIDLString.h
xpcom/string/public/string-template-def-char.h
xpcom/string/public/string-template-def-unichar.h
xpcom/string/public/string-template-undef.h
xpcom/string/src/moz.build
xpcom/string/src/nsDependentString.cpp
xpcom/string/src/nsDependentSubstring.cpp
xpcom/string/src/nsPromiseFlatString.cpp
xpcom/string/src/nsReadableUtils.cpp
xpcom/string/src/nsString.cpp
xpcom/string/src/nsStringComparator.cpp
xpcom/string/src/nsStringObsolete.cpp
xpcom/string/src/nsSubstring.cpp
xpcom/string/src/nsSubstringTuple.cpp
xpcom/string/src/nsTDependentString.cpp
xpcom/string/src/nsTDependentSubstring.cpp
xpcom/string/src/nsTPromiseFlatString.cpp
xpcom/string/src/nsTString.cpp
xpcom/string/src/nsTStringComparator.cpp
xpcom/string/src/nsTStringObsolete.cpp
xpcom/string/src/nsTSubstring.cpp
xpcom/string/src/nsTSubstringTuple.cpp
xpcom/string/src/nsUTF8UtilsSSE2.cpp
xpcom/string/string-template-def-char.h
xpcom/string/string-template-def-unichar.h
xpcom/string/string-template-undef.h
--- a/xpcom/string/moz.build
+++ b/xpcom/string/moz.build
@@ -1,8 +1,63 @@
 # -*- 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', 'src']
+EXPORTS += [
+    'nsAlgorithm.h',
+    'nsAString.h',
+    'nsCharTraits.h',
+    'nsDependentString.h',
+    'nsDependentSubstring.h',
+    'nsEmbedString.h',
+    'nsLiteralString.h',
+    'nsPrintfCString.h',
+    'nsPromiseFlatString.h',
+    'nsReadableUtils.h',
+    'nsString.h',
+    'nsStringBuffer.h',
+    'nsStringFwd.h',
+    'nsStringIterator.h',
+    'nsSubstring.h',
+    'nsSubstringTuple.h',
+    'nsTDependentString.h',
+    'nsTDependentSubstring.h',
+    'nsTLiteralString.h',
+    'nsTPromiseFlatString.h',
+    'nsTString.h',
+    'nsTSubstring.h',
+    'nsTSubstringTuple.h',
+    'nsUTF8Utils.h',
+    'nsXPCOMStrings.h',
+    'nsXPIDLString.h',
+    'string-template-def-char.h',
+    'string-template-def-unichar.h',
+    'string-template-undef.h',
+]
 
+UNIFIED_SOURCES += [
+    'nsDependentString.cpp',
+    'nsDependentSubstring.cpp',
+    'nsPromiseFlatString.cpp',
+    'nsReadableUtils.cpp',
+    'nsString.cpp',
+    'nsStringComparator.cpp',
+    'nsStringObsolete.cpp',
+    'nsSubstring.cpp',
+    'nsSubstringTuple.cpp',
+]
+
+# Are we targeting x86 or x86-64?  If so, compile the SSE2 functions for
+# nsUTF8Utils.cpp.
+if CONFIG['INTEL_ARCHITECTURE']:
+    SOURCES += ['nsUTF8UtilsSSE2.cpp']
+    SOURCES['nsUTF8UtilsSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
+
+LOCAL_INCLUDES += [
+    '/mfbt/double-conversion',
+]
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xpcom_core'
rename from xpcom/string/public/nsAString.h
rename to xpcom/string/nsAString.h
rename from xpcom/string/public/nsAlgorithm.h
rename to xpcom/string/nsAlgorithm.h
rename from xpcom/string/public/nsCharTraits.h
rename to xpcom/string/nsCharTraits.h
rename from xpcom/string/src/nsDependentString.cpp
rename to xpcom/string/nsDependentString.cpp
rename from xpcom/string/public/nsDependentString.h
rename to xpcom/string/nsDependentString.h
rename from xpcom/string/src/nsDependentSubstring.cpp
rename to xpcom/string/nsDependentSubstring.cpp
rename from xpcom/string/public/nsDependentSubstring.h
rename to xpcom/string/nsDependentSubstring.h
rename from xpcom/string/public/nsEmbedString.h
rename to xpcom/string/nsEmbedString.h
rename from xpcom/string/public/nsLiteralString.h
rename to xpcom/string/nsLiteralString.h
rename from xpcom/string/public/nsPrintfCString.h
rename to xpcom/string/nsPrintfCString.h
rename from xpcom/string/src/nsPromiseFlatString.cpp
rename to xpcom/string/nsPromiseFlatString.cpp
rename from xpcom/string/public/nsPromiseFlatString.h
rename to xpcom/string/nsPromiseFlatString.h
rename from xpcom/string/src/nsReadableUtils.cpp
rename to xpcom/string/nsReadableUtils.cpp
rename from xpcom/string/public/nsReadableUtils.h
rename to xpcom/string/nsReadableUtils.h
rename from xpcom/string/src/nsString.cpp
rename to xpcom/string/nsString.cpp
rename from xpcom/string/public/nsString.h
rename to xpcom/string/nsString.h
rename from xpcom/string/public/nsStringBuffer.h
rename to xpcom/string/nsStringBuffer.h
rename from xpcom/string/src/nsStringComparator.cpp
rename to xpcom/string/nsStringComparator.cpp
rename from xpcom/string/public/nsStringFwd.h
rename to xpcom/string/nsStringFwd.h
rename from xpcom/string/public/nsStringIterator.h
rename to xpcom/string/nsStringIterator.h
rename from xpcom/string/src/nsStringObsolete.cpp
rename to xpcom/string/nsStringObsolete.cpp
rename from xpcom/string/src/nsSubstring.cpp
rename to xpcom/string/nsSubstring.cpp
rename from xpcom/string/public/nsSubstring.h
rename to xpcom/string/nsSubstring.h
rename from xpcom/string/src/nsSubstringTuple.cpp
rename to xpcom/string/nsSubstringTuple.cpp
rename from xpcom/string/public/nsSubstringTuple.h
rename to xpcom/string/nsSubstringTuple.h
rename from xpcom/string/src/nsTDependentString.cpp
rename to xpcom/string/nsTDependentString.cpp
rename from xpcom/string/public/nsTDependentString.h
rename to xpcom/string/nsTDependentString.h
rename from xpcom/string/src/nsTDependentSubstring.cpp
rename to xpcom/string/nsTDependentSubstring.cpp
rename from xpcom/string/public/nsTDependentSubstring.h
rename to xpcom/string/nsTDependentSubstring.h
rename from xpcom/string/public/nsTLiteralString.h
rename to xpcom/string/nsTLiteralString.h
rename from xpcom/string/src/nsTPromiseFlatString.cpp
rename to xpcom/string/nsTPromiseFlatString.cpp
rename from xpcom/string/public/nsTPromiseFlatString.h
rename to xpcom/string/nsTPromiseFlatString.h
rename from xpcom/string/src/nsTString.cpp
rename to xpcom/string/nsTString.cpp
rename from xpcom/string/public/nsTString.h
rename to xpcom/string/nsTString.h
rename from xpcom/string/src/nsTStringComparator.cpp
rename to xpcom/string/nsTStringComparator.cpp
rename from xpcom/string/src/nsTStringObsolete.cpp
rename to xpcom/string/nsTStringObsolete.cpp
rename from xpcom/string/src/nsTSubstring.cpp
rename to xpcom/string/nsTSubstring.cpp
rename from xpcom/string/public/nsTSubstring.h
rename to xpcom/string/nsTSubstring.h
rename from xpcom/string/src/nsTSubstringTuple.cpp
rename to xpcom/string/nsTSubstringTuple.cpp
rename from xpcom/string/public/nsTSubstringTuple.h
rename to xpcom/string/nsTSubstringTuple.h
rename from xpcom/string/public/nsUTF8Utils.h
rename to xpcom/string/nsUTF8Utils.h
rename from xpcom/string/src/nsUTF8UtilsSSE2.cpp
rename to xpcom/string/nsUTF8UtilsSSE2.cpp
rename from xpcom/string/public/nsXPCOMStrings.h
rename to xpcom/string/nsXPCOMStrings.h
rename from xpcom/string/public/nsXPIDLString.h
rename to xpcom/string/nsXPIDLString.h
deleted file mode 100644
--- a/xpcom/string/public/moz.build
+++ /dev/null
@@ -1,37 +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 += [
-    'nsAlgorithm.h',
-    'nsAString.h',
-    'nsCharTraits.h',
-    'nsDependentString.h',
-    'nsDependentSubstring.h',
-    'nsEmbedString.h',
-    'nsLiteralString.h',
-    'nsPrintfCString.h',
-    'nsPromiseFlatString.h',
-    'nsReadableUtils.h',
-    'nsString.h',
-    'nsStringBuffer.h',
-    'nsStringFwd.h',
-    'nsStringIterator.h',
-    'nsSubstring.h',
-    'nsSubstringTuple.h',
-    'nsTDependentString.h',
-    'nsTDependentSubstring.h',
-    'nsTLiteralString.h',
-    'nsTPromiseFlatString.h',
-    'nsTString.h',
-    'nsTSubstring.h',
-    'nsTSubstringTuple.h',
-    'nsUTF8Utils.h',
-    'nsXPCOMStrings.h',
-    'nsXPIDLString.h',
-    'string-template-def-char.h',
-    'string-template-def-unichar.h',
-    'string-template-undef.h',
-]
deleted file mode 100644
--- a/xpcom/string/src/moz.build
+++ /dev/null
@@ -1,31 +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 += [
-    'nsDependentString.cpp',
-    'nsDependentSubstring.cpp',
-    'nsPromiseFlatString.cpp',
-    'nsReadableUtils.cpp',
-    'nsString.cpp',
-    'nsStringComparator.cpp',
-    'nsStringObsolete.cpp',
-    'nsSubstring.cpp',
-    'nsSubstringTuple.cpp',
-]
-
-# Are we targeting x86 or x86-64?  If so, compile the SSE2 functions for
-# nsUTF8Utils.cpp.
-if CONFIG['INTEL_ARCHITECTURE']:
-    SOURCES += ['nsUTF8UtilsSSE2.cpp']
-    SOURCES['nsUTF8UtilsSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
-
-LOCAL_INCLUDES += [
-    '/mfbt/double-conversion',
-]
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xpcom_core'
rename from xpcom/string/public/string-template-def-char.h
rename to xpcom/string/string-template-def-char.h
rename from xpcom/string/public/string-template-def-unichar.h
rename to xpcom/string/string-template-def-unichar.h
rename from xpcom/string/public/string-template-undef.h
rename to xpcom/string/string-template-undef.h