Move files to better location
authorJonas Sicking <jonas@sicking.cc>
Fri, 26 Jun 2009 17:12:29 -0700
changeset 29792 e6a0e67016b5e3f616be0e904da349d74f4644b2
parent 29791 bb03b52176c395baa813e37a51b28da2d195fb7b
child 29793 d33c8caa18a116cb5113b3cafb237396ddf540ae
push id7768
push userhsivonen@iki.fi
push dateSun, 28 Jun 2009 17:30:01 +0000
treeherdermozilla-central@168dd0eb7283 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.2a1pre
Move files to better location
content/html/Makefile.in
content/html/parser/public/nsHtml5Module.h
content/html/parser/src/Makefile.in
content/html/parser/src/jArray.h
content/html/parser/src/nsHtml5ArrayCopy.h
content/html/parser/src/nsHtml5AtomList.h
content/html/parser/src/nsHtml5Atoms.cpp
content/html/parser/src/nsHtml5Atoms.h
content/html/parser/src/nsHtml5AttributeName.cpp
content/html/parser/src/nsHtml5AttributeName.h
content/html/parser/src/nsHtml5ByteReadable.h
content/html/parser/src/nsHtml5DocumentMode.h
content/html/parser/src/nsHtml5ElementName.cpp
content/html/parser/src/nsHtml5ElementName.h
content/html/parser/src/nsHtml5HtmlAttributes.cpp
content/html/parser/src/nsHtml5HtmlAttributes.h
content/html/parser/src/nsHtml5MetaScanner.cpp
content/html/parser/src/nsHtml5MetaScanner.h
content/html/parser/src/nsHtml5MetaScannerCppSupplement.h
content/html/parser/src/nsHtml5MetaScannerHSupplement.h
content/html/parser/src/nsHtml5Module.cpp
content/html/parser/src/nsHtml5NamedCharacters.cpp
content/html/parser/src/nsHtml5NamedCharacters.h
content/html/parser/src/nsHtml5Parser.cpp
content/html/parser/src/nsHtml5Parser.h
content/html/parser/src/nsHtml5PendingNotification.h
content/html/parser/src/nsHtml5Portability.cpp
content/html/parser/src/nsHtml5Portability.h
content/html/parser/src/nsHtml5ReleasableAttributeName.cpp
content/html/parser/src/nsHtml5ReleasableAttributeName.h
content/html/parser/src/nsHtml5ReleasableElementName.cpp
content/html/parser/src/nsHtml5ReleasableElementName.h
content/html/parser/src/nsHtml5StackNode.cpp
content/html/parser/src/nsHtml5StackNode.h
content/html/parser/src/nsHtml5StackNodeCppSupplement.h
content/html/parser/src/nsHtml5StackNodeHSupplement.h
content/html/parser/src/nsHtml5StateSnapshot.cpp
content/html/parser/src/nsHtml5StateSnapshot.h
content/html/parser/src/nsHtml5Tokenizer.cpp
content/html/parser/src/nsHtml5Tokenizer.h
content/html/parser/src/nsHtml5TreeBuilder.cpp
content/html/parser/src/nsHtml5TreeBuilder.h
content/html/parser/src/nsHtml5TreeBuilderCppSupplement.h
content/html/parser/src/nsHtml5TreeBuilderHSupplement.h
content/html/parser/src/nsHtml5TreeOperation.cpp
content/html/parser/src/nsHtml5TreeOperation.h
content/html/parser/src/nsHtml5UTF16Buffer.cpp
content/html/parser/src/nsHtml5UTF16Buffer.h
content/html/parser/src/nsHtml5UTF16BufferCppSupplement.h
content/html/parser/src/nsHtml5UTF16BufferHSupplement.h
layout/build/Makefile.in
parser/Makefile.in
parser/html/Makefile.in
parser/html/jArray.h
parser/html/nsHtml5ArrayCopy.h
parser/html/nsHtml5AtomList.h
parser/html/nsHtml5Atoms.cpp
parser/html/nsHtml5Atoms.h
parser/html/nsHtml5AttributeName.cpp
parser/html/nsHtml5AttributeName.h
parser/html/nsHtml5ByteReadable.h
parser/html/nsHtml5DocumentMode.h
parser/html/nsHtml5ElementName.cpp
parser/html/nsHtml5ElementName.h
parser/html/nsHtml5HtmlAttributes.cpp
parser/html/nsHtml5HtmlAttributes.h
parser/html/nsHtml5MetaScanner.cpp
parser/html/nsHtml5MetaScanner.h
parser/html/nsHtml5MetaScannerCppSupplement.h
parser/html/nsHtml5MetaScannerHSupplement.h
parser/html/nsHtml5Module.cpp
parser/html/nsHtml5Module.h
parser/html/nsHtml5NamedCharacters.cpp
parser/html/nsHtml5NamedCharacters.h
parser/html/nsHtml5Parser.cpp
parser/html/nsHtml5Parser.h
parser/html/nsHtml5PendingNotification.h
parser/html/nsHtml5Portability.cpp
parser/html/nsHtml5Portability.h
parser/html/nsHtml5ReleasableAttributeName.cpp
parser/html/nsHtml5ReleasableAttributeName.h
parser/html/nsHtml5ReleasableElementName.cpp
parser/html/nsHtml5ReleasableElementName.h
parser/html/nsHtml5StackNode.cpp
parser/html/nsHtml5StackNode.h
parser/html/nsHtml5StackNodeCppSupplement.h
parser/html/nsHtml5StackNodeHSupplement.h
parser/html/nsHtml5StateSnapshot.cpp
parser/html/nsHtml5StateSnapshot.h
parser/html/nsHtml5Tokenizer.cpp
parser/html/nsHtml5Tokenizer.h
parser/html/nsHtml5TreeBuilder.cpp
parser/html/nsHtml5TreeBuilder.h
parser/html/nsHtml5TreeBuilderCppSupplement.h
parser/html/nsHtml5TreeBuilderHSupplement.h
parser/html/nsHtml5TreeOperation.cpp
parser/html/nsHtml5TreeOperation.h
parser/html/nsHtml5UTF16Buffer.cpp
parser/html/nsHtml5UTF16Buffer.h
parser/html/nsHtml5UTF16BufferCppSupplement.h
parser/html/nsHtml5UTF16BufferHSupplement.h
toolkit/toolkit-tiers.mk
--- a/content/html/Makefile.in
+++ b/content/html/Makefile.in
@@ -37,11 +37,11 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PARALLEL_DIRS	= content document parser
+PARALLEL_DIRS	= content document
 
 include $(topsrcdir)/config/rules.mk
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -116,17 +116,16 @@ SHARED_LIBRARY_LIBS = \
 	../style/$(LIB_PREFIX)gkstyle_s.$(LIB_SUFFIX) \
 	../tables/$(LIB_PREFIX)gktable_s.$(LIB_SUFFIX) \
 	../xul/base/src/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/base/src/$(LIB_PREFIX)gkconbase_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/canvas/src/$(LIB_PREFIX)gkconcvs_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/events/src/$(LIB_PREFIX)gkconevents_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/html/content/src/$(LIB_PREFIX)gkconhtmlcon_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/html/document/src/$(LIB_PREFIX)gkconhtmldoc_s.$(LIB_SUFFIX) \
