Bug 784841 - Part 18α: Convert /parser; f=Ms2ger rs=khuey

parser/Makefile.in

@@ -10,7 +10,6 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= parser
-DIRS            = expat xml htmlparser html
 
 EXPORTS = \
   nsCharsetSource.h \

parser/expat/Makefile.in

@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= expat
-DIRS		= lib
-
 EXPORTS		= expat_config.h
 
 include $(topsrcdir)/config/rules.mk

parser/expat/lib/moz.build

+# 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/.
+

parser/expat/moz.build

+# 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 += ['lib']

parser/html/moz.build

+# 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/.
+

parser/htmlparser/Makefile.in

@@ -11,10 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= htmlparser
-DIRS		= public src
-
-ifdef ENABLE_TESTS
-TOOL_DIRS	+= tests
-endif
 
 include $(topsrcdir)/config/rules.mk

parser/htmlparser/moz.build

+# 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']
+TEST_TOOL_DIRS += ['tests']

parser/htmlparser/public/moz.build

+# 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/.
+

parser/htmlparser/src/moz.build

+# 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/.
+

parser/htmlparser/tests/Makefile.in

@@ -9,9 +9,4 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-DIRS = \
-	mochitest \
-	$(NULL)
-
 include $(topsrcdir)/config/rules.mk

parser/htmlparser/tests/mochitest/Makefile.in

@@ -11,12 +11,6 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
-		dir_bug534293 \
-		html5lib_tree_construction \
-		$(NULL)
-
-
 MOCHITEST_FILES =	parser_datreader.js \
 		parser_web_testrunner.js \
 		html5_tree_construction_exceptions.js \

parser/htmlparser/tests/mochitest/dir_bug534293/moz.build

+# 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/.
+

parser/htmlparser/tests/mochitest/html5lib_tree_construction/Makefile.in

@@ -11,11 +11,6 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
-		scripted \
-		$(NULL)
-
-
 MOCHITEST_FILES =	adoption01.dat \
 		adoption02.dat \
 		comments01.dat \

parser/htmlparser/tests/mochitest/html5lib_tree_construction/moz.build

+# 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/.
+
+TEST_DIRS += ['scripted']

parser/htmlparser/tests/mochitest/html5lib_tree_construction/scripted/moz.build

+# 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/.
+

parser/htmlparser/tests/mochitest/moz.build

+# 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/.
+
+TEST_DIRS += ['dir_bug534293', 'html5lib_tree_construction']

parser/htmlparser/tests/moz.build

+# 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/.
+
+TEST_DIRS += ['mochitest']

parser/moz.build

+# 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 += ['expat', 'xml', 'htmlparser', 'html']

parser/xml/Makefile.in

@@ -8,9 +8,4 @@ srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-DIRS            = public src
-
-TEST_DIRS += test
-
 include $(topsrcdir)/config/rules.mk

parser/xml/moz.build

+# 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']
+TEST_DIRS += ['test']