Bug 1038537 - Part 5: Flatten intl/lwbrk/{idl,public,src}/ directories. r=smontagu
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Thu, 24 Jul 2014 10:56:39 -0700
changeset 195905 345f6e3e6972e786242960703ad5b6cdc4348602
parent 195904 0732215ac8e87d4f4837a16373ce850766632469
child 195906 0d7d58108070f7fae8f149e9f5b4209bec8bee12
push id46730
push userbirunthan@mohanathas.com
push dateThu, 24 Jul 2014 17:57:11 +0000
treeherdermozilla-inbound@80aec550b1e0 [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 5: Flatten intl/lwbrk/{idl,public,src}/ directories. r=smontagu
intl/build/moz.build
intl/lwbrk/Makefile.in
intl/lwbrk/crashtests/416721.html
intl/lwbrk/crashtests/crashtests.list
intl/lwbrk/idl/moz.build
intl/lwbrk/idl/nsISemanticUnitScanner.idl
intl/lwbrk/jisx4051class.h
intl/lwbrk/jisx4051pairtable.txt
intl/lwbrk/moz.build
intl/lwbrk/nsCarbonBreaker.cpp
intl/lwbrk/nsComplexBreaker.h
intl/lwbrk/nsILineBreaker.h
intl/lwbrk/nsISemanticUnitScanner.idl
intl/lwbrk/nsIWordBreaker.h
intl/lwbrk/nsJISx4051LineBreaker.cpp
intl/lwbrk/nsJISx4051LineBreaker.h
intl/lwbrk/nsLWBrkCIID.h
intl/lwbrk/nsPangoBreaker.cpp
intl/lwbrk/nsRuleBreaker.cpp
intl/lwbrk/nsSampleWordBreaker.cpp
intl/lwbrk/nsSampleWordBreaker.h
intl/lwbrk/nsSemanticUnitScanner.cpp
intl/lwbrk/nsSemanticUnitScanner.h
intl/lwbrk/nsUniscribeBreaker.cpp
intl/lwbrk/public/moz.build
intl/lwbrk/public/nsILineBreaker.h
intl/lwbrk/public/nsIWordBreaker.h
intl/lwbrk/public/nsLWBrkCIID.h
intl/lwbrk/rulebrk.c
intl/lwbrk/rulebrk.h
intl/lwbrk/src/Makefile.in
intl/lwbrk/src/crashtests/416721.html
intl/lwbrk/src/crashtests/crashtests.list
intl/lwbrk/src/jisx4051class.h
intl/lwbrk/src/jisx4051pairtable.txt
intl/lwbrk/src/moz.build
intl/lwbrk/src/nsCarbonBreaker.cpp
intl/lwbrk/src/nsComplexBreaker.h
intl/lwbrk/src/nsJISx4051LineBreaker.cpp
intl/lwbrk/src/nsJISx4051LineBreaker.h
intl/lwbrk/src/nsPangoBreaker.cpp
intl/lwbrk/src/nsRuleBreaker.cpp
intl/lwbrk/src/nsSampleWordBreaker.cpp
intl/lwbrk/src/nsSampleWordBreaker.h
intl/lwbrk/src/nsSemanticUnitScanner.cpp
intl/lwbrk/src/nsSemanticUnitScanner.h
intl/lwbrk/src/nsUniscribeBreaker.cpp
intl/lwbrk/src/rulebrk.c
intl/lwbrk/src/rulebrk.h
intl/lwbrk/src/th_char.h
intl/lwbrk/th_char.h
testing/crashtest/crashtests.list
--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -6,14 +6,14 @@
 
 SOURCES += [
     'nsI18nModule.cpp',
 ]
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../locale',
-    '../lwbrk/src',
+    '../lwbrk',
     '../strres/src',
     '../uconv/src',
     '../unicharutil/src',
 ]
 
rename from intl/lwbrk/src/Makefile.in
rename to intl/lwbrk/Makefile.in
rename from intl/lwbrk/src/crashtests/416721.html
rename to intl/lwbrk/crashtests/416721.html
rename from intl/lwbrk/src/crashtests/crashtests.list
rename to intl/lwbrk/crashtests/crashtests.list
deleted file mode 100644
--- a/intl/lwbrk/idl/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/.
-
-XPIDL_SOURCES += [
-    'nsISemanticUnitScanner.idl',
-]
-
-XPIDL_MODULE = 'lwbrk'
-
rename from intl/lwbrk/src/jisx4051class.h
rename to intl/lwbrk/jisx4051class.h
rename from intl/lwbrk/src/jisx4051pairtable.txt
rename to intl/lwbrk/jisx4051pairtable.txt
--- a/intl/lwbrk/moz.build
+++ b/intl/lwbrk/moz.build
@@ -1,9 +1,49 @@
 # -*- 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', 'src']
 TEST_TOOL_DIRS += ['tests']
 
