Bug 1038537 - Part 9: Flatten intl/unicharutil/{idl,public,src}/ directories. r=smontagu
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Thu, 24 Jul 2014 10:56:40 -0700
changeset 196042 80aec550b1e06b59ccd4c0f1a33420221421141e
parent 196041 38b4378f21c0a8d20ed87b2dccd4b6b82cac12bf
child 196043 6983eedbe0bee5adfba8ae5730aca4aee525f39a
push id27205
push userkwierso@gmail.com
push dateFri, 25 Jul 2014 22:59:38 +0000
treeherdermozilla-central@e07264876182 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu
bugs1038537
milestone34.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 1038537 - Part 9: Flatten intl/unicharutil/{idl,public,src}/ directories. r=smontagu
intl/build/moz.build
intl/unicharutil/idl/moz.build
intl/unicharutil/idl/nsIEntityConverter.idl
intl/unicharutil/idl/nsISaveAsCharset.idl
intl/unicharutil/idl/nsIUnicodeNormalizer.idl
intl/unicharutil/moz.build
intl/unicharutil/normalization_data.h
intl/unicharutil/nsCaseConversionImp2.cpp
intl/unicharutil/nsCaseConversionImp2.h
intl/unicharutil/nsCategoryImp.cpp
intl/unicharutil/nsCategoryImp.h
intl/unicharutil/nsEntityConverter.cpp
intl/unicharutil/nsEntityConverter.h
intl/unicharutil/nsICaseConversion.h
intl/unicharutil/nsIEntityConverter.idl
intl/unicharutil/nsISaveAsCharset.idl
intl/unicharutil/nsIUGenCategory.h
intl/unicharutil/nsIUnicodeNormalizer.idl
intl/unicharutil/nsSaveAsCharset.cpp
intl/unicharutil/nsSaveAsCharset.h
intl/unicharutil/nsUnicharUtilCIID.h
intl/unicharutil/nsUnicodeNormalizer.cpp
intl/unicharutil/nsUnicodeNormalizer.h
intl/unicharutil/public/moz.build
intl/unicharutil/public/nsICaseConversion.h
intl/unicharutil/public/nsIUGenCategory.h
intl/unicharutil/public/nsUnicharUtilCIID.h
intl/unicharutil/public/nsUnicodeNormalizer.h
intl/unicharutil/src/moz.build
intl/unicharutil/src/normalization_data.h
intl/unicharutil/src/nsCaseConversionImp2.cpp
intl/unicharutil/src/nsCaseConversionImp2.h
intl/unicharutil/src/nsCategoryImp.cpp
intl/unicharutil/src/nsCategoryImp.h
intl/unicharutil/src/nsEntityConverter.cpp
intl/unicharutil/src/nsEntityConverter.h
intl/unicharutil/src/nsSaveAsCharset.cpp
intl/unicharutil/src/nsSaveAsCharset.h
intl/unicharutil/src/nsUnicodeNormalizer.cpp
intl/unicharutil/src/ucdata.c
intl/unicharutil/src/ucdata.h
intl/unicharutil/ucdata.c
intl/unicharutil/ucdata.h
--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -9,11 +9,11 @@ SOURCES += [
 ]
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../locale',
     '../lwbrk',
     '../strres',
     '../uconv',
-    '../unicharutil/src',
+    '../unicharutil',
 ]
 
deleted file mode 100644
--- a/intl/unicharutil/idl/moz.build
+++ /dev/null
@@ -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/.
-
-XPIDL_SOURCES += [
-    'nsIEntityConverter.idl',
-    'nsISaveAsCharset.idl',
-    'nsIUnicodeNormalizer.idl',
-]
-
-XPIDL_MODULE = 'unicharutil'
-
--- a/intl/unicharutil/moz.build
+++ b/intl/unicharutil/moz.build
@@ -1,9 +1,33 @@
 # -*- 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 += ['idl', 'public', 'util', 'src', 'tables']
+DIRS += ['util', 'tables']
 TEST_TOOL_DIRS += ['tests']
 
