Bug 1038537 - Part 1: Flatten intl/chardet/{public,src}/ directories. r=smontagu
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Thu, 24 Jul 2014 10:56:38 -0700
changeset 217660 bda1cceef8d22643b72ceefe2b95d31cd4c79663
parent 217659 8581ea023552d4bfc30bfce7dd17d0c3efc5ac24
child 217661 9230143db3b778f3a248269c7e707d7f13489d8b
push idunknown
push userunknown
push dateunknown
reviewerssmontagu
bugs1038537
milestone34.0a1
Bug 1038537 - Part 1: Flatten intl/chardet/{public,src}/ directories. r=smontagu
intl/chardet/moz.build
intl/chardet/nsCharDetConstructors.h
intl/chardet/nsChardetModule.cpp
intl/chardet/nsCyrillicClass.h
intl/chardet/nsCyrillicDetector.cpp
intl/chardet/nsCyrillicDetector.h
intl/chardet/nsCyrillicProb.h
intl/chardet/nsDetectionConfident.h
intl/chardet/nsICharsetDetectionObserver.h
intl/chardet/nsICharsetDetector.h
intl/chardet/nsIStringCharsetDetector.h
intl/chardet/public/moz.build
intl/chardet/public/nsDetectionConfident.h
intl/chardet/public/nsICharsetDetectionObserver.h
intl/chardet/public/nsICharsetDetector.h
intl/chardet/public/nsIStringCharsetDetector.h
intl/chardet/src/moz.build
intl/chardet/src/nsCharDetConstructors.h
intl/chardet/src/nsChardetModule.cpp
intl/chardet/src/nsCyrillicClass.h
intl/chardet/src/nsCyrillicDetector.cpp
intl/chardet/src/nsCyrillicDetector.h
intl/chardet/src/nsCyrillicProb.h
--- a/intl/chardet/moz.build
+++ b/intl/chardet/moz.build
@@ -1,7 +1,19 @@
 # -*- 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 += [
+    'nsDetectionConfident.h',
+    'nsICharsetDetectionObserver.h',
+    'nsICharsetDetector.h',
+    'nsIStringCharsetDetector.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsChardetModule.cpp',
+    'nsCyrillicDetector.cpp',
+]
+
+FINAL_LIBRARY = 'xul'
rename from intl/chardet/src/nsCharDetConstructors.h
rename to intl/chardet/nsCharDetConstructors.h
rename from intl/chardet/src/nsChardetModule.cpp
rename to intl/chardet/nsChardetModule.cpp
rename from intl/chardet/src/nsCyrillicClass.h
rename to intl/chardet/nsCyrillicClass.h
rename from intl/chardet/src/nsCyrillicDetector.cpp
rename to intl/chardet/nsCyrillicDetector.cpp
rename from intl/chardet/src/nsCyrillicDetector.h
rename to intl/chardet/nsCyrillicDetector.h
rename from intl/chardet/src/nsCyrillicProb.h
rename to intl/chardet/nsCyrillicProb.h
rename from intl/chardet/public/nsDetectionConfident.h
rename to intl/chardet/nsDetectionConfident.h
rename from intl/chardet/public/nsICharsetDetectionObserver.h
rename to intl/chardet/nsICharsetDetectionObserver.h
rename from intl/chardet/public/nsICharsetDetector.h
rename to intl/chardet/nsICharsetDetector.h
rename from intl/chardet/public/nsIStringCharsetDetector.h
rename to intl/chardet/nsIStringCharsetDetector.h
deleted file mode 100644
--- a/intl/chardet/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 += [
-    'nsDetectionConfident.h',
-    'nsICharsetDetectionObserver.h',
-    'nsICharsetDetector.h',
-    'nsIStringCharsetDetector.h',
-]
-
deleted file mode 100644
--- a/intl/chardet/src/moz.build
+++ /dev/null
@@ -1,12 +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 += [
-    'nsChardetModule.cpp',
-    'nsCyrillicDetector.cpp',
-]
-
-FINAL_LIBRARY = 'xul'