Bug 784841 - Part 18λ: Convert /webapprt; r=glandium
authorGregory Szorc <gps@mozilla.com>
Mon, 25 Feb 2013 13:20:01 -0800
changeset 123051 20c33662a25ee19bfedbad6cc0828a259e7f9499
parent 123050 251aa9072a17d027dfa8fc20f934dc18026a865c
child 123052 592b31342f746164b3a068d0e0dbb1bf1f6861e4
push id1390
push userMs2ger@gmail.com
push dateThu, 28 Feb 2013 17:40:16 +0000
treeherderfx-team@c65d59d33aa8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs784841
milestone22.0a1
Bug 784841 - Part 18λ: Convert /webapprt; r=glandium
webapprt/Makefile.in
webapprt/gtk2/moz.build
webapprt/mac/moz.build
webapprt/moz.build
webapprt/test/Makefile.in
webapprt/test/chrome/moz.build
webapprt/test/content/moz.build
webapprt/test/moz.build
webapprt/win/moz.build
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -4,36 +4,22 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = $(NULL)
-
 # Include config.mk explicitly so we can override FINAL_TARGET.
 include $(topsrcdir)/config/config.mk
 
 # Place webapprt resources in a separate app dir
 DIST_SUBDIR = webapprt
 
-ifneq (,$(filter WINNT,$(OS_ARCH)))
-DIRS += win
-else
-ifeq ($(OS_ARCH),Darwin)
-DIRS += mac
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-DIRS += gtk2
-endif # gtk2
-endif # mac
-endif # windows
-
 EXTRA_COMPONENTS := \
   components.manifest \
   CommandLineHandler.js \
   ContentPermission.js \
   ContentPolicy.js \
   DirectoryProvider.js \
   $(NULL)
 
@@ -41,20 +27,16 @@ EXTRA_JS_MODULES = \
   Startup.jsm \
   WebappRT.jsm \
   WebappsHandler.jsm \
   $(NULL)
 
 PREF_JS_EXPORTS = $(srcdir)/prefs.js \
                   $(NULL)
 
-TEST_DIRS += \
-  test \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
 
 ifdef MOZILLA_OFFICIAL
 DEFINES += -DMOZILLA_OFFICIAL
new file mode 100644
--- /dev/null
+++ b/webapprt/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/.
+
new file mode 100644
--- /dev/null
+++ b/webapprt/mac/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/.
+
new file mode 100644
--- /dev/null
+++ b/webapprt/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/.
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    DIRS += ['win']
+elif CONFIG['OS_ARCH'] == 'Darwin':
+    DIRS += ['mac']
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
+    DIRS += ['gtk2']
+
+TEST_DIRS += ['test']
--- a/webapprt/test/Makefile.in
+++ b/webapprt/test/Makefile.in
@@ -4,14 +4,9 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS += \
-  chrome \
-  content \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
new file mode 100644
--- /dev/null
+++ b/webapprt/test/chrome/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/.
+
new file mode 100644
--- /dev/null
+++ b/webapprt/test/content/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/.
+
new file mode 100644
--- /dev/null
+++ b/webapprt/test/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 += ['chrome', 'content']
new file mode 100644
--- /dev/null
+++ b/webapprt/win/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/.
+