+XPIDL_SOURCES += [
+    'nsIEntityConverter.idl',
+    'nsISaveAsCharset.idl',
+    'nsIUnicodeNormalizer.idl',
+]
+
+XPIDL_MODULE = 'unicharutil'
+
+EXPORTS += [
+    'nsICaseConversion.h',
+    'nsIUGenCategory.h',
+    'nsUnicharUtilCIID.h',
+    'nsUnicodeNormalizer.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsCaseConversionImp2.cpp',
+    'nsCategoryImp.cpp',
+    'nsEntityConverter.cpp',
+    'nsSaveAsCharset.cpp',
+    'nsUnicodeNormalizer.cpp',
+]
+
+FINAL_LIBRARY = 'xul'
rename from intl/unicharutil/src/normalization_data.h
rename to intl/unicharutil/normalization_data.h
rename from intl/unicharutil/src/nsCaseConversionImp2.cpp
rename to intl/unicharutil/nsCaseConversionImp2.cpp
rename from intl/unicharutil/src/nsCaseConversionImp2.h
rename to intl/unicharutil/nsCaseConversionImp2.h
rename from intl/unicharutil/src/nsCategoryImp.cpp
rename to intl/unicharutil/nsCategoryImp.cpp
rename from intl/unicharutil/src/nsCategoryImp.h
rename to intl/unicharutil/nsCategoryImp.h
rename from intl/unicharutil/src/nsEntityConverter.cpp
rename to intl/unicharutil/nsEntityConverter.cpp
rename from intl/unicharutil/src/nsEntityConverter.h
rename to intl/unicharutil/nsEntityConverter.h
rename from intl/unicharutil/public/nsICaseConversion.h
rename to intl/unicharutil/nsICaseConversion.h
rename from intl/unicharutil/idl/nsIEntityConverter.idl
rename to intl/unicharutil/nsIEntityConverter.idl
rename from intl/unicharutil/idl/nsISaveAsCharset.idl
rename to intl/unicharutil/nsISaveAsCharset.idl
rename from intl/unicharutil/public/nsIUGenCategory.h
rename to intl/unicharutil/nsIUGenCategory.h
rename from intl/unicharutil/idl/nsIUnicodeNormalizer.idl
rename to intl/unicharutil/nsIUnicodeNormalizer.idl
rename from intl/unicharutil/src/nsSaveAsCharset.cpp
rename to intl/unicharutil/nsSaveAsCharset.cpp
rename from intl/unicharutil/src/nsSaveAsCharset.h
rename to intl/unicharutil/nsSaveAsCharset.h
rename from intl/unicharutil/public/nsUnicharUtilCIID.h
rename to intl/unicharutil/nsUnicharUtilCIID.h
rename from intl/unicharutil/src/nsUnicodeNormalizer.cpp
rename to intl/unicharutil/nsUnicodeNormalizer.cpp
rename from intl/unicharutil/public/nsUnicodeNormalizer.h
rename to intl/unicharutil/nsUnicodeNormalizer.h
deleted file mode 100644
--- a/intl/unicharutil/public/moz.build
+++ /dev/null
@@ -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/.
-
-EXPORTS += [
-    'nsICaseConversion.h',
-    'nsIUGenCategory.h',
-    'nsUnicharUtilCIID.h',
-    'nsUnicodeNormalizer.h',
-]
-
deleted file mode 100644
--- a/intl/unicharutil/src/moz.build
+++ /dev/null
@@ -1,15 +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 += [
-    'nsCaseConversionImp2.cpp',
-    'nsCategoryImp.cpp',
-    'nsEntityConverter.cpp',
-    'nsSaveAsCharset.cpp',
-    'nsUnicodeNormalizer.cpp',
-]
-
-FINAL_LIBRARY = 'xul'
rename from intl/unicharutil/src/ucdata.c
rename to intl/unicharutil/ucdata.c
rename from intl/unicharutil/src/ucdata.h
rename to intl/unicharutil/ucdata.h