Bug 1332639 - Remove the external unicharutil library which isn't used and is now unlinkable, r=emk
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 27 Feb 2017 13:38:39 -0500
changeset 374336 e761b88de9de57fb650e439293a45ca076f6c065
parent 374335 ab3684fe0488e10a65389a271fcd78c7987f7e6d
child 374337 cae4a255be3f8edf44a4e6a91ef16a214bd1c9fe
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemk
bugs1332639
milestone54.0a1
Bug 1332639 - Remove the external unicharutil library which isn't used and is now unlinkable, r=emk MozReview-Commit-ID: UOPsyIOB8O
intl/unicharutil/util/internal/moz.build
intl/unicharutil/util/moz.build
intl/unicharutil/util/objs.mozbuild
deleted file mode 100644
--- a/intl/unicharutil/util/internal/moz.build
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Mode: python; 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/.
-
-# This file builds the version of unicharutils_s static library which uses
-# internal linkage. Components that use frozen (external) linkage should use
-# unicharutil_external_s.
-
-include('../objs.mozbuild')
-
-UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
-
-FINAL_LIBRARY = 'xul'
-
-LOCAL_INCLUDES += [
-    '..',
-]
-
-DIST_INSTALL = True
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -1,43 +1,32 @@
 # -*- Mode: python; 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/.
 
-# This file builds the unicharutil_external_s library which should be used
-# by frozen (dependent) linkage components. Internal-linkage code should use
-# unicharutil_s which is built in the internal/ subdirectory.
-
-DIRS += ['internal']
-
 EXPORTS += [
     'GreekCasing.h',
     'ICUUtils.h',
     'IrishCasing.h',
     'nsBidiUtils.h',
     'nsSpecialCasingData.h',
     'nsUnicharUtils.h',
     'nsUnicodeProperties.h',
     'nsUnicodeScriptCodes.h',
 ]
 
-include('objs.mozbuild')
-
-UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
-
-Library('unicharutil_external_s')
-
-FORCE_STATIC_LIB = True
-
-USE_STATIC_LIBS = True
-
-if CONFIG['_MSC_VER']:
-    DEFINES['_USE_ANSI_CPP'] = True
-    # Don't include directives about which CRT to use
-    CFLAGS += ['-Zl']
-    CXXFLAGS += ['-Zl']
+UNIFIED_SOURCES += [
+    'GreekCasing.cpp',
+    'IrishCasing.cpp',
+    'nsBidiUtils.cpp',
+    'nsSpecialCasingData.cpp',
+    'nsUnicharUtils.cpp',
+    'nsUnicodeProperties.cpp',
+]
 
 if CONFIG['ENABLE_INTL_API']:
-    USE_LIBS += ['icu']
+    UNIFIED_SOURCES += [
+        'ICUUtils.cpp',
+    ]
 
-DIST_INSTALL = True
+FINAL_LIBRARY = 'xul'
deleted file mode 100644
--- a/intl/unicharutil/util/objs.mozbuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Mode: python; 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/.
-
-intl_unicharutil_util_lcppsrcs = [
-    'GreekCasing.cpp',
-]
-
-if CONFIG['ENABLE_INTL_API']:
-    intl_unicharutil_util_lcppsrcs += [
-        'ICUUtils.cpp',
-    ]
-
-intl_unicharutil_util_lcppsrcs += [
-    'IrishCasing.cpp',
-    'nsBidiUtils.cpp',
-    'nsSpecialCasingData.cpp',
-    'nsUnicharUtils.cpp',
-    'nsUnicodeProperties.cpp',
-]
-
-intl_unicharutil_util_cppsrcs = [
-    '/intl/unicharutil/util/%s' % s
-        for s in intl_unicharutil_util_lcppsrcs
-]