Bug 784841 - Part 18y: Convert /modules; r=glandium

modules/libbz2/Makefile.in

@@ -12,6 +12,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= libbz2
-DIRS		= src
 
 include $(topsrcdir)/config/rules.mk

modules/libbz2/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 += ['src']

modules/libbz2/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/.
+

modules/libjar/Makefile.in

@@ -11,17 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/objs.mk
 
-DIRS   =
-
-ifdef MOZ_ZIPWRITER
-DIRS  += zipwriter
-endif
-
-ifdef ENABLE_TESTS
-TOOL_DIRS += test
-endif
-
-
 MODULE		= jar
 LIBRARY_NAME	= jar$(VERSION_NUMBER)
 EXPORT_LIBRARY = 1

modules/libjar/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/.
+
+if CONFIG['MOZ_ZIPWRITER']:
+    DIRS += ['zipwriter']
+
+TEST_TOOL_DIRS += ['test']

modules/libjar/test/Makefile.in

@@ -15,6 +15,4 @@ MODULE		= test_libjar
 
 XPCSHELL_TESTS = unit
 
-DIRS		= mochitest chrome
-
 include $(topsrcdir)/config/rules.mk

modules/libjar/test/chrome/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/.
+

modules/libjar/test/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/.
+

modules/libjar/test/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 += ['mochitest', 'chrome']

modules/libjar/zipwriter/Makefile.in

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

modules/libjar/zipwriter/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']

modules/libjar/zipwriter/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/.
+

modules/libjar/zipwriter/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/.
+

modules/libjar/zipwriter/test/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/.
+

modules/libmar/Makefile.in

@@ -11,23 +11,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = src
 MODULE = libmar_test
 
-ifdef MOZ_ENABLE_SIGNMAR
-DIRS += sign verify
-else
-ifeq ($(OS_ARCH),WINNT)
-# On Windows we don't verify with NSS and updater needs to link to it
-DIRS += verify
-endif
-endif
-
-# If we are building ./sign and ./verify then ./tool must come after it
-DIRS += tool
-
-ifdef MOZ_ENABLE_SIGNMAR
-TEST_DIRS += tests
-endif
-
 include $(topsrcdir)/config/rules.mk

modules/libmar/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 += ['src']
+
+if CONFIG['MOZ_ENABLE_SIGNMAR']:
+    DIRS += ['sign', 'verify']
+    TEST_DIRS += ['tests']
+elif CONFIG['OS_ARCH'] == 'WINNT':
+    # On Windows we don't verify with NSS and updater needs to link to it
+    DIRS += ['verify']
+
+# If we are building ./sign and ./verify then ./tool must come after it
+DIRS += ['tool']

modules/libmar/sign/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/.
+

modules/libmar/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/.
+

modules/libmar/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/.
+

modules/libmar/tool/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/.
+