From 1f468ac5215f27597d91c892b62497c49ebd794b Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Mon, 25 Feb 2013 12:47:20 -0800 Subject: [PATCH] Bug 784841 - Part 18l: Convert /editor; r=glandium f=Ms2ger --- editor/Makefile.in | 1 - editor/composer/Makefile.in | 4 ---- editor/composer/moz.build | 7 +++++++ editor/composer/public/moz.build | 5 +++++ editor/composer/src/moz.build | 5 +++++ editor/composer/test/moz.build | 5 +++++ editor/idl/moz.build | 5 +++++ editor/libeditor/Makefile.in | 4 ---- editor/libeditor/base/Makefile.in | 2 -- editor/libeditor/base/moz.build | 6 ++++++ editor/libeditor/base/tests/moz.build | 5 +++++ editor/libeditor/html/Makefile.in | 2 -- editor/libeditor/html/moz.build | 6 ++++++ editor/libeditor/html/tests/moz.build | 5 +++++ editor/libeditor/moz.build | 6 ++++++ editor/libeditor/text/Makefile.in | 2 -- editor/libeditor/text/moz.build | 6 ++++++ editor/libeditor/text/tests/moz.build | 5 +++++ editor/moz.build | 13 +++++++++++++ editor/public/moz.build | 5 +++++ editor/txmgr/Makefile.in | 5 ----- editor/txmgr/idl/moz.build | 5 +++++ editor/txmgr/moz.build | 7 +++++++ editor/txmgr/public/moz.build | 5 +++++ editor/txmgr/src/moz.build | 5 +++++ editor/txmgr/tests/moz.build | 5 +++++ editor/txtsvc/Makefile.in | 1 - editor/txtsvc/moz.build | 6 ++++++ editor/txtsvc/public/moz.build | 5 +++++ editor/txtsvc/src/moz.build | 5 +++++ 30 files changed, 127 insertions(+), 21 deletions(-) create mode 100644 editor/composer/moz.build create mode 100644 editor/composer/public/moz.build create mode 100644 editor/composer/src/moz.build create mode 100644 editor/composer/test/moz.build create mode 100644 editor/idl/moz.build create mode 100644 editor/libeditor/base/moz.build create mode 100644 editor/libeditor/base/tests/moz.build create mode 100644 editor/libeditor/html/moz.build create mode 100644 editor/libeditor/html/tests/moz.build create mode 100644 editor/libeditor/moz.build create mode 100644 editor/libeditor/text/moz.build create mode 100644 editor/libeditor/text/tests/moz.build create mode 100644 editor/moz.build create mode 100644 editor/public/moz.build create mode 100644 editor/txmgr/idl/moz.build create mode 100644 editor/txmgr/moz.build create mode 100644 editor/txmgr/public/moz.build create mode 100644 editor/txmgr/src/moz.build create mode 100644 editor/txmgr/tests/moz.build create mode 100644 editor/txtsvc/moz.build create mode 100644 editor/txtsvc/public/moz.build create mode 100644 editor/txtsvc/src/moz.build diff --git a/editor/Makefile.in b/editor/Makefile.in index 11deecd6878..a3a07a7eee7 100644 --- a/editor/Makefile.in +++ b/editor/Makefile.in @@ -12,7 +12,6 @@ FAIL_ON_WARNINGS := 1 include $(DEPTH)/config/autoconf.mk MODULE := editor -PARALLEL_DIRS := public idl txtsvc libeditor txmgr composer include $(topsrcdir)/config/rules.mk diff --git a/editor/composer/Makefile.in b/editor/composer/Makefile.in index 8f6371261a3..68d33dc19c9 100644 --- a/editor/composer/Makefile.in +++ b/editor/composer/Makefile.in @@ -10,10 +10,6 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk -PARALLEL_DIRS := public src - -TEST_DIRS += test - # Enable Editor API Logging! ENABLE_EDITOR_API_LOG=1 diff --git a/editor/composer/moz.build b/editor/composer/moz.build new file mode 100644 index 00000000000..f78b2a79c32 --- /dev/null +++ b/editor/composer/moz.build @@ -0,0 +1,7 @@ +# 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/. + +PARALLEL_DIRS += ['public', 'src'] +TEST_DIRS += ['test'] diff --git a/editor/composer/public/moz.build b/editor/composer/public/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/composer/public/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/composer/src/moz.build b/editor/composer/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/composer/src/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/composer/test/moz.build b/editor/composer/test/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/composer/test/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/idl/moz.build b/editor/idl/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/idl/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/libeditor/Makefile.in b/editor/libeditor/Makefile.in index 66bac6cce99..cceec2b3d03 100644 --- a/editor/libeditor/Makefile.in +++ b/editor/libeditor/Makefile.in @@ -9,9 +9,5 @@ srcdir := @srcdir@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk - -PARALLEL_DIRS := base text html - - include $(topsrcdir)/config/rules.mk diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in index 74e5a3756e7..8e7200039f2 100644 --- a/editor/libeditor/base/Makefile.in +++ b/editor/libeditor/base/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -TEST_DIRS += tests - MODULE = editor LIBRARY_NAME = editorbase_s LIBXUL_LIBRARY = 1 diff --git a/editor/libeditor/base/moz.build b/editor/libeditor/base/moz.build new file mode 100644 index 00000000000..d0193307adb --- /dev/null +++ b/editor/libeditor/base/moz.build @@ -0,0 +1,6 @@ +# 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 += ['tests'] diff --git a/editor/libeditor/base/tests/moz.build b/editor/libeditor/base/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/libeditor/base/tests/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in index 3efb68d72a9..399ef6e1a23 100644 --- a/editor/libeditor/html/Makefile.in +++ b/editor/libeditor/html/Makefile.in @@ -11,8 +11,6 @@ FAIL_ON_WARNINGS = 1 include $(DEPTH)/config/autoconf.mk -TEST_DIRS += tests - MODULE = editor LIBRARY_NAME = htmleditor_s LIBXUL_LIBRARY = 1 diff --git a/editor/libeditor/html/moz.build b/editor/libeditor/html/moz.build new file mode 100644 index 00000000000..d0193307adb --- /dev/null +++ b/editor/libeditor/html/moz.build @@ -0,0 +1,6 @@ +# 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 += ['tests'] diff --git a/editor/libeditor/html/tests/moz.build b/editor/libeditor/html/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/libeditor/html/tests/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/libeditor/moz.build b/editor/libeditor/moz.build new file mode 100644 index 00000000000..86d187f8fce --- /dev/null +++ b/editor/libeditor/moz.build @@ -0,0 +1,6 @@ +# 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/. + +PARALLEL_DIRS += ['base', 'text', 'html'] diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in index 768ba7487af..e0503435ac8 100644 --- a/editor/libeditor/text/Makefile.in +++ b/editor/libeditor/text/Makefile.in @@ -11,8 +11,6 @@ FAIL_ON_WARNINGS = 1 include $(DEPTH)/config/autoconf.mk -TEST_DIRS += tests - MODULE = editor LIBRARY_NAME = texteditor_s LIBXUL_LIBRARY = 1 diff --git a/editor/libeditor/text/moz.build b/editor/libeditor/text/moz.build new file mode 100644 index 00000000000..d0193307adb --- /dev/null +++ b/editor/libeditor/text/moz.build @@ -0,0 +1,6 @@ +# 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 += ['tests'] diff --git a/editor/libeditor/text/tests/moz.build b/editor/libeditor/text/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/libeditor/text/tests/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/moz.build b/editor/moz.build new file mode 100644 index 00000000000..4b7bb8f80e3 --- /dev/null +++ b/editor/moz.build @@ -0,0 +1,13 @@ +# 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/. + +PARALLEL_DIRS += [ + 'public', + 'idl', + 'txtsvc', + 'libeditor', + 'txmgr', + 'composer', +] diff --git a/editor/public/moz.build b/editor/public/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/public/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/txmgr/Makefile.in b/editor/txmgr/Makefile.in index 82aa86b0f32..1429c5ab8e1 100644 --- a/editor/txmgr/Makefile.in +++ b/editor/txmgr/Makefile.in @@ -11,11 +11,6 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE := txmgr -PARALLEL_DIRS := public src idl - -ifdef ENABLE_TESTS -TOOL_DIRS += tests -endif include $(topsrcdir)/config/rules.mk diff --git a/editor/txmgr/idl/moz.build b/editor/txmgr/idl/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/txmgr/idl/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/txmgr/moz.build b/editor/txmgr/moz.build new file mode 100644 index 00000000000..075edef4fc8 --- /dev/null +++ b/editor/txmgr/moz.build @@ -0,0 +1,7 @@ +# 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/. + +PARALLEL_DIRS += ['public', 'src', 'idl'] +TEST_TOOL_DIRS += ['tests'] diff --git a/editor/txmgr/public/moz.build b/editor/txmgr/public/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/txmgr/public/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/txmgr/src/moz.build b/editor/txmgr/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/txmgr/src/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/txmgr/tests/moz.build b/editor/txmgr/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/txmgr/tests/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/txtsvc/Makefile.in b/editor/txtsvc/Makefile.in index 869a09c0e05..8440c9f85e4 100644 --- a/editor/txtsvc/Makefile.in +++ b/editor/txtsvc/Makefile.in @@ -11,7 +11,6 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE := txtsvc -PARALLEL_DIRS := public src include $(topsrcdir)/config/rules.mk diff --git a/editor/txtsvc/moz.build b/editor/txtsvc/moz.build new file mode 100644 index 00000000000..3dc8124d4d6 --- /dev/null +++ b/editor/txtsvc/moz.build @@ -0,0 +1,6 @@ +# 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/. + +PARALLEL_DIRS += ['public', 'src'] diff --git a/editor/txtsvc/public/moz.build b/editor/txtsvc/public/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/txtsvc/public/moz.build @@ -0,0 +1,5 @@ +# 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/. + diff --git a/editor/txtsvc/src/moz.build b/editor/txtsvc/src/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/editor/txtsvc/src/moz.build @@ -0,0 +1,5 @@ +# 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/. +