diff --git a/dom/plugins/test/testplugin/Makefile.in b/dom/plugins/test/testplugin/Makefile.in deleted file mode 100644 index f8ad2c87619a..000000000000 --- a/dom/plugins/test/testplugin/Makefile.in +++ /dev/null @@ -1,8 +0,0 @@ -# -# 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/. - -RELATIVE_PATH=. -COCOA_NAME=Test -include @srcdir@/testplugin.mk diff --git a/dom/plugins/test/testplugin/flashplugin/Makefile.in b/dom/plugins/test/testplugin/flashplugin/Makefile.in deleted file mode 100644 index b752d61506cd..000000000000 --- a/dom/plugins/test/testplugin/flashplugin/Makefile.in +++ /dev/null @@ -1,9 +0,0 @@ -# -# 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/. - -RELATIVE_PATH=.. -COCOA_NAME=npswftest -include @srcdir@/../testplugin.mk - diff --git a/dom/plugins/test/testplugin/flashplugin/moz.build b/dom/plugins/test/testplugin/flashplugin/moz.build index b21e5cdfeabc..965c0ea7032a 100644 --- a/dom/plugins/test/testplugin/flashplugin/moz.build +++ b/dom/plugins/test/testplugin/flashplugin/moz.build @@ -7,4 +7,5 @@ SharedLibrary('npswftest') relative_path = 'flashplugin' +cocoa_name = 'npswftest' include('../testplugin.mozbuild') diff --git a/dom/plugins/test/testplugin/javaplugin/Makefile.in b/dom/plugins/test/testplugin/javaplugin/Makefile.in deleted file mode 100644 index aaa60c98617d..000000000000 --- a/dom/plugins/test/testplugin/javaplugin/Makefile.in +++ /dev/null @@ -1,8 +0,0 @@ -# -# 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/. - -RELATIVE_PATH=.. -COCOA_NAME=JavaTest -include @srcdir@/../testplugin.mk diff --git a/dom/plugins/test/testplugin/javaplugin/moz.build b/dom/plugins/test/testplugin/javaplugin/moz.build index 1253403a5dd2..726b3e62ff72 100644 --- a/dom/plugins/test/testplugin/javaplugin/moz.build +++ b/dom/plugins/test/testplugin/javaplugin/moz.build @@ -7,4 +7,5 @@ SharedLibrary('nptestjava') relative_path = 'javaplugin' +cocoa_name = 'JavaTest' include('../testplugin.mozbuild') diff --git a/dom/plugins/test/testplugin/moz.build b/dom/plugins/test/testplugin/moz.build index d7d7fb6e8142..e9996e4c87ef 100644 --- a/dom/plugins/test/testplugin/moz.build +++ b/dom/plugins/test/testplugin/moz.build @@ -9,4 +9,5 @@ DIRS += ['secondplugin', 'javaplugin', 'thirdplugin', 'flashplugin', 'silverligh SharedLibrary('nptest') relative_path = '.' +cocoa_name = 'Test' include('testplugin.mozbuild') diff --git a/dom/plugins/test/testplugin/secondplugin/Makefile.in b/dom/plugins/test/testplugin/secondplugin/Makefile.in deleted file mode 100644 index 36d59b207474..000000000000 --- a/dom/plugins/test/testplugin/secondplugin/Makefile.in +++ /dev/null @@ -1,8 +0,0 @@ -# -# 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/. - -RELATIVE_PATH=.. -COCOA_NAME=SecondTest -include @srcdir@/../testplugin.mk diff --git a/dom/plugins/test/testplugin/secondplugin/moz.build b/dom/plugins/test/testplugin/secondplugin/moz.build index be0f0a85b2ac..39f1c1aa9d8f 100644 --- a/dom/plugins/test/testplugin/secondplugin/moz.build +++ b/dom/plugins/test/testplugin/secondplugin/moz.build @@ -7,4 +7,5 @@ SharedLibrary('npsecondtest') relative_path = 'secondplugin' +cocoa_name = 'SecondTest' include('../testplugin.mozbuild') diff --git a/dom/plugins/test/testplugin/silverlightplugin/Makefile.in b/dom/plugins/test/testplugin/silverlightplugin/Makefile.in deleted file mode 100644 index ebab18fbd29a..000000000000 --- a/dom/plugins/test/testplugin/silverlightplugin/Makefile.in +++ /dev/null @@ -1,9 +0,0 @@ -# -# 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/. - -RELATIVE_PATH=.. -COCOA_NAME=npctrltest -include @srcdir@/../testplugin.mk - diff --git a/dom/plugins/test/testplugin/silverlightplugin/moz.build b/dom/plugins/test/testplugin/silverlightplugin/moz.build index affa3d7a227c..cd4cbb26456e 100644 --- a/dom/plugins/test/testplugin/silverlightplugin/moz.build +++ b/dom/plugins/test/testplugin/silverlightplugin/moz.build @@ -7,4 +7,5 @@ SharedLibrary('npctrltest') relative_path = 'silverlightplugin' +cocoa_name = 'npctrltest' include('../testplugin.mozbuild') diff --git a/dom/plugins/test/testplugin/testplugin.mk b/dom/plugins/test/testplugin/testplugin.mk deleted file mode 100644 index a6690f77ffec..000000000000 --- a/dom/plugins/test/testplugin/testplugin.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -# 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_PLUGIN_FILES = $(SHARED_LIBRARY) - -ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) -MAC_PLIST_FILES += $(srcdir)/Info.plist -MAC_PLIST_DEST = $(DIST)/plugins/$(COCOA_NAME).plugin/Contents -TEST_PLUGIN_DEST = $(DIST)/plugins/$(COCOA_NAME).plugin/Contents/MacOS -INSTALL_TARGETS += \ - TEST_PLUGIN \ - MAC_PLIST \ - $(NULL) -else -TEST_PLUGIN_DEST = $(DIST)/plugins -INSTALL_TARGETS += TEST_PLUGIN -endif diff --git a/dom/plugins/test/testplugin/testplugin.mozbuild b/dom/plugins/test/testplugin/testplugin.mozbuild index cd9d6bf12e82..43182a0e7144 100644 --- a/dom/plugins/test/testplugin/testplugin.mozbuild +++ b/dom/plugins/test/testplugin/testplugin.mozbuild @@ -4,8 +4,6 @@ # 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/. -DIST_INSTALL = False - UNIFIED_SOURCES += [ 'nptest.cpp', 'nptest_utils.cpp', @@ -74,3 +72,9 @@ if CONFIG['_MSC_VER']: # This is intended as a temporary hack to support building with VS2015. # conversion from 'X' to 'Y' requires a narrowing conversion CXXFLAGS += ['-wd4838'] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': + FINAL_TARGET = 'dist/plugins/%s.plugin/Contents/MacOS' % cocoa_name + OBJDIR_FILES.dist.plugins['%s.plugin' % cocoa_name].Contents += ['Info.plist'] +else: + FINAL_TARGET = 'dist/plugins' diff --git a/dom/plugins/test/testplugin/thirdplugin/Makefile.in b/dom/plugins/test/testplugin/thirdplugin/Makefile.in deleted file mode 100644 index 4c38699549e8..000000000000 --- a/dom/plugins/test/testplugin/thirdplugin/Makefile.in +++ /dev/null @@ -1,8 +0,0 @@ -# -# 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/. - -RELATIVE_PATH=.. -COCOA_NAME=ThirdTest -include @srcdir@/../testplugin.mk diff --git a/dom/plugins/test/testplugin/thirdplugin/moz.build b/dom/plugins/test/testplugin/thirdplugin/moz.build index 50498b37c48d..763b5ae0c66c 100644 --- a/dom/plugins/test/testplugin/thirdplugin/moz.build +++ b/dom/plugins/test/testplugin/thirdplugin/moz.build @@ -7,4 +7,5 @@ SharedLibrary('npthirdtest') relative_path = 'thirdplugin' +cocoa_name = 'ThirdTest' include('../testplugin.mozbuild')