Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1255359 - Remove testplugin.mk; r=ted

Browse Source 
MozReview-Commit-ID: 1HRNBn9t5Km

--HG--
extra : rebase_source : 893832156a0952aee8edd6966b63679893e4b0b1
This commit is contained in:
Mike Shal 2016-04-01 15:52:43 -04:00
parent 6e2f1c4aa3
commit cad677908e
14 changed files with 12 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/plugins/test/testplugin/Makefile.in
View File

@ -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

9
dom/plugins/test/testplugin/flashplugin/Makefile.in
View File

@ -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

1
dom/plugins/test/testplugin/flashplugin/moz.build
View File

@ -7,4 +7,5 @@
SharedLibrary('npswftest')
relative_path = 'flashplugin'
cocoa_name = 'npswftest'
include('../testplugin.mozbuild')

8
dom/plugins/test/testplugin/javaplugin/Makefile.in
View File

@ -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

1
dom/plugins/test/testplugin/javaplugin/moz.build
View File

@ -7,4 +7,5 @@
SharedLibrary('nptestjava')
relative_path = 'javaplugin'
cocoa_name = 'JavaTest'
include('../testplugin.mozbuild')

1
dom/plugins/test/testplugin/moz.build
View File

@ -9,4 +9,5 @@ DIRS += ['secondplugin', 'javaplugin', 'thirdplugin', 'flashplugin', 'silverligh
SharedLibrary('nptest')
relative_path = '.'
cocoa_name = 'Test'
include('testplugin.mozbuild')

8
dom/plugins/test/testplugin/secondplugin/Makefile.in
View File

@ -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

1
dom/plugins/test/testplugin/secondplugin/moz.build
View File

@ -7,4 +7,5 @@
SharedLibrary('npsecondtest')
relative_path = 'secondplugin'
cocoa_name = 'SecondTest'
include('../testplugin.mozbuild')

9
dom/plugins/test/testplugin/silverlightplugin/Makefile.in
View File

@ -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

1
dom/plugins/test/testplugin/silverlightplugin/moz.build
View File

@ -7,4 +7,5 @@
SharedLibrary('npctrltest')
relative_path = 'silverlightplugin'
cocoa_name = 'npctrltest'
include('../testplugin.mozbuild')

19
dom/plugins/test/testplugin/testplugin.mk
View File

@ -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

8
dom/plugins/test/testplugin/testplugin.mozbuild
View File

@ -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'

8
dom/plugins/test/testplugin/thirdplugin/Makefile.in
View File

@ -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

1
dom/plugins/test/testplugin/thirdplugin/moz.build
View File

@ -7,4 +7,5 @@
SharedLibrary('npthirdtest')
relative_path = 'thirdplugin'
cocoa_name = 'ThirdTest'
include('../testplugin.mozbuild')