Bug 1332631 part E - file moves from xpcom/glue to xpcom/string, r?froydnj
MozReview-Commit-ID: AGHVJ5uYOoI
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -10,17 +10,16 @@ with Files('nsString*'):
DIRS += ['standalone']
EXPORTS += [
'nsCategoryCache.h',
'nsComponentManagerUtils.h',
'nsServiceManagerUtils.h',
'nsStringAPI.h',
'nsStringGlue.h',
- 'nsTextFormatter.h',
'nsXPTCUtils.h',
]
EXPORTS.mozilla += [
'FileUtils.h',
'GenericFactory.h',
]
--- a/xpcom/glue/objs.mozbuild
+++ b/xpcom/glue/objs.mozbuild
@@ -12,14 +12,13 @@ xpcom_glue_src_lcppsrcs = [
]
xpcom_glue_src_cppsrcs = [
'/xpcom/glue/%s' % s for s in xpcom_glue_src_lcppsrcs
]
xpcom_gluens_src_lcppsrcs = [
'GenericFactory.cpp',
- 'nsTextFormatter.cpp',
]
xpcom_gluens_src_cppsrcs = [
'/xpcom/glue/%s' % s for s in xpcom_gluens_src_lcppsrcs
]
--- a/xpcom/string/moz.build
+++ b/xpcom/string/moz.build
@@ -20,16 +20,17 @@ EXPORTS += [
'nsString.h',
'nsStringBuffer.h',
'nsStringFwd.h',
'nsStringIterator.h',
'nsSubstring.h',
'nsSubstringTuple.h',
'nsTDependentString.h',
'nsTDependentSubstring.h',
+ 'nsTextFormatter.h',
'nsTLiteralString.h',
'nsTPromiseFlatString.h',
'nsTString.h',
'nsTSubstring.h',
'nsTSubstringTuple.h',
'nsUTF8Utils.h',
'nsXPCOMStrings.h',
'nsXPIDLString.h',
@@ -43,16 +44,17 @@ UNIFIED_SOURCES += [
'nsDependentSubstring.cpp',
'nsPromiseFlatString.cpp',
'nsReadableUtils.cpp',
'nsString.cpp',
'nsStringComparator.cpp',
'nsStringObsolete.cpp',
'nsSubstring.cpp',
'nsSubstringTuple.cpp',
+ 'nsTextFormatter.cpp',
]
# Are we targeting x86 or x86-64? If so, compile the SSE2 functions for
# nsUTF8Utils.cpp and nsReadableUtils.cpp.
if CONFIG['INTEL_ARCHITECTURE']:
SOURCES += ['nsUTF8UtilsSSE2.cpp']
SOURCES['nsUTF8UtilsSSE2.cpp'].flags += CONFIG['SSE2_FLAGS']
SOURCES += ['nsReadableUtilsSSE2.cpp']
rename from xpcom/glue/nsTextFormatter.cpp
rename to xpcom/string/nsTextFormatter.cpp
rename from xpcom/glue/nsTextFormatter.h
rename to xpcom/string/nsTextFormatter.h