-	$(DEPTH)/content/html/parser/src/$(LIB_PREFIX)html5p.$(LIB_SUFFIX) \
 	$(DEPTH)/content/xml/content/src/$(LIB_PREFIX)gkconxmlcon_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/xml/document/src/$(LIB_PREFIX)gkconxmldoc_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/xslt/src/base/$(LIB_PREFIX)txbase_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/xslt/src/xml/$(LIB_PREFIX)txxml_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/xslt/src/xpath/$(LIB_PREFIX)txxpath_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/xslt/src/xslt/$(LIB_PREFIX)txxslt_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/xbl/src/$(LIB_PREFIX)gkconxbl_s.$(LIB_SUFFIX) \
 	$(DEPTH)/content/xul/document/src/$(LIB_PREFIX)gkconxuldoc_s.$(LIB_SUFFIX) \
@@ -136,16 +135,17 @@ SHARED_LIBRARY_LIBS = \
 	$(DEPTH)/dom/src/json/$(LIB_PREFIX)json_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/src/jsurl/$(LIB_PREFIX)jsurl_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/src/storage/$(LIB_PREFIX)jsdomstorage_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/src/offline/$(LIB_PREFIX)jsdomoffline_s.$(LIB_SUFFIX) \
  	$(DEPTH)/dom/src/geolocation/$(LIB_PREFIX)jsdomgeolocation_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/src/threads/$(LIB_PREFIX)domthreads_s.$(LIB_SUFFIX) \
 	$(DEPTH)/editor/libeditor/text/$(LIB_PREFIX)texteditor_s.$(LIB_SUFFIX) \
 	$(DEPTH)/editor/libeditor/base/$(LIB_PREFIX)editorbase_s.$(LIB_SUFFIX) \
+	$(DEPTH)/parser/html/$(LIB_PREFIX)html5p_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifdef MOZ_MEDIA
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/content/media/$(LIB_PREFIX)gkconmedia_s.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
--- a/parser/Makefile.in
+++ b/parser/Makefile.in
@@ -37,11 +37,12 @@
 
 DEPTH           = ..
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS            = expat htmlparser xml
+MODULE		= parser
+DIRS            = expat htmlparser html xml
 
 include $(topsrcdir)/config/rules.mk
