Bug 1203477 - Moved Mozilla specific files to glue directory, and third party files to hyphen directory. Adjusted moz.build files. r=glandium
authorsajitk <sajitk@rocketmail.com>
Wed, 16 Sep 2015 21:01:00 +0200
changeset 295816 77e7d515112921409d01664b88b344c6f50e200b
parent 295815 58e036ba3d666dfad9e0d6d7bc3958d33236669a
child 295817 178892677bdbb6dc0a0b21c67e06bc44a6db99e6
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1203477
milestone43.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 1203477 - Moved Mozilla specific files to glue directory, and third party files to hyphen directory. Adjusted moz.build files. r=glandium
intl/hyphenation/COPYING
intl/hyphenation/COPYING.LGPL
intl/hyphenation/COPYING.MPL
intl/hyphenation/README
intl/hyphenation/README.compound
intl/hyphenation/README.hyphen
intl/hyphenation/README.mozilla
intl/hyphenation/README.nonstandard
intl/hyphenation/glue/hnjalloc.h
intl/hyphenation/glue/hnjstdio.cpp
intl/hyphenation/glue/moz.build
intl/hyphenation/glue/nsHyphenationManager.cpp
intl/hyphenation/glue/nsHyphenationManager.h
intl/hyphenation/glue/nsHyphenator.cpp
intl/hyphenation/glue/nsHyphenator.h
intl/hyphenation/hnjalloc.h
intl/hyphenation/hnjstdio.cpp
intl/hyphenation/hyphen.c
intl/hyphenation/hyphen.h
intl/hyphenation/hyphen/COPYING
intl/hyphenation/hyphen/COPYING.LGPL
intl/hyphenation/hyphen/COPYING.MPL
intl/hyphenation/hyphen/README
intl/hyphenation/hyphen/README.compound
intl/hyphenation/hyphen/README.hyphen
intl/hyphenation/hyphen/README.nonstandard
intl/hyphenation/hyphen/hyphen.c
intl/hyphenation/hyphen/hyphen.h
intl/hyphenation/hyphen/moz.build
intl/hyphenation/moz.build
intl/hyphenation/nsHyphenationManager.cpp
intl/hyphenation/nsHyphenationManager.h
intl/hyphenation/nsHyphenator.cpp
intl/hyphenation/nsHyphenator.h
intl/moz.build
tools/rewriting/ThirdPartyPaths.txt
--- a/intl/hyphenation/README.mozilla
+++ b/intl/hyphenation/README.mozilla
@@ -1,28 +1,13 @@
 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
 detailed in the associated README and COPYING files.
 
 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.
rename from intl/hyphenation/hnjalloc.h
rename to intl/hyphenation/glue/hnjalloc.h
rename from intl/hyphenation/hnjstdio.cpp
rename to intl/hyphenation/glue/hnjstdio.cpp
rename from intl/hyphenation/moz.build
rename to intl/hyphenation/glue/moz.build
--- a/intl/hyphenation/moz.build
+++ b/intl/hyphenation/glue/moz.build
@@ -12,22 +12,15 @@ EXPORTS += [
 UNIFIED_SOURCES += [
     'nsHyphenationManager.cpp',
     'nsHyphenator.cpp',
 ]
 
 # 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
rename from intl/hyphenation/nsHyphenationManager.cpp
rename to intl/hyphenation/glue/nsHyphenationManager.cpp
rename from intl/hyphenation/nsHyphenationManager.h
rename to intl/hyphenation/glue/nsHyphenationManager.h
rename from intl/hyphenation/nsHyphenator.cpp
rename to intl/hyphenation/glue/nsHyphenator.cpp
rename from intl/hyphenation/nsHyphenator.h
rename to intl/hyphenation/glue/nsHyphenator.h
rename from intl/hyphenation/COPYING
rename to intl/hyphenation/hyphen/COPYING
rename from intl/hyphenation/COPYING.LGPL
rename to intl/hyphenation/hyphen/COPYING.LGPL
rename from intl/hyphenation/COPYING.MPL
rename to intl/hyphenation/hyphen/COPYING.MPL
rename from intl/hyphenation/README
rename to intl/hyphenation/hyphen/README
rename from intl/hyphenation/README.compound
rename to intl/hyphenation/hyphen/README.compound
rename from intl/hyphenation/README.hyphen
rename to intl/hyphenation/hyphen/README.hyphen
rename from intl/hyphenation/README.nonstandard
rename to intl/hyphenation/hyphen/README.nonstandard
rename from intl/hyphenation/hyphen.c
rename to intl/hyphenation/hyphen/hyphen.c
rename from intl/hyphenation/hyphen.h
rename to intl/hyphenation/hyphen/hyphen.h
copy from intl/hyphenation/moz.build
copy to intl/hyphenation/hyphen/moz.build
--- a/intl/hyphenation/moz.build
+++ b/intl/hyphenation/hyphen/moz.build
@@ -1,33 +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/.
 
-EXPORTS += [
-    'nsHyphenationManager.h',
-    'nsHyphenator.h',
-]
-
-UNIFIED_SOURCES += [
-    'nsHyphenationManager.cpp',
-    'nsHyphenator.cpp',
-]
-
 # These files cannot be built in unified mode because they include hnjalloc.h.
 SOURCES += [
-    'hnjstdio.cpp',
     'hyphen.c',
 ]
 
 FINAL_LIBRARY = 'xul'
 
+LOCAL_INCLUDES += [
+    '../glue',
+]
+
 # 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
+ALLOW_COMPILER_WARNINGS = True
--- a/intl/moz.build
+++ b/intl/moz.build
@@ -1,16 +1,17 @@
 # -*- 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 += [
-    'hyphenation',
+    'hyphenation/hyphen',
+    'hyphenation/glue',
     'locale',
     'locales',
     'lwbrk',
     'strres',
     'unicharutil',
 ]
 
 DIRS += [
--- a/tools/rewriting/ThirdPartyPaths.txt
+++ b/tools/rewriting/ThirdPartyPaths.txt
@@ -8,17 +8,17 @@ gfx/2d/image_operations
 gfx/angle/
 gfx/cairo/
 gfx/graphite2/
 gfx/harfbuzz/
 gfx/ots/
 gfx/qcms/
 gfx/skia/
 gfx/ycbcr/
-intl/hyphenation/
+intl/hyphenation/hyphen/
 intl/icu/
 ipc/chromium/
 js/src/ctypes/libffi/
 js/src/dtoa.c
 js/src/jit/arm64/vixl/
 media/gmp-clearkey/0.1/openaes/
 media/kiss_ftt/
 media/libav/