Bug 906696 - Start moving testplugin.mk to moz.build; f=gps r=mshal

dom/plugins/test/testplugin/moz.build

@@ -12,3 +12,6 @@ NO_DIST_INSTALL = True
 LIBRARY_NAME = 'nptest'
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
+
+relative_path = '.'
+include('testplugin.mozbuild')

dom/plugins/test/testplugin/secondplugin/moz.build

@@ -8,3 +8,5 @@ MODULE = 'npsecondtest'
 
 LIBRARY_NAME = 'npsecondtest'
 
+relative_path = '..'
+include('../testplugin.mozbuild')

dom/plugins/test/testplugin/testplugin.mk

@@ -16,30 +16,7 @@ NO_INSTALL = 1
 
 VPATH += $(topsrcdir)/build
 
-CPPSRCS   =  \
-  $(RELATIVE_PATH)/nptest.cpp \
-  $(RELATIVE_PATH)/nptest_utils.cpp \
-  nptest_name.cpp \
-  $(NULL)
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CMMSRCS = $(RELATIVE_PATH)/nptest_macosx.mm
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-CPPSRCS += $(RELATIVE_PATH)/nptest_gtk2.cpp
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-CPPSRCS += $(RELATIVE_PATH)/nptest_droid.cpp
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
-CPPSRCS += $(RELATIVE_PATH)/nptest_os2.cpp
-endif
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-CPPSRCS += $(RELATIVE_PATH)/nptest_qt.cpp
 include $(topsrcdir)/config/config.mk
 CXXFLAGS        += $(MOZ_QT_CFLAGS)
 CFLAGS          += $(MOZ_QT_CFLAGS)
@@ -50,7 +27,6 @@ EXTRA_DSO_LDOPTS = \
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-CPPSRCS  += $(RELATIVE_PATH)/nptest_windows.cpp
 RCFILE    = nptest.rc
 RESFILE   = nptest.res
 DEFFILE   = $(win_srcdir)/nptest.def

dom/plugins/test/testplugin/testplugin.mozbuild

@@ -0,0 +1,37 @@
+# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
+# 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/.
+
+CPP_SOURCES += [
+    relative_path + '/nptest.cpp',
+    relative_path + '/nptest_utils.cpp',
+    'nptest_name.cpp',
+]
+
+toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
+if toolkit == 'cocoa':
+    CMMSRCS += [
+        relative_path + '/nptest_macosx.mm'
+    ]
+elif toolkit == 'gtk2':
+    CPP_SOURCES += [
+        relative_path + '/nptest_gtk2.cpp',
+    ]
+elif toolkit == 'android':
+    CPP_SOURCES += [
+        relative_path + '/nptest_droid.cpp',
+    ]
+elif toolkit == 'os2':
+    CPP_SOURCES += [
+        relative_path + '/nptest_os2.cpp',
+    ]
+elif toolkit == 'qt':
+    CPP_SOURCES += [
+        relative_path + '/nptest_qt.cpp',
+    ]
+elif toolkit == 'windows':
+    CPP_SOURCES += [
+        relative_path + '/nptest_windows.cpp',
+    ]