Bug 1203477 - Moved Mozilla specific files to glue directory, and third party files to hyphen directory. Adjusted moz.build files. r=glandium

intl/hyphenation/README.mozilla

@@ -1,11 +1,7 @@
 About the hyphenation code in this directory
 ============================================
 
-The core hyphenation code (files "hyphen.c" and "hyphen.h") comes from the
-Hyphen library, part of the hunspell project. The various COPYING* and README*
-files (except this README.mozilla) are likewise from the hunspell distribution
-of Hyphen:
-
+The hyphen directory comes from the Hyphen library, part of the hunspell project.
   http://sourceforge.net/projects/hunspell/files/Hyphen/.
 
 This code is distributed under the GPL 2.0/LGPL 2.1/MPL 1.1 tri-license, as
@@ -15,14 +11,3 @@ Note that we do not include other tools and resources found in the complete
 Hyphen package from upstream, so the original README.* files may refer to
 additional files that are not present in the Mozilla source tree.
 
-
-The other source files here:
-
-  hnjalloc.h
-  hnjstdio.cpp
-  nsHyphenationManager.cpp
-  nsHyphenator.cpp
-
-as well as the build files (Makefile.in and moz.build) are Mozilla-authored
-code, and the standard MPL 2.0 applies to these, as noted in the comments
-within the files.

intl/hyphenation/glue/moz.build

@@ -17,17 +17,10 @@ UNIFIED_SOURCES += [
 # These files cannot be built in unified mode because they include hnjalloc.h.
 SOURCES += [
     'hnjstdio.cpp',
-    'hyphen.c',
+]
+
+LOCAL_INCLUDES += [
+    '../hyphen',
 ]
 
 FINAL_LIBRARY = 'xul'
-
-# Suppress warnings in third-party code.
-if CONFIG['GNU_CC']:
-    CFLAGS += [
-        '-Wno-sign-compare',
-        '-Wno-type-limits',
-    ]
-
-if not CONFIG['GNU_CXX']:
-    ALLOW_COMPILER_WARNINGS = True

intl/hyphenation/hyphen/moz.build

@@ -0,0 +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/.
+
+# These files cannot be built in unified mode because they include hnjalloc.h.
+SOURCES += [
+    'hyphen.c',
+]
+
+FINAL_LIBRARY = 'xul'
+
+LOCAL_INCLUDES += [
+    '../glue',
+]
+
+# Suppress warnings in third-party code.
+ALLOW_COMPILER_WARNINGS = True

intl/moz.build

@@ -5,7 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
-    'hyphenation',
+    'hyphenation/hyphen',
+    'hyphenation/glue',
     'locale',
     'locales',
     'lwbrk',

tools/rewriting/ThirdPartyPaths.txt

@@ -13,7 +13,7 @@ gfx/ots/
 gfx/qcms/
 gfx/skia/
 gfx/ycbcr/
-intl/hyphenation/
+intl/hyphenation/hyphen/
 intl/icu/
 ipc/chromium/
 js/src/ctypes/libffi/