Merge m-c to a CLOSED TREE mozilla-inbound
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 18 Apr 2016 22:42:28 -0700
changeset 331609 d0376a3bc28621dbd95730c7ea12ccc8e8bc267f
parent 331608 6963c6f6caacf104ac52b99dc68a0e9b89eaacba (current diff)
parent 331507 cb65ec85049efa44b18e2e8d06af26768c3bfb94 (diff)
child 331610 ae7413abfa4d3954a6a4ce7c1613a7100f367f9a
child 331680 02e86612b3798e5f3cc6a1cec2f55246096f8c9f
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to a CLOSED TREE mozilla-inbound
new file mode 100644
--- /dev/null
+++ b/dom/plugins/test/testplugin/Makefile.in
@@ -0,0 +1,8 @@
+#
+# 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
new file mode 100644
--- /dev/null
+++ b/dom/plugins/test/testplugin/flashplugin/Makefile.in
@@ -0,0 +1,9 @@
+#
+# 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
+
--- a/dom/plugins/test/testplugin/flashplugin/moz.build
+++ b/dom/plugins/test/testplugin/flashplugin/moz.build
@@ -2,10 +2,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/.
 
 SharedLibrary('npswftest')
 
 relative_path = 'flashplugin'
-cocoa_name = 'npswftest'
 include('../testplugin.mozbuild')
new file mode 100644
--- /dev/null
+++ b/dom/plugins/test/testplugin/javaplugin/Makefile.in
@@ -0,0 +1,8 @@
+#
+# 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
--- a/dom/plugins/test/testplugin/javaplugin/moz.build
+++ b/dom/plugins/test/testplugin/javaplugin/moz.build
@@ -2,10 +2,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/.
 
 SharedLibrary('nptestjava')
 
 relative_path = 'javaplugin'
-cocoa_name = 'JavaTest'
 include('../testplugin.mozbuild')
--- a/dom/plugins/test/testplugin/moz.build
+++ b/dom/plugins/test/testplugin/moz.build
@@ -4,10 +4,9 @@
 # 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 += ['secondplugin', 'javaplugin', 'thirdplugin', 'flashplugin', 'silverlightplugin']
 
 SharedLibrary('nptest')
 
 relative_path = '.'
-cocoa_name = 'Test'
 include('testplugin.mozbuild')
new file mode 100644
--- /dev/null
+++ b/dom/plugins/test/testplugin/secondplugin/Makefile.in
@@ -0,0 +1,8 @@
+#
+# 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
--- a/dom/plugins/test/testplugin/secondplugin/moz.build
+++ b/dom/plugins/test/testplugin/secondplugin/moz.build
@@ -2,10 +2,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/.
 
 SharedLibrary('npsecondtest')
 
 relative_path = 'secondplugin'
-cocoa_name = 'SecondTest'
 include('../testplugin.mozbuild')
new file mode 100644
--- /dev/null
+++ b/dom/plugins/test/testplugin/silverlightplugin/Makefile.in
@@ -0,0 +1,9 @@
+#
+# 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
+
--- a/dom/plugins/test/testplugin/silverlightplugin/moz.build
+++ b/dom/plugins/test/testplugin/silverlightplugin/moz.build
@@ -2,10 +2,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/.
 
 SharedLibrary('npctrltest')
 
 relative_path = 'silverlightplugin'
-cocoa_name = 'npctrltest'
 include('../testplugin.mozbuild')
new file mode 100644
--- /dev/null
+++ b/dom/plugins/test/testplugin/testplugin.mk
@@ -0,0 +1,19 @@
+#
+# 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
--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -1,14 +1,16 @@
 # -*- 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/.
 
+DIST_INSTALL = False
+
 UNIFIED_SOURCES += [
     'nptest.cpp',
     'nptest_utils.cpp',
 ]
 
 UNIFIED_SOURCES += [
     '%s/nptest_name.cpp' % relative_path,
 ]
@@ -67,14 +69,8 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     OS_LIBS += CONFIG['MOZ_QT_LIBS']
     OS_LIBS += CONFIG['XLDFLAGS']
     OS_LIBS += CONFIG['XLIBS']
 
 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'
new file mode 100644
--- /dev/null
+++ b/dom/plugins/test/testplugin/thirdplugin/Makefile.in
@@ -0,0 +1,8 @@
+#
+# 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
--- a/dom/plugins/test/testplugin/thirdplugin/moz.build
+++ b/dom/plugins/test/testplugin/thirdplugin/moz.build
@@ -2,10 +2,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/.
 
 SharedLibrary('npthirdtest')
 
 relative_path = 'thirdplugin'
-cocoa_name = 'ThirdTest'
 include('../testplugin.mozbuild')