rename from content/html/parser/src/Makefile.in
rename to parser/html/Makefile.in
--- a/content/html/parser/src/Makefile.in
+++ b/parser/html/Makefile.in
@@ -29,68 +29,72 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH     = ../../../..
+DEPTH     = ../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= html5
-LIBRARY_NAME	= html5p
+LIBRARY_NAME	= html5p_s
 LIBXUL_LIBRARY	= 1
 
 REQUIRES	= \
-    gfx \
-    thebes \
-    locale \
-    js \
-    pref \
+		gfx \
+		thebes \
+		locale \
+		js \
+		pref \
 		necko \
 		xpcom \
 		string \
 		htmlparser \
 		content \
 		layout \
 		widget \
 		dom \
 		uconv \
 		xpconnect \
 		util \
 		webshell \
 		docshell \
 		chardet \
 		$(NULL)
 
+EXPORTS		= \
+		nsHtml5Module.h \
+		$(NULL)
+
 CPPSRCS		= \
-    nsHtml5Atoms.cpp \
+		nsHtml5Atoms.cpp \
 		nsHtml5Parser.cpp \
-    nsHtml5AttributeName.cpp \
-    nsHtml5ElementName.cpp \
-    nsHtml5HtmlAttributes.cpp \
-    nsHtml5StackNode.cpp \
-    nsHtml5UTF16Buffer.cpp \
-    nsHtml5NamedCharacters.cpp \
-    nsHtml5Tokenizer.cpp \
-    nsHtml5TreeBuilder.cpp \
-    nsHtml5Portability.cpp \
-    nsHtml5Module.cpp \
-    nsHtml5ReleasableAttributeName.cpp \
-    nsHtml5ReleasableElementName.cpp \
-    nsHtml5MetaScanner.cpp \
-    nsHtml5TreeOperation.cpp \
-    nsHtml5StateSnapshot.cpp \
-    $(NULL)
+		nsHtml5AttributeName.cpp \
+		nsHtml5ElementName.cpp \
+		nsHtml5HtmlAttributes.cpp \
+		nsHtml5StackNode.cpp \
+		nsHtml5UTF16Buffer.cpp \
+		nsHtml5NamedCharacters.cpp \
+		nsHtml5Tokenizer.cpp \
+		nsHtml5TreeBuilder.cpp \
+		nsHtml5Portability.cpp \
+		nsHtml5Module.cpp \
+		nsHtml5ReleasableAttributeName.cpp \
+		nsHtml5ReleasableElementName.cpp \
+		nsHtml5MetaScanner.cpp \
+		nsHtml5TreeOperation.cpp \
+		nsHtml5StateSnapshot.cpp \
+		$(NULL)
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
-		-I$(srcdir)/../../../base/src \
+		-I$(srcdir)/../../content/base/src \
 		$(NULL)
