Bug 1028559 - Flatten xpcom/string/{public,src}/ directories. r=dbaron

mozilla-spidermonkey · Jun 25, 2014 · 129a74c · 129a74c
1 parent 1734304
commit 129a74c
Show file tree

Hide file tree

Showing 50 changed files with 56 additions and 69 deletions.
diff --git a/xpcom/string/moz.build b/xpcom/string/moz.build
@@ -4,5 +4,60 @@
 # 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'
diff --git a/xpcom/string/public/nsAString.h → xpcom/string/nsAString.h b/xpcom/string/public/nsAString.h → xpcom/string/nsAString.h
diff --git a/xpcom/string/public/nsAlgorithm.h → xpcom/string/nsAlgorithm.h b/xpcom/string/public/nsAlgorithm.h → xpcom/string/nsAlgorithm.h
diff --git a/xpcom/string/public/nsCharTraits.h → xpcom/string/nsCharTraits.h b/xpcom/string/public/nsCharTraits.h → xpcom/string/nsCharTraits.h
diff --git a/xpcom/string/src/nsDependentString.cpp → xpcom/string/nsDependentString.cpp b/xpcom/string/src/nsDependentString.cpp → xpcom/string/nsDependentString.cpp
diff --git a/xpcom/string/public/nsDependentString.h → xpcom/string/nsDependentString.h b/xpcom/string/public/nsDependentString.h → xpcom/string/nsDependentString.h
diff --git a/xpcom/string/src/nsDependentSubstring.cpp → xpcom/string/nsDependentSubstring.cpp b/xpcom/string/src/nsDependentSubstring.cpp → xpcom/string/nsDependentSubstring.cpp
diff --git a/xpcom/string/public/nsDependentSubstring.h → xpcom/string/nsDependentSubstring.h b/xpcom/string/public/nsDependentSubstring.h → xpcom/string/nsDependentSubstring.h
diff --git a/xpcom/string/public/nsEmbedString.h → xpcom/string/nsEmbedString.h b/xpcom/string/public/nsEmbedString.h → xpcom/string/nsEmbedString.h
diff --git a/xpcom/string/public/nsLiteralString.h → xpcom/string/nsLiteralString.h b/xpcom/string/public/nsLiteralString.h → xpcom/string/nsLiteralString.h
diff --git a/xpcom/string/public/nsPrintfCString.h → xpcom/string/nsPrintfCString.h b/xpcom/string/public/nsPrintfCString.h → xpcom/string/nsPrintfCString.h
diff --git a/xpcom/string/src/nsPromiseFlatString.cpp → xpcom/string/nsPromiseFlatString.cpp b/xpcom/string/src/nsPromiseFlatString.cpp → xpcom/string/nsPromiseFlatString.cpp
diff --git a/xpcom/string/public/nsPromiseFlatString.h → xpcom/string/nsPromiseFlatString.h b/xpcom/string/public/nsPromiseFlatString.h → xpcom/string/nsPromiseFlatString.h
diff --git a/xpcom/string/src/nsReadableUtils.cpp → xpcom/string/nsReadableUtils.cpp b/xpcom/string/src/nsReadableUtils.cpp → xpcom/string/nsReadableUtils.cpp
diff --git a/xpcom/string/public/nsReadableUtils.h → xpcom/string/nsReadableUtils.h b/xpcom/string/public/nsReadableUtils.h → xpcom/string/nsReadableUtils.h
diff --git a/xpcom/string/src/nsString.cpp → xpcom/string/nsString.cpp b/xpcom/string/src/nsString.cpp → xpcom/string/nsString.cpp
diff --git a/xpcom/string/public/nsString.h → xpcom/string/nsString.h b/xpcom/string/public/nsString.h → xpcom/string/nsString.h
diff --git a/xpcom/string/public/nsStringBuffer.h → xpcom/string/nsStringBuffer.h b/xpcom/string/public/nsStringBuffer.h → xpcom/string/nsStringBuffer.h
diff --git a/xpcom/string/src/nsStringComparator.cpp → xpcom/string/nsStringComparator.cpp b/xpcom/string/src/nsStringComparator.cpp → xpcom/string/nsStringComparator.cpp
diff --git a/xpcom/string/public/nsStringFwd.h → xpcom/string/nsStringFwd.h b/xpcom/string/public/nsStringFwd.h → xpcom/string/nsStringFwd.h
diff --git a/xpcom/string/public/nsStringIterator.h → xpcom/string/nsStringIterator.h b/xpcom/string/public/nsStringIterator.h → xpcom/string/nsStringIterator.h
diff --git a/xpcom/string/src/nsStringObsolete.cpp → xpcom/string/nsStringObsolete.cpp b/xpcom/string/src/nsStringObsolete.cpp → xpcom/string/nsStringObsolete.cpp
diff --git a/xpcom/string/src/nsSubstring.cpp → xpcom/string/nsSubstring.cpp b/xpcom/string/src/nsSubstring.cpp → xpcom/string/nsSubstring.cpp
diff --git a/xpcom/string/public/nsSubstring.h → xpcom/string/nsSubstring.h b/xpcom/string/public/nsSubstring.h → xpcom/string/nsSubstring.h
diff --git a/xpcom/string/src/nsSubstringTuple.cpp → xpcom/string/nsSubstringTuple.cpp b/xpcom/string/src/nsSubstringTuple.cpp → xpcom/string/nsSubstringTuple.cpp
diff --git a/xpcom/string/public/nsSubstringTuple.h → xpcom/string/nsSubstringTuple.h b/xpcom/string/public/nsSubstringTuple.h → xpcom/string/nsSubstringTuple.h
diff --git a/xpcom/string/src/nsTDependentString.cpp → xpcom/string/nsTDependentString.cpp b/xpcom/string/src/nsTDependentString.cpp → xpcom/string/nsTDependentString.cpp
diff --git a/xpcom/string/public/nsTDependentString.h → xpcom/string/nsTDependentString.h b/xpcom/string/public/nsTDependentString.h → xpcom/string/nsTDependentString.h
diff --git a/xpcom/string/src/nsTDependentSubstring.cpp → xpcom/string/nsTDependentSubstring.cpp b/xpcom/string/src/nsTDependentSubstring.cpp → xpcom/string/nsTDependentSubstring.cpp
diff --git a/xpcom/string/public/nsTDependentSubstring.h → xpcom/string/nsTDependentSubstring.h b/xpcom/string/public/nsTDependentSubstring.h → xpcom/string/nsTDependentSubstring.h
diff --git a/xpcom/string/public/nsTLiteralString.h → xpcom/string/nsTLiteralString.h b/xpcom/string/public/nsTLiteralString.h → xpcom/string/nsTLiteralString.h
diff --git a/xpcom/string/src/nsTPromiseFlatString.cpp → xpcom/string/nsTPromiseFlatString.cpp b/xpcom/string/src/nsTPromiseFlatString.cpp → xpcom/string/nsTPromiseFlatString.cpp
diff --git a/xpcom/string/public/nsTPromiseFlatString.h → xpcom/string/nsTPromiseFlatString.h b/xpcom/string/public/nsTPromiseFlatString.h → xpcom/string/nsTPromiseFlatString.h
diff --git a/xpcom/string/src/nsTString.cpp → xpcom/string/nsTString.cpp b/xpcom/string/src/nsTString.cpp → xpcom/string/nsTString.cpp
diff --git a/xpcom/string/public/nsTString.h → xpcom/string/nsTString.h b/xpcom/string/public/nsTString.h → xpcom/string/nsTString.h
diff --git a/xpcom/string/src/nsTStringComparator.cpp → xpcom/string/nsTStringComparator.cpp b/xpcom/string/src/nsTStringComparator.cpp → xpcom/string/nsTStringComparator.cpp
diff --git a/xpcom/string/src/nsTStringObsolete.cpp → xpcom/string/nsTStringObsolete.cpp b/xpcom/string/src/nsTStringObsolete.cpp → xpcom/string/nsTStringObsolete.cpp
diff --git a/xpcom/string/src/nsTSubstring.cpp → xpcom/string/nsTSubstring.cpp b/xpcom/string/src/nsTSubstring.cpp → xpcom/string/nsTSubstring.cpp
diff --git a/xpcom/string/public/nsTSubstring.h → xpcom/string/nsTSubstring.h b/xpcom/string/public/nsTSubstring.h → xpcom/string/nsTSubstring.h
diff --git a/xpcom/string/src/nsTSubstringTuple.cpp → xpcom/string/nsTSubstringTuple.cpp b/xpcom/string/src/nsTSubstringTuple.cpp → xpcom/string/nsTSubstringTuple.cpp
diff --git a/xpcom/string/public/nsTSubstringTuple.h → xpcom/string/nsTSubstringTuple.h b/xpcom/string/public/nsTSubstringTuple.h → xpcom/string/nsTSubstringTuple.h
diff --git a/xpcom/string/public/nsUTF8Utils.h → xpcom/string/nsUTF8Utils.h b/xpcom/string/public/nsUTF8Utils.h → xpcom/string/nsUTF8Utils.h
diff --git a/xpcom/string/src/nsUTF8UtilsSSE2.cpp → xpcom/string/nsUTF8UtilsSSE2.cpp b/xpcom/string/src/nsUTF8UtilsSSE2.cpp → xpcom/string/nsUTF8UtilsSSE2.cpp
diff --git a/xpcom/string/public/nsXPCOMStrings.h → xpcom/string/nsXPCOMStrings.h b/xpcom/string/public/nsXPCOMStrings.h → xpcom/string/nsXPCOMStrings.h
diff --git a/xpcom/string/public/nsXPIDLString.h → xpcom/string/nsXPIDLString.h b/xpcom/string/public/nsXPIDLString.h → xpcom/string/nsXPIDLString.h
diff --git a/xpcom/string/public/moz.build b/xpcom/string/public/moz.build
diff --git a/xpcom/string/src/moz.build b/xpcom/string/src/moz.build
diff --git a/.../string/public/string-template-def-char.h → xpcom/string/string-template-def-char.h b/.../string/public/string-template-def-char.h → xpcom/string/string-template-def-char.h
diff --git a/...ring/public/string-template-def-unichar.h → xpcom/string/string-template-def-unichar.h b/...ring/public/string-template-def-unichar.h → xpcom/string/string-template-def-unichar.h
diff --git a/xpcom/string/public/string-template-undef.h → xpcom/string/string-template-undef.h b/xpcom/string/public/string-template-undef.h → xpcom/string/string-template-undef.h