Bug 1057923 - Flatten parser/htmlparser/{public,src}/ into parent directory. r=mrbkap
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Tue, 26 Aug 2014 07:10:53 -0700
changeset 201671 f37d8b5936c470718e80f34d9ea9ca942b63de8b
parent 201670 a019b75127fd362997330e7200619ebbeaf607db
child 201672 616c50b78907ab059a930601a3c9a470e0b96fb3
push id27375
push userryanvm@gmail.com
push dateTue, 26 Aug 2014 19:56:59 +0000
treeherdermozilla-central@f9bfe115fee5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs1057923
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 1057923 - Flatten parser/htmlparser/{public,src}/ into parent directory. r=mrbkap
parser/htmlparser/CNavDTD.cpp
parser/htmlparser/CNavDTD.h
parser/htmlparser/CParserContext.cpp
parser/htmlparser/CParserContext.h
parser/htmlparser/moz.build
parser/htmlparser/nsElementTable.cpp
parser/htmlparser/nsElementTable.h
parser/htmlparser/nsExpatDriver.cpp
parser/htmlparser/nsExpatDriver.h
parser/htmlparser/nsHTMLEntities.cpp
parser/htmlparser/nsHTMLEntities.h
parser/htmlparser/nsHTMLEntityList.h
parser/htmlparser/nsHTMLTagList.h
parser/htmlparser/nsHTMLTags.cpp
parser/htmlparser/nsHTMLTags.h
parser/htmlparser/nsHTMLTokenizer.cpp
parser/htmlparser/nsHTMLTokenizer.h
parser/htmlparser/nsIContentSink.h
parser/htmlparser/nsIDTD.h
parser/htmlparser/nsIExpatSink.idl
parser/htmlparser/nsIExtendedExpatSink.idl
parser/htmlparser/nsIFragmentContentSink.h
parser/htmlparser/nsIHTMLContentSink.h
parser/htmlparser/nsIParser.h
parser/htmlparser/nsIParserService.h
parser/htmlparser/nsITokenizer.h
parser/htmlparser/nsParser.cpp
parser/htmlparser/nsParser.h
parser/htmlparser/nsParserBase.h
parser/htmlparser/nsParserCIID.h
parser/htmlparser/nsParserConstants.h
parser/htmlparser/nsParserModule.cpp
parser/htmlparser/nsParserMsgUtils.cpp
parser/htmlparser/nsParserMsgUtils.h
parser/htmlparser/nsParserService.cpp
parser/htmlparser/nsParserService.h
parser/htmlparser/nsScanner.cpp
parser/htmlparser/nsScanner.h
parser/htmlparser/nsScannerString.cpp
parser/htmlparser/nsScannerString.h
parser/htmlparser/nsToken.h
parser/htmlparser/public/moz.build
parser/htmlparser/public/nsHTMLTagList.h
parser/htmlparser/public/nsHTMLTags.h
parser/htmlparser/public/nsIContentSink.h
parser/htmlparser/public/nsIDTD.h
parser/htmlparser/public/nsIExpatSink.idl
parser/htmlparser/public/nsIExtendedExpatSink.idl
parser/htmlparser/public/nsIFragmentContentSink.h
parser/htmlparser/public/nsIHTMLContentSink.h
parser/htmlparser/public/nsIParser.h
parser/htmlparser/public/nsIParserService.h
parser/htmlparser/public/nsITokenizer.h
parser/htmlparser/public/nsParserBase.h
parser/htmlparser/public/nsParserCIID.h
parser/htmlparser/public/nsParserConstants.h
parser/htmlparser/public/nsScannerString.h
parser/htmlparser/public/nsToken.h
parser/htmlparser/src/CNavDTD.cpp
parser/htmlparser/src/CNavDTD.h
parser/htmlparser/src/CParserContext.cpp
parser/htmlparser/src/CParserContext.h
parser/htmlparser/src/moz.build
parser/htmlparser/src/nsElementTable.cpp
parser/htmlparser/src/nsElementTable.h
parser/htmlparser/src/nsExpatDriver.cpp
parser/htmlparser/src/nsExpatDriver.h
parser/htmlparser/src/nsHTMLEntities.cpp
parser/htmlparser/src/nsHTMLEntities.h
parser/htmlparser/src/nsHTMLEntityList.h
parser/htmlparser/src/nsHTMLTags.cpp
parser/htmlparser/src/nsHTMLTokenizer.cpp
parser/htmlparser/src/nsHTMLTokenizer.h
parser/htmlparser/src/nsParser.cpp
parser/htmlparser/src/nsParser.h
parser/htmlparser/src/nsParserModule.cpp
parser/htmlparser/src/nsParserMsgUtils.cpp
parser/htmlparser/src/nsParserMsgUtils.h
parser/htmlparser/src/nsParserService.cpp
parser/htmlparser/src/nsParserService.h
parser/htmlparser/src/nsScanner.cpp
parser/htmlparser/src/nsScanner.h
parser/htmlparser/src/nsScannerString.cpp
rename from parser/htmlparser/src/CNavDTD.cpp
rename to parser/htmlparser/CNavDTD.cpp
rename from parser/htmlparser/src/CNavDTD.h
rename to parser/htmlparser/CNavDTD.h
rename from parser/htmlparser/src/CParserContext.cpp
rename to parser/htmlparser/CParserContext.cpp
rename from parser/htmlparser/src/CParserContext.h
rename to parser/htmlparser/CParserContext.h
--- a/parser/htmlparser/moz.build
+++ b/parser/htmlparser/moz.build
@@ -1,9 +1,51 @@
 # -*- 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']
+MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
+
+XPIDL_SOURCES += [
+    'nsIExpatSink.idl',
+    'nsIExtendedExpatSink.idl',
+]
+
+XPIDL_MODULE = 'htmlparser'
 
-MOCHITEST_MANIFESTS += ['tests/mochitest/mochitest.ini']
+EXPORTS += [
+    'nsHTMLTagList.h',
+    'nsHTMLTags.h',
+    'nsIContentSink.h',
+    'nsIDTD.h',
+    'nsIFragmentContentSink.h',
+    'nsIHTMLContentSink.h',
+    'nsIParser.h',
+    'nsIParserService.h',
+    'nsITokenizer.h',
+    'nsParserBase.h',
+    'nsParserCIID.h',
+    'nsParserConstants.h',
+    'nsScannerString.h',
+    'nsToken.h',
+]
+
+UNIFIED_SOURCES += [
+    'CNavDTD.cpp',
+    'CParserContext.cpp',
+    'nsElementTable.cpp',
+    'nsExpatDriver.cpp',
+    'nsHTMLEntities.cpp',
+    'nsHTMLTags.cpp',
+    'nsHTMLTokenizer.cpp',
+    'nsParser.cpp',
+    'nsParserModule.cpp',
+    'nsParserMsgUtils.cpp',
+    'nsParserService.cpp',
+    'nsScanner.cpp',
+    'nsScannerString.cpp',
+]
+
+FAIL_ON_WARNINGS = True
+
+FINAL_LIBRARY = 'xul'
rename from parser/htmlparser/src/nsElementTable.cpp
rename to parser/htmlparser/nsElementTable.cpp
rename from parser/htmlparser/src/nsElementTable.h
rename to parser/htmlparser/nsElementTable.h
rename from parser/htmlparser/src/nsExpatDriver.cpp
rename to parser/htmlparser/nsExpatDriver.cpp
rename from parser/htmlparser/src/nsExpatDriver.h
rename to parser/htmlparser/nsExpatDriver.h
rename from parser/htmlparser/src/nsHTMLEntities.cpp
rename to parser/htmlparser/nsHTMLEntities.cpp
rename from parser/htmlparser/src/nsHTMLEntities.h
rename to parser/htmlparser/nsHTMLEntities.h
rename from parser/htmlparser/src/nsHTMLEntityList.h
rename to parser/htmlparser/nsHTMLEntityList.h
rename from parser/htmlparser/public/nsHTMLTagList.h
rename to parser/htmlparser/nsHTMLTagList.h
rename from parser/htmlparser/src/nsHTMLTags.cpp
rename to parser/htmlparser/nsHTMLTags.cpp
rename from parser/htmlparser/public/nsHTMLTags.h
rename to parser/htmlparser/nsHTMLTags.h
rename from parser/htmlparser/src/nsHTMLTokenizer.cpp
rename to parser/htmlparser/nsHTMLTokenizer.cpp
rename from parser/htmlparser/src/nsHTMLTokenizer.h
rename to parser/htmlparser/nsHTMLTokenizer.h
rename from parser/htmlparser/public/nsIContentSink.h
rename to parser/htmlparser/nsIContentSink.h
rename from parser/htmlparser/public/nsIDTD.h
rename to parser/htmlparser/nsIDTD.h
rename from parser/htmlparser/public/nsIExpatSink.idl
rename to parser/htmlparser/nsIExpatSink.idl
rename from parser/htmlparser/public/nsIExtendedExpatSink.idl
rename to parser/htmlparser/nsIExtendedExpatSink.idl
rename from parser/htmlparser/public/nsIFragmentContentSink.h
rename to parser/htmlparser/nsIFragmentContentSink.h
rename from parser/htmlparser/public/nsIHTMLContentSink.h
rename to parser/htmlparser/nsIHTMLContentSink.h
rename from parser/htmlparser/public/nsIParser.h
rename to parser/htmlparser/nsIParser.h
rename from parser/htmlparser/public/nsIParserService.h
rename to parser/htmlparser/nsIParserService.h
rename from parser/htmlparser/public/nsITokenizer.h
rename to parser/htmlparser/nsITokenizer.h
rename from parser/htmlparser/src/nsParser.cpp
rename to parser/htmlparser/nsParser.cpp
rename from parser/htmlparser/src/nsParser.h
rename to parser/htmlparser/nsParser.h
rename from parser/htmlparser/public/nsParserBase.h
rename to parser/htmlparser/nsParserBase.h
rename from parser/htmlparser/public/nsParserCIID.h
rename to parser/htmlparser/nsParserCIID.h
rename from parser/htmlparser/public/nsParserConstants.h
rename to parser/htmlparser/nsParserConstants.h
rename from parser/htmlparser/src/nsParserModule.cpp
rename to parser/htmlparser/nsParserModule.cpp
rename from parser/htmlparser/src/nsParserMsgUtils.cpp
rename to parser/htmlparser/nsParserMsgUtils.cpp
rename from parser/htmlparser/src/nsParserMsgUtils.h
rename to parser/htmlparser/nsParserMsgUtils.h
rename from parser/htmlparser/src/nsParserService.cpp
rename to parser/htmlparser/nsParserService.cpp
rename from parser/htmlparser/src/nsParserService.h
rename to parser/htmlparser/nsParserService.h
rename from parser/htmlparser/src/nsScanner.cpp
rename to parser/htmlparser/nsScanner.cpp
rename from parser/htmlparser/src/nsScanner.h
rename to parser/htmlparser/nsScanner.h
rename from parser/htmlparser/src/nsScannerString.cpp
rename to parser/htmlparser/nsScannerString.cpp
rename from parser/htmlparser/public/nsScannerString.h
rename to parser/htmlparser/nsScannerString.h
rename from parser/htmlparser/public/nsToken.h
rename to parser/htmlparser/nsToken.h
deleted file mode 100644
--- a/parser/htmlparser/public/moz.build
+++ /dev/null
@@ -1,30 +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 += [
-    'nsIExpatSink.idl',
-    'nsIExtendedExpatSink.idl',
-]
-
-XPIDL_MODULE = 'htmlparser'
-
-EXPORTS += [
-    'nsHTMLTagList.h',
-    'nsHTMLTags.h',
-    'nsIContentSink.h',
-    'nsIDTD.h',
-    'nsIFragmentContentSink.h',
-    'nsIHTMLContentSink.h',
-    'nsIParser.h',
-    'nsIParserService.h',
-    'nsITokenizer.h',
-    'nsParserBase.h',
-    'nsParserCIID.h',
-    'nsParserConstants.h',
-    'nsScannerString.h',
-    'nsToken.h',
-]
-
deleted file mode 100644
--- a/parser/htmlparser/src/moz.build
+++ /dev/null
@@ -1,25 +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 += [
-    'CNavDTD.cpp',
-    'CParserContext.cpp',
-    'nsElementTable.cpp',
-    'nsExpatDriver.cpp',
-    'nsHTMLEntities.cpp',
-    'nsHTMLTags.cpp',
-    'nsHTMLTokenizer.cpp',
-    'nsParser.cpp',
-    'nsParserModule.cpp',
-    'nsParserMsgUtils.cpp',
-    'nsParserService.cpp',
-    'nsScanner.cpp',
-    'nsScannerString.cpp',
-]
-
-FAIL_ON_WARNINGS = True
-
-FINAL_LIBRARY = 'xul'