rename from content/html/parser/src/jArray.h
rename to parser/html/jArray.h
rename from content/html/parser/src/nsHtml5ArrayCopy.h
rename to parser/html/nsHtml5ArrayCopy.h
rename from content/html/parser/src/nsHtml5AtomList.h
rename to parser/html/nsHtml5AtomList.h
rename from content/html/parser/src/nsHtml5Atoms.cpp
rename to parser/html/nsHtml5Atoms.cpp
rename from content/html/parser/src/nsHtml5Atoms.h
rename to parser/html/nsHtml5Atoms.h
rename from content/html/parser/src/nsHtml5AttributeName.cpp
rename to parser/html/nsHtml5AttributeName.cpp
rename from content/html/parser/src/nsHtml5AttributeName.h
rename to parser/html/nsHtml5AttributeName.h
rename from content/html/parser/src/nsHtml5ByteReadable.h
rename to parser/html/nsHtml5ByteReadable.h
rename from content/html/parser/src/nsHtml5DocumentMode.h
rename to parser/html/nsHtml5DocumentMode.h
rename from content/html/parser/src/nsHtml5ElementName.cpp
rename to parser/html/nsHtml5ElementName.cpp
rename from content/html/parser/src/nsHtml5ElementName.h
rename to parser/html/nsHtml5ElementName.h
rename from content/html/parser/src/nsHtml5HtmlAttributes.cpp
rename to parser/html/nsHtml5HtmlAttributes.cpp
rename from content/html/parser/src/nsHtml5HtmlAttributes.h
rename to parser/html/nsHtml5HtmlAttributes.h
rename from content/html/parser/src/nsHtml5MetaScanner.cpp
rename to parser/html/nsHtml5MetaScanner.cpp
rename from content/html/parser/src/nsHtml5MetaScanner.h
rename to parser/html/nsHtml5MetaScanner.h
rename from content/html/parser/src/nsHtml5MetaScannerCppSupplement.h
rename to parser/html/nsHtml5MetaScannerCppSupplement.h
rename from content/html/parser/src/nsHtml5MetaScannerHSupplement.h
rename to parser/html/nsHtml5MetaScannerHSupplement.h
rename from content/html/parser/src/nsHtml5Module.cpp
rename to parser/html/nsHtml5Module.cpp
rename from content/html/parser/public/nsHtml5Module.h
rename to parser/html/nsHtml5Module.h
rename from content/html/parser/src/nsHtml5NamedCharacters.cpp
rename to parser/html/nsHtml5NamedCharacters.cpp
rename from content/html/parser/src/nsHtml5NamedCharacters.h
rename to parser/html/nsHtml5NamedCharacters.h
rename from content/html/parser/src/nsHtml5Parser.cpp
rename to parser/html/nsHtml5Parser.cpp
rename from content/html/parser/src/nsHtml5Parser.h
rename to parser/html/nsHtml5Parser.h
rename from content/html/parser/src/nsHtml5PendingNotification.h
rename to parser/html/nsHtml5PendingNotification.h
rename from content/html/parser/src/nsHtml5Portability.cpp
rename to parser/html/nsHtml5Portability.cpp
rename from content/html/parser/src/nsHtml5Portability.h
rename to parser/html/nsHtml5Portability.h
rename from content/html/parser/src/nsHtml5ReleasableAttributeName.cpp
rename to parser/html/nsHtml5ReleasableAttributeName.cpp
rename from content/html/parser/src/nsHtml5ReleasableAttributeName.h
rename to parser/html/nsHtml5ReleasableAttributeName.h
rename from content/html/parser/src/nsHtml5ReleasableElementName.cpp
rename to parser/html/nsHtml5ReleasableElementName.cpp
rename from content/html/parser/src/nsHtml5ReleasableElementName.h
rename to parser/html/nsHtml5ReleasableElementName.h
rename from content/html/parser/src/nsHtml5StackNode.cpp
rename to parser/html/nsHtml5StackNode.cpp
rename from content/html/parser/src/nsHtml5StackNode.h
rename to parser/html/nsHtml5StackNode.h
rename from content/html/parser/src/nsHtml5StackNodeCppSupplement.h
rename to parser/html/nsHtml5StackNodeCppSupplement.h
rename from content/html/parser/src/nsHtml5StackNodeHSupplement.h
rename to parser/html/nsHtml5StackNodeHSupplement.h
rename from content/html/parser/src/nsHtml5StateSnapshot.cpp
rename to parser/html/nsHtml5StateSnapshot.cpp
rename from content/html/parser/src/nsHtml5StateSnapshot.h
rename to parser/html/nsHtml5StateSnapshot.h
rename from content/html/parser/src/nsHtml5Tokenizer.cpp
rename to parser/html/nsHtml5Tokenizer.cpp
rename from content/html/parser/src/nsHtml5Tokenizer.h
rename to parser/html/nsHtml5Tokenizer.h
rename from content/html/parser/src/nsHtml5TreeBuilder.cpp
rename to parser/html/nsHtml5TreeBuilder.cpp
rename from content/html/parser/src/nsHtml5TreeBuilder.h
rename to parser/html/nsHtml5TreeBuilder.h
rename from content/html/parser/src/nsHtml5TreeBuilderCppSupplement.h
rename to parser/html/nsHtml5TreeBuilderCppSupplement.h
rename from content/html/parser/src/nsHtml5TreeBuilderHSupplement.h
rename to parser/html/nsHtml5TreeBuilderHSupplement.h
rename from content/html/parser/src/nsHtml5TreeOperation.cpp
rename to parser/html/nsHtml5TreeOperation.cpp
rename from content/html/parser/src/nsHtml5TreeOperation.h
rename to parser/html/nsHtml5TreeOperation.h
rename from content/html/parser/src/nsHtml5UTF16Buffer.cpp
rename to parser/html/nsHtml5UTF16Buffer.cpp
rename from content/html/parser/src/nsHtml5UTF16Buffer.h
rename to parser/html/nsHtml5UTF16Buffer.h
rename from content/html/parser/src/nsHtml5UTF16BufferCppSupplement.h
rename to parser/html/nsHtml5UTF16BufferCppSupplement.h
rename from content/html/parser/src/nsHtml5UTF16BufferHSupplement.h
rename to parser/html/nsHtml5UTF16BufferHSupplement.h
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -128,19 +128,17 @@ tier_gecko_dirs += \
 		media/libsydneyaudio \
 		$(NULL)
 endif
 
 tier_gecko_dirs	+= \
 		uriloader \
 		modules/libimg \
 		caps \
-		parser/expat \
-		parser/xml \
-		parser/htmlparser \
+		parser \
 		gfx \
 		modules/libpr0n \
 		modules/plugin \
 		dom \
 		view \
 		widget \
 		content \
 		editor \