From 89b6e87981848df2d1346160a1f9aa34006d0924 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 26 Aug 2014 07:10:53 -0700 Subject: [PATCH] Bug 1057923 - Flatten parser/htmlparser/{public,src}/ into parent directory. r=mrbkap --HG-- rename : parser/htmlparser/src/CNavDTD.cpp => parser/htmlparser/CNavDTD.cpp rename : parser/htmlparser/src/CNavDTD.h => parser/htmlparser/CNavDTD.h rename : parser/htmlparser/src/CParserContext.cpp => parser/htmlparser/CParserContext.cpp rename : parser/htmlparser/src/CParserContext.h => parser/htmlparser/CParserContext.h rename : parser/htmlparser/src/nsElementTable.cpp => parser/htmlparser/nsElementTable.cpp rename : parser/htmlparser/src/nsElementTable.h => parser/htmlparser/nsElementTable.h rename : parser/htmlparser/src/nsExpatDriver.cpp => parser/htmlparser/nsExpatDriver.cpp rename : parser/htmlparser/src/nsExpatDriver.h => parser/htmlparser/nsExpatDriver.h rename : parser/htmlparser/src/nsHTMLEntities.cpp => parser/htmlparser/nsHTMLEntities.cpp rename : parser/htmlparser/src/nsHTMLEntities.h => parser/htmlparser/nsHTMLEntities.h rename : parser/htmlparser/src/nsHTMLEntityList.h => parser/htmlparser/nsHTMLEntityList.h rename : parser/htmlparser/public/nsHTMLTagList.h => parser/htmlparser/nsHTMLTagList.h rename : parser/htmlparser/src/nsHTMLTags.cpp => parser/htmlparser/nsHTMLTags.cpp rename : parser/htmlparser/public/nsHTMLTags.h => parser/htmlparser/nsHTMLTags.h rename : parser/htmlparser/src/nsHTMLTokenizer.cpp => parser/htmlparser/nsHTMLTokenizer.cpp rename : parser/htmlparser/src/nsHTMLTokenizer.h => parser/htmlparser/nsHTMLTokenizer.h rename : parser/htmlparser/public/nsIContentSink.h => parser/htmlparser/nsIContentSink.h rename : parser/htmlparser/public/nsIDTD.h => parser/htmlparser/nsIDTD.h rename : parser/htmlparser/public/nsIExpatSink.idl => parser/htmlparser/nsIExpatSink.idl rename : parser/htmlparser/public/nsIExtendedExpatSink.idl => parser/htmlparser/nsIExtendedExpatSink.idl rename : parser/htmlparser/public/nsIFragmentContentSink.h => parser/htmlparser/nsIFragmentContentSink.h rename : parser/htmlparser/public/nsIHTMLContentSink.h => parser/htmlparser/nsIHTMLContentSink.h rename : parser/htmlparser/public/nsIParser.h => parser/htmlparser/nsIParser.h rename : parser/htmlparser/public/nsIParserService.h => parser/htmlparser/nsIParserService.h rename : parser/htmlparser/public/nsITokenizer.h => parser/htmlparser/nsITokenizer.h rename : parser/htmlparser/src/nsParser.cpp => parser/htmlparser/nsParser.cpp rename : parser/htmlparser/src/nsParser.h => parser/htmlparser/nsParser.h rename : parser/htmlparser/public/nsParserBase.h => parser/htmlparser/nsParserBase.h rename : parser/htmlparser/public/nsParserCIID.h => parser/htmlparser/nsParserCIID.h rename : parser/htmlparser/public/nsParserConstants.h => parser/htmlparser/nsParserConstants.h rename : parser/htmlparser/src/nsParserModule.cpp => parser/htmlparser/nsParserModule.cpp rename : parser/htmlparser/src/nsParserMsgUtils.cpp => parser/htmlparser/nsParserMsgUtils.cpp rename : parser/htmlparser/src/nsParserMsgUtils.h => parser/htmlparser/nsParserMsgUtils.h rename : parser/htmlparser/src/nsParserService.cpp => parser/htmlparser/nsParserService.cpp rename : parser/htmlparser/src/nsParserService.h => parser/htmlparser/nsParserService.h rename : parser/htmlparser/src/nsScanner.cpp => parser/htmlparser/nsScanner.cpp rename : parser/htmlparser/src/nsScanner.h => parser/htmlparser/nsScanner.h rename : parser/htmlparser/src/nsScannerString.cpp => parser/htmlparser/nsScannerString.cpp rename : parser/htmlparser/public/nsScannerString.h => parser/htmlparser/nsScannerString.h rename : parser/htmlparser/public/nsToken.h => parser/htmlparser/nsToken.h --- parser/htmlparser/{src => }/CNavDTD.cpp | 0 parser/htmlparser/{src => }/CNavDTD.h | 0 .../htmlparser/{src => }/CParserContext.cpp | 0 parser/htmlparser/{src => }/CParserContext.h | 0 parser/htmlparser/moz.build | 46 ++++++++++++++++++- .../htmlparser/{src => }/nsElementTable.cpp | 0 parser/htmlparser/{src => }/nsElementTable.h | 0 parser/htmlparser/{src => }/nsExpatDriver.cpp | 0 parser/htmlparser/{src => }/nsExpatDriver.h | 0 .../htmlparser/{src => }/nsHTMLEntities.cpp | 0 parser/htmlparser/{src => }/nsHTMLEntities.h | 0 .../htmlparser/{src => }/nsHTMLEntityList.h | 0 .../htmlparser/{public => }/nsHTMLTagList.h | 0 parser/htmlparser/{src => }/nsHTMLTags.cpp | 0 parser/htmlparser/{public => }/nsHTMLTags.h | 0 .../htmlparser/{src => }/nsHTMLTokenizer.cpp | 0 parser/htmlparser/{src => }/nsHTMLTokenizer.h | 0 .../htmlparser/{public => }/nsIContentSink.h | 0 parser/htmlparser/{public => }/nsIDTD.h | 0 .../htmlparser/{public => }/nsIExpatSink.idl | 0 .../{public => }/nsIExtendedExpatSink.idl | 0 .../{public => }/nsIFragmentContentSink.h | 0 .../{public => }/nsIHTMLContentSink.h | 0 parser/htmlparser/{public => }/nsIParser.h | 0 .../{public => }/nsIParserService.h | 0 parser/htmlparser/{public => }/nsITokenizer.h | 0 parser/htmlparser/{src => }/nsParser.cpp | 0 parser/htmlparser/{src => }/nsParser.h | 0 parser/htmlparser/{public => }/nsParserBase.h | 0 parser/htmlparser/{public => }/nsParserCIID.h | 0 .../{public => }/nsParserConstants.h | 0 .../htmlparser/{src => }/nsParserModule.cpp | 0 .../htmlparser/{src => }/nsParserMsgUtils.cpp | 0 .../htmlparser/{src => }/nsParserMsgUtils.h | 0 .../htmlparser/{src => }/nsParserService.cpp | 0 parser/htmlparser/{src => }/nsParserService.h | 0 parser/htmlparser/{src => }/nsScanner.cpp | 0 parser/htmlparser/{src => }/nsScanner.h | 0 .../htmlparser/{src => }/nsScannerString.cpp | 0 .../htmlparser/{public => }/nsScannerString.h | 0 parser/htmlparser/{public => }/nsToken.h | 0 parser/htmlparser/public/moz.build | 30 ------------ parser/htmlparser/src/moz.build | 25 ---------- 43 files changed, 44 insertions(+), 57 deletions(-) rename parser/htmlparser/{src => }/CNavDTD.cpp (100%) rename parser/htmlparser/{src => }/CNavDTD.h (100%) rename parser/htmlparser/{src => }/CParserContext.cpp (100%) rename parser/htmlparser/{src => }/CParserContext.h (100%) rename parser/htmlparser/{src => }/nsElementTable.cpp (100%) rename parser/htmlparser/{src => }/nsElementTable.h (100%) rename parser/htmlparser/{src => }/nsExpatDriver.cpp (100%) rename parser/htmlparser/{src => }/nsExpatDriver.h (100%) rename parser/htmlparser/{src => }/nsHTMLEntities.cpp (100%) rename parser/htmlparser/{src => }/nsHTMLEntities.h (100%) rename parser/htmlparser/{src => }/nsHTMLEntityList.h (100%) rename parser/htmlparser/{public => }/nsHTMLTagList.h (100%) rename parser/htmlparser/{src => }/nsHTMLTags.cpp (100%) rename parser/htmlparser/{public => }/nsHTMLTags.h (100%) rename parser/htmlparser/{src => }/nsHTMLTokenizer.cpp (100%) rename parser/htmlparser/{src => }/nsHTMLTokenizer.h (100%) rename parser/htmlparser/{public => }/nsIContentSink.h (100%) rename parser/htmlparser/{public => }/nsIDTD.h (100%) rename parser/htmlparser/{public => }/nsIExpatSink.idl (100%) rename parser/htmlparser/{public => }/nsIExtendedExpatSink.idl (100%) rename parser/htmlparser/{public => }/nsIFragmentContentSink.h (100%) rename parser/htmlparser/{public => }/nsIHTMLContentSink.h (100%) rename parser/htmlparser/{public => }/nsIParser.h (100%) rename parser/htmlparser/{public => }/nsIParserService.h (100%) rename parser/htmlparser/{public => }/nsITokenizer.h (100%) rename parser/htmlparser/{src => }/nsParser.cpp (100%) rename parser/htmlparser/{src => }/nsParser.h (100%) rename parser/htmlparser/{public => }/nsParserBase.h (100%) rename parser/htmlparser/{public => }/nsParserCIID.h (100%) rename parser/htmlparser/{public => }/nsParserConstants.h (100%) rename parser/htmlparser/{src => }/nsParserModule.cpp (100%) rename parser/htmlparser/{src => }/nsParserMsgUtils.cpp (100%) rename parser/htmlparser/{src => }/nsParserMsgUtils.h (100%) rename parser/htmlparser/{src => }/nsParserService.cpp (100%) rename parser/htmlparser/{src => }/nsParserService.h (100%) rename parser/htmlparser/{src => }/nsScanner.cpp (100%) rename parser/htmlparser/{src => }/nsScanner.h (100%) rename parser/htmlparser/{src => }/nsScannerString.cpp (100%) rename parser/htmlparser/{public => }/nsScannerString.h (100%) rename parser/htmlparser/{public => }/nsToken.h (100%) delete mode 100644 parser/htmlparser/public/moz.build delete mode 100644 parser/htmlparser/src/moz.build diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/CNavDTD.cpp similarity index 100% rename from parser/htmlparser/src/CNavDTD.cpp rename to parser/htmlparser/CNavDTD.cpp diff --git a/parser/htmlparser/src/CNavDTD.h b/parser/htmlparser/CNavDTD.h similarity index 100% rename from parser/htmlparser/src/CNavDTD.h rename to parser/htmlparser/CNavDTD.h diff --git a/parser/htmlparser/src/CParserContext.cpp b/parser/htmlparser/CParserContext.cpp similarity index 100% rename from parser/htmlparser/src/CParserContext.cpp rename to parser/htmlparser/CParserContext.cpp diff --git a/parser/htmlparser/src/CParserContext.h b/parser/htmlparser/CParserContext.h similarity index 100% rename from parser/htmlparser/src/CParserContext.h rename to parser/htmlparser/CParserContext.h diff --git a/parser/htmlparser/moz.build b/parser/htmlparser/moz.build index 881178a1b21..b86f5e24dee 100644 --- a/parser/htmlparser/moz.build +++ b/parser/htmlparser/moz.build @@ -4,6 +4,48 @@ # 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' + +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' diff --git a/parser/htmlparser/src/nsElementTable.cpp b/parser/htmlparser/nsElementTable.cpp similarity index 100% rename from parser/htmlparser/src/nsElementTable.cpp rename to parser/htmlparser/nsElementTable.cpp diff --git a/parser/htmlparser/src/nsElementTable.h b/parser/htmlparser/nsElementTable.h similarity index 100% rename from parser/htmlparser/src/nsElementTable.h rename to parser/htmlparser/nsElementTable.h diff --git a/parser/htmlparser/src/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp similarity index 100% rename from parser/htmlparser/src/nsExpatDriver.cpp rename to parser/htmlparser/nsExpatDriver.cpp diff --git a/parser/htmlparser/src/nsExpatDriver.h b/parser/htmlparser/nsExpatDriver.h similarity index 100% rename from parser/htmlparser/src/nsExpatDriver.h rename to parser/htmlparser/nsExpatDriver.h diff --git a/parser/htmlparser/src/nsHTMLEntities.cpp b/parser/htmlparser/nsHTMLEntities.cpp similarity index 100% rename from parser/htmlparser/src/nsHTMLEntities.cpp rename to parser/htmlparser/nsHTMLEntities.cpp diff --git a/parser/htmlparser/src/nsHTMLEntities.h b/parser/htmlparser/nsHTMLEntities.h similarity index 100% rename from parser/htmlparser/src/nsHTMLEntities.h rename to parser/htmlparser/nsHTMLEntities.h diff --git a/parser/htmlparser/src/nsHTMLEntityList.h b/parser/htmlparser/nsHTMLEntityList.h similarity index 100% rename from parser/htmlparser/src/nsHTMLEntityList.h rename to parser/htmlparser/nsHTMLEntityList.h diff --git a/parser/htmlparser/public/nsHTMLTagList.h b/parser/htmlparser/nsHTMLTagList.h similarity index 100% rename from parser/htmlparser/public/nsHTMLTagList.h rename to parser/htmlparser/nsHTMLTagList.h diff --git a/parser/htmlparser/src/nsHTMLTags.cpp b/parser/htmlparser/nsHTMLTags.cpp similarity index 100% rename from parser/htmlparser/src/nsHTMLTags.cpp rename to parser/htmlparser/nsHTMLTags.cpp diff --git a/parser/htmlparser/public/nsHTMLTags.h b/parser/htmlparser/nsHTMLTags.h similarity index 100% rename from parser/htmlparser/public/nsHTMLTags.h rename to parser/htmlparser/nsHTMLTags.h diff --git a/parser/htmlparser/src/nsHTMLTokenizer.cpp b/parser/htmlparser/nsHTMLTokenizer.cpp similarity index 100% rename from parser/htmlparser/src/nsHTMLTokenizer.cpp rename to parser/htmlparser/nsHTMLTokenizer.cpp diff --git a/parser/htmlparser/src/nsHTMLTokenizer.h b/parser/htmlparser/nsHTMLTokenizer.h similarity index 100% rename from parser/htmlparser/src/nsHTMLTokenizer.h rename to parser/htmlparser/nsHTMLTokenizer.h diff --git a/parser/htmlparser/public/nsIContentSink.h b/parser/htmlparser/nsIContentSink.h similarity index 100% rename from parser/htmlparser/public/nsIContentSink.h rename to parser/htmlparser/nsIContentSink.h diff --git a/parser/htmlparser/public/nsIDTD.h b/parser/htmlparser/nsIDTD.h similarity index 100% rename from parser/htmlparser/public/nsIDTD.h rename to parser/htmlparser/nsIDTD.h diff --git a/parser/htmlparser/public/nsIExpatSink.idl b/parser/htmlparser/nsIExpatSink.idl similarity index 100% rename from parser/htmlparser/public/nsIExpatSink.idl rename to parser/htmlparser/nsIExpatSink.idl diff --git a/parser/htmlparser/public/nsIExtendedExpatSink.idl b/parser/htmlparser/nsIExtendedExpatSink.idl similarity index 100% rename from parser/htmlparser/public/nsIExtendedExpatSink.idl rename to parser/htmlparser/nsIExtendedExpatSink.idl diff --git a/parser/htmlparser/public/nsIFragmentContentSink.h b/parser/htmlparser/nsIFragmentContentSink.h similarity index 100% rename from parser/htmlparser/public/nsIFragmentContentSink.h rename to parser/htmlparser/nsIFragmentContentSink.h diff --git a/parser/htmlparser/public/nsIHTMLContentSink.h b/parser/htmlparser/nsIHTMLContentSink.h similarity index 100% rename from parser/htmlparser/public/nsIHTMLContentSink.h rename to parser/htmlparser/nsIHTMLContentSink.h diff --git a/parser/htmlparser/public/nsIParser.h b/parser/htmlparser/nsIParser.h similarity index 100% rename from parser/htmlparser/public/nsIParser.h rename to parser/htmlparser/nsIParser.h diff --git a/parser/htmlparser/public/nsIParserService.h b/parser/htmlparser/nsIParserService.h similarity index 100% rename from parser/htmlparser/public/nsIParserService.h rename to parser/htmlparser/nsIParserService.h diff --git a/parser/htmlparser/public/nsITokenizer.h b/parser/htmlparser/nsITokenizer.h similarity index 100% rename from parser/htmlparser/public/nsITokenizer.h rename to parser/htmlparser/nsITokenizer.h diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/nsParser.cpp similarity index 100% rename from parser/htmlparser/src/nsParser.cpp rename to parser/htmlparser/nsParser.cpp diff --git a/parser/htmlparser/src/nsParser.h b/parser/htmlparser/nsParser.h similarity index 100% rename from parser/htmlparser/src/nsParser.h rename to parser/htmlparser/nsParser.h diff --git a/parser/htmlparser/public/nsParserBase.h b/parser/htmlparser/nsParserBase.h similarity index 100% rename from parser/htmlparser/public/nsParserBase.h rename to parser/htmlparser/nsParserBase.h diff --git a/parser/htmlparser/public/nsParserCIID.h b/parser/htmlparser/nsParserCIID.h similarity index 100% rename from parser/htmlparser/public/nsParserCIID.h rename to parser/htmlparser/nsParserCIID.h diff --git a/parser/htmlparser/public/nsParserConstants.h b/parser/htmlparser/nsParserConstants.h similarity index 100% rename from parser/htmlparser/public/nsParserConstants.h rename to parser/htmlparser/nsParserConstants.h diff --git a/parser/htmlparser/src/nsParserModule.cpp b/parser/htmlparser/nsParserModule.cpp similarity index 100% rename from parser/htmlparser/src/nsParserModule.cpp rename to parser/htmlparser/nsParserModule.cpp diff --git a/parser/htmlparser/src/nsParserMsgUtils.cpp b/parser/htmlparser/nsParserMsgUtils.cpp similarity index 100% rename from parser/htmlparser/src/nsParserMsgUtils.cpp rename to parser/htmlparser/nsParserMsgUtils.cpp diff --git a/parser/htmlparser/src/nsParserMsgUtils.h b/parser/htmlparser/nsParserMsgUtils.h similarity index 100% rename from parser/htmlparser/src/nsParserMsgUtils.h rename to parser/htmlparser/nsParserMsgUtils.h diff --git a/parser/htmlparser/src/nsParserService.cpp b/parser/htmlparser/nsParserService.cpp similarity index 100% rename from parser/htmlparser/src/nsParserService.cpp rename to parser/htmlparser/nsParserService.cpp diff --git a/parser/htmlparser/src/nsParserService.h b/parser/htmlparser/nsParserService.h similarity index 100% rename from parser/htmlparser/src/nsParserService.h rename to parser/htmlparser/nsParserService.h diff --git a/parser/htmlparser/src/nsScanner.cpp b/parser/htmlparser/nsScanner.cpp similarity index 100% rename from parser/htmlparser/src/nsScanner.cpp rename to parser/htmlparser/nsScanner.cpp diff --git a/parser/htmlparser/src/nsScanner.h b/parser/htmlparser/nsScanner.h similarity index 100% rename from parser/htmlparser/src/nsScanner.h rename to parser/htmlparser/nsScanner.h diff --git a/parser/htmlparser/src/nsScannerString.cpp b/parser/htmlparser/nsScannerString.cpp similarity index 100% rename from parser/htmlparser/src/nsScannerString.cpp rename to parser/htmlparser/nsScannerString.cpp diff --git a/parser/htmlparser/public/nsScannerString.h b/parser/htmlparser/nsScannerString.h similarity index 100% rename from parser/htmlparser/public/nsScannerString.h rename to parser/htmlparser/nsScannerString.h diff --git a/parser/htmlparser/public/nsToken.h b/parser/htmlparser/nsToken.h similarity index 100% rename from parser/htmlparser/public/nsToken.h rename to parser/htmlparser/nsToken.h diff --git a/parser/htmlparser/public/moz.build b/parser/htmlparser/public/moz.build deleted file mode 100644 index 9ff00f39743..00000000000 --- 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', -] - diff --git a/parser/htmlparser/src/moz.build b/parser/htmlparser/src/moz.build deleted file mode 100644 index f6410371da6..00000000000 --- 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'