From 093513a0118a6df66cb1cd8ebee280c1c43e3217 Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Mon, 25 Feb 2013 13:20:02 -0800 Subject: [PATCH] =?UTF-8?q?Bug=20784841=20-=20Part=2018=CE=BC:=20Convert?= =?UTF-8?q?=20/widget;=20f=3DMs2ger=20rs=3Dted?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- widget/Makefile.in | 29 ----------------------------- widget/android/moz.build | 5 +++++ widget/cocoa/moz.build | 5 +++++ widget/gonk/moz.build | 15 +++++++++++++++ widget/gtk2/moz.build | 5 +++++ widget/gtkxtbin/moz.build | 5 +++++ widget/moz.build | 28 ++++++++++++++++++++++++++++ widget/os2/moz.build | 5 +++++ widget/qt/Makefile.in | 2 -- widget/qt/faststartupqt/moz.build | 5 +++++ widget/qt/moz.build | 6 ++++++ widget/shared/Makefile.in | 4 ---- widget/shared/moz.build | 7 +++++++ widget/shared/x11/moz.build | 5 +++++ widget/tests/moz.build | 5 +++++ widget/windows/Makefile.in | 8 -------- widget/windows/moz.build | 9 +++++++++ widget/windows/tests/moz.build | 5 +++++ widget/windows/winrt/moz.build | 5 +++++ widget/xpwidgets/moz.build | 5 +++++ widget/xremoteclient/moz.build | 5 +++++ 21 files changed, 125 insertions(+), 43 deletions(-) create mode 100644 widget/android/moz.build create mode 100644 widget/cocoa/moz.build create mode 100644 widget/gonk/moz.build create mode 100644 widget/gtk2/moz.build create mode 100644 widget/gtkxtbin/moz.build create mode 100644 widget/moz.build create mode 100644 widget/os2/moz.build create mode 100644 widget/qt/faststartupqt/moz.build create mode 100644 widget/qt/moz.build create mode 100644 widget/shared/moz.build create mode 100644 widget/shared/x11/moz.build create mode 100644 widget/tests/moz.build create mode 100644 widget/windows/moz.build create mode 100644 widget/windows/tests/moz.build create mode 100644 widget/windows/winrt/moz.build create mode 100644 widget/xpwidgets/moz.build create mode 100644 widget/xremoteclient/moz.build diff --git a/widget/Makefile.in b/widget/Makefile.in index dc72feda55f..1d18c5518b4 100644 --- a/widget/Makefile.in +++ b/widget/Makefile.in @@ -14,35 +14,6 @@ GRE_MODULE = 1 include $(DEPTH)/config/autoconf.mk -DIRS = shared xpwidgets - -ifneq (,$(filter os2 cocoa qt android gonk,$(MOZ_WIDGET_TOOLKIT))) -DIRS += $(MOZ_WIDGET_TOOLKIT) -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -DIRS += windows -endif - -ifdef ENABLE_TESTS -TOOL_DIRS += tests -endif - -# -# Don't build the DSO under the 'build' directory as windows does. -# -# The DSOs get built in the toolkit dir itself. Do this so that -# multiple implementations of widget can be built on the same -# source tree. -# -ifdef MOZ_ENABLE_GTK2 -DIRS += gtk2 -ifdef MOZ_X11 -DIRS += gtkxtbin -endif -endif - - EXPORTS_NAMESPACES = IPC mozilla EXPORTS_IPC = \ diff --git a/widget/android/moz.build b/widget/android/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/android/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/widget/cocoa/moz.build b/widget/cocoa/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/cocoa/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/widget/gonk/moz.build b/widget/gonk/moz.build new file mode 100644 index 00000000000..0d9537c68a8 --- /dev/null +++ b/widget/gonk/moz.build @@ -0,0 +1,15 @@ +# vim: set filetype=python: +# Copyright 2013 Mozilla Foundation and Mozilla contributors +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + diff --git a/widget/gtk2/moz.build b/widget/gtk2/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/gtk2/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/widget/gtkxtbin/moz.build b/widget/gtkxtbin/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/gtkxtbin/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/widget/moz.build b/widget/moz.build new file mode 100644 index 00000000000..ef2be56f3f8 --- /dev/null +++ b/widget/moz.build @@ -0,0 +1,28 @@ +# 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 += ['shared', 'xpwidgets'] + +toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] + +if toolkit in ('os2', 'cocoa', 'qt', 'android', 'gonk'): + DIRS += [toolkit] + +if toolkit == 'windows': + DIRS += ['windows'] + +TEST_TOOL_DIRS += ['tests'] + +# Don't build the DSO under the 'build' directory as windows does. +# +# The DSOs get built in the toolkit dir itself. Do this so that +# multiple implementations of widget can be built on the same +# source tree. +# +if CONFIG['MOZ_ENABLE_GTK2']: + DIRS += ['gtk2'] + + if CONFIG['MOZ_X11']: + DIRS += ['gtkxtbin'] diff --git a/widget/os2/moz.build b/widget/os2/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/os2/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/widget/qt/Makefile.in b/widget/qt/Makefile.in index f9b3a6b177a..f38f0c71231 100644 --- a/widget/qt/Makefile.in +++ b/widget/qt/Makefile.in @@ -73,8 +73,6 @@ ifneq (qt,$(MOZ_WIDGET_TOOLKIT)) INACTIVE_COMPONENT = 1 endif -DIRS += faststartupqt - include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk diff --git a/widget/qt/faststartupqt/moz.build b/widget/qt/faststartupqt/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/qt/faststartupqt/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/widget/qt/moz.build b/widget/qt/moz.build new file mode 100644 index 00000000000..eedda0ff616 --- /dev/null +++ b/widget/qt/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/. + +DIRS += ['faststartupqt'] diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in index 70c82b29572..93675c7a274 100644 --- a/widget/shared/Makefile.in +++ b/widget/shared/Makefile.in @@ -19,10 +19,6 @@ DEFINES += \ -D_IMPL_NS_WIDGET \ $(NULL) -ifdef MOZ_X11 -PARALLEL_DIRS = x11 -endif - CPPSRCS = \ WidgetUtils.cpp \ nsShmImage.cpp \ diff --git a/widget/shared/moz.build b/widget/shared/moz.build new file mode 100644 index 00000000000..6b96b92d73f --- /dev/null +++ b/widget/shared/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/. + +if CONFIG['MOZ_X11']: + PARALLEL_DIRS += ['x11'] diff --git a/widget/shared/x11/moz.build b/widget/shared/x11/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/shared/x11/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/widget/tests/moz.build b/widget/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/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/widget/windows/Makefile.in b/widget/windows/Makefile.in index acf67f15ad9..a5770701a33 100644 --- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -18,10 +18,6 @@ RESFILE = widget.res MODULE_NAME = nsWidgetWinModule LIBXUL_LIBRARY = 1 -ifdef MOZ_METRO -DIRS = winrt -endif - CPPSRCS = \ nsWindow.cpp \ nsWindowGfx.cpp \ @@ -118,10 +114,6 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -ifdef ENABLE_TESTS -TOOL_DIRS += tests -endif - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) diff --git a/widget/windows/moz.build b/widget/windows/moz.build new file mode 100644 index 00000000000..42d5163ab3d --- /dev/null +++ b/widget/windows/moz.build @@ -0,0 +1,9 @@ +# 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_METRO']: + DIRS += ['winrt'] + +TEST_DIRS += ['tests'] diff --git a/widget/windows/tests/moz.build b/widget/windows/tests/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/windows/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/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/windows/winrt/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/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/xpwidgets/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/widget/xremoteclient/moz.build b/widget/xremoteclient/moz.build new file mode 100644 index 00000000000..58ce5e27339 --- /dev/null +++ b/widget/xremoteclient/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/. +