mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-24 13:52:37 +00:00
Bug 305098, JEP only bundled with Camino and Firefox. Bundle JEP with any Mac product as long as plugins are enabled. r=josh r=bsmedberg
This commit is contained in:
parent
46100724ea
commit
19e72efdd4
@ -338,10 +338,8 @@ endif
|
||||
|
||||
# Java Embedding Plugin
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
ifneq (,$(filter macbrowser browser,$(MOZ_BUILD_APP)))
|
||||
tier_99_dirs += plugin/oji/JEP
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq (,$(filter browser suite,$(MOZ_BUILD_APP)))
|
||||
tier_99_dirs += xpfe/components/search
|
||||
|
@ -56,14 +56,18 @@ MRJ_PLUGIN_BUNDLE=MRJPlugin.plugin
|
||||
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
|
||||
ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
|
||||
export::
|
||||
ifdef MOZ_PLUGINS
|
||||
rsync -a --exclude CVS/ $(srcdir)/$(JEP_PLUGIN_BUNDLE) .
|
||||
rsync -a --exclude CVS/ $(srcdir)/$(MRJ_PLUGIN_BUNDLE) .
|
||||
endif
|
||||
endif
|
||||
|
||||
libs install:: install-plugin
|
||||
|
||||
install-plugin:
|
||||
ifdef MOZ_PLUGINS
|
||||
$(INSTALL) $(JEP_PLUGIN_BUNDLE) $(DIST)/bin/plugins
|
||||
$(INSTALL) $(MRJ_PLUGIN_BUNDLE) $(DIST)/bin/plugins
|
||||
endif
|
||||
|
||||
clean clobber distclean::
|
||||
|
Loading…
x
Reference in New Issue
Block a user