+XPIDL_SOURCES += [
+    'nsISemanticUnitScanner.idl',
+]
+
+XPIDL_MODULE = 'lwbrk'
+
+EXPORTS += [
+    'nsILineBreaker.h',
+    'nsIWordBreaker.h',
+    'nsLWBrkCIID.h',
+]
+
+UNIFIED_SOURCES += [
+    'nsJISx4051LineBreaker.cpp',
+    'nsSampleWordBreaker.cpp',
+    'nsSemanticUnitScanner.cpp',
+]
+
+if CONFIG['MOZ_WIDGET_GTK']:
+    SOURCES += [
+        'nsPangoBreaker.cpp',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    SOURCES += [
+        'nsUniscribeBreaker.cpp',
+    ]
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    UNIFIED_SOURCES += [
+        'nsCarbonBreaker.cpp',
+    ]
+else:
+    SOURCES += [
+        'nsRuleBreaker.cpp',
+    ]
+    SOURCES += [
+        'rulebrk.c',
+    ]
+
+MSVC_ENABLE_PGO = True
+
+FINAL_LIBRARY = 'xul'
rename from intl/lwbrk/src/nsCarbonBreaker.cpp
rename to intl/lwbrk/nsCarbonBreaker.cpp
rename from intl/lwbrk/src/nsComplexBreaker.h
rename to intl/lwbrk/nsComplexBreaker.h
rename from intl/lwbrk/public/nsILineBreaker.h
rename to intl/lwbrk/nsILineBreaker.h
rename from intl/lwbrk/idl/nsISemanticUnitScanner.idl
rename to intl/lwbrk/nsISemanticUnitScanner.idl
rename from intl/lwbrk/public/nsIWordBreaker.h
rename to intl/lwbrk/nsIWordBreaker.h
rename from intl/lwbrk/src/nsJISx4051LineBreaker.cpp
rename to intl/lwbrk/nsJISx4051LineBreaker.cpp
rename from intl/lwbrk/src/nsJISx4051LineBreaker.h
rename to intl/lwbrk/nsJISx4051LineBreaker.h
rename from intl/lwbrk/public/nsLWBrkCIID.h
rename to intl/lwbrk/nsLWBrkCIID.h
rename from intl/lwbrk/src/nsPangoBreaker.cpp
rename to intl/lwbrk/nsPangoBreaker.cpp
rename from intl/lwbrk/src/nsRuleBreaker.cpp
rename to intl/lwbrk/nsRuleBreaker.cpp
rename from intl/lwbrk/src/nsSampleWordBreaker.cpp
rename to intl/lwbrk/nsSampleWordBreaker.cpp
rename from intl/lwbrk/src/nsSampleWordBreaker.h
rename to intl/lwbrk/nsSampleWordBreaker.h
rename from intl/lwbrk/src/nsSemanticUnitScanner.cpp
rename to intl/lwbrk/nsSemanticUnitScanner.cpp
rename from intl/lwbrk/src/nsSemanticUnitScanner.h
rename to intl/lwbrk/nsSemanticUnitScanner.h
rename from intl/lwbrk/src/nsUniscribeBreaker.cpp
rename to intl/lwbrk/nsUniscribeBreaker.cpp
deleted file mode 100644
--- a/intl/lwbrk/public/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/.
-
-EXPORTS += [
-    'nsILineBreaker.h',
-    'nsIWordBreaker.h',
-    'nsLWBrkCIID.h',
-]
-
rename from intl/lwbrk/src/rulebrk.c
rename to intl/lwbrk/rulebrk.c
rename from intl/lwbrk/src/rulebrk.h
rename to intl/lwbrk/rulebrk.h
deleted file mode 100644
--- a/intl/lwbrk/src/moz.build
+++ /dev/null
@@ -1,37 +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 += [
-    'nsJISx4051LineBreaker.cpp',
-    'nsSampleWordBreaker.cpp',
-    'nsSemanticUnitScanner.cpp',
-]
-
-if CONFIG['MOZ_WIDGET_GTK']:
-    SOURCES += [
-        'nsPangoBreaker.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    SOURCES += [
-        'nsUniscribeBreaker.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    UNIFIED_SOURCES += [
-        'nsCarbonBreaker.cpp',
-    ]
-else:
-    SOURCES += [
-        'nsRuleBreaker.cpp',
-    ]
-    SOURCES += [
-        'rulebrk.c',
-    ]
-
-
-
-MSVC_ENABLE_PGO = True
-
-FINAL_LIBRARY = 'xul'
rename from intl/lwbrk/src/th_char.h
rename to intl/lwbrk/th_char.h
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -33,17 +33,17 @@ include ../../dom/xslt/crashtests/crasht
 # Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
 skip-if(B2G||browserIsRemote||!webrtc) include ../../dom/media/tests/crashtests/crashtests.list
 
 include ../../dom/src/offline/crashtests/crashtests.list
 include ../../dom/src/jsurl/crashtests/crashtests.list
 
 include ../../editor/crashtests.list
 
-include ../../intl/lwbrk/src/crashtests/crashtests.list
+include ../../intl/lwbrk/crashtests/crashtests.list
 include ../../intl/uconv/crashtests/crashtests.list
 
 include ../../js/xpconnect/crashtests/crashtests.list
 
 include ../../layout/base/crashtests/crashtests.list
 include ../../layout/forms/crashtests/crashtests.list
 include ../../layout/generic/crashtests/crashtests.list
 include ../../layout/printing/crashtests/crashtests.list