зеркало из https://github.com/mozilla/pjs.git
Fix for #162829 - Add additional missing files to the current MRE package.
r=leaf, sr=alecf
This commit is contained in:
Родитель
f9a5a2f1e7
Коммит
f1924b6494
|
@ -35,6 +35,8 @@ ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
|
||||||
BASEBROWSER = basebrowser-win
|
BASEBROWSER = basebrowser-win
|
||||||
BASEBROWSER_SUPP = basebrowser-win-supp
|
BASEBROWSER_SUPP = basebrowser-win-supp
|
||||||
CLIENTMANIFEST = client-win
|
CLIENTMANIFEST = client-win
|
||||||
|
MREMANIFEST = mre-win
|
||||||
|
MREMANIFEST_SUPP = mre-win-supp
|
||||||
_PLATFORM = dos
|
_PLATFORM = dos
|
||||||
WINAPP=mfcembed
|
WINAPP=mfcembed
|
||||||
#WINAPP=winembed
|
#WINAPP=winembed
|
||||||
|
@ -93,9 +95,11 @@ mre:: embed_chrome
|
||||||
$(PERL) -I$(srcdir) $(srcdir)/mre.pl mre < $(srcdir)/$(BASEBROWSER) > $(MOZILLA_DIR)/embedding/config/mre-win.tmp
|
$(PERL) -I$(srcdir) $(srcdir)/mre.pl mre < $(srcdir)/$(BASEBROWSER) > $(MOZILLA_DIR)/embedding/config/mre-win.tmp
|
||||||
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(MOZILLA_DIR)/embedding/config/mre-win.tmp -o $(_PLATFORM) -v
|
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(MOZILLA_DIR)/embedding/config/mre-win.tmp -o $(_PLATFORM) -v
|
||||||
-$(RM) -f $(MOZILLA_DIR)/embedding/config/mre-win.tmp
|
-$(RM) -f $(MOZILLA_DIR)/embedding/config/mre-win.tmp
|
||||||
|
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(MREMANIFEST) -o $(_PLATFORM) -v
|
||||||
$(PERL) -I$(srcdir) $(srcdir)/mre.pl mre_app_support < $(srcdir)/$(BASEBROWSER_SUPP) > $(MOZILLA_DIR)/embedding/config/mre-win-supp.tmp
|
$(PERL) -I$(srcdir) $(srcdir)/mre.pl mre_app_support < $(srcdir)/$(BASEBROWSER_SUPP) > $(MOZILLA_DIR)/embedding/config/mre-win-supp.tmp
|
||||||
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(MOZILLA_DIR)/embedding/config/mre-win-supp.tmp -o $(_PLATFORM) -v
|
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(MOZILLA_DIR)/embedding/config/mre-win-supp.tmp -o $(_PLATFORM) -v
|
||||||
-$(RM) -f $(MOZILLA_DIR)/embedding/config/mre-win-supp.tmp
|
-$(RM) -f $(MOZILLA_DIR)/embedding/config/mre-win-supp.tmp
|
||||||
|
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(MREMANIFEST_SUPP) -o $(_PLATFORM) -v
|
||||||
$(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/mre_app_support/chrome
|
$(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/mre_app_support/chrome
|
||||||
test -d $(DIST)/mre_app_support/plugins || mkdir $(DIST)/mre_app_support/plugins
|
test -d $(DIST)/mre_app_support/plugins || mkdir $(DIST)/mre_app_support/plugins
|
||||||
test -d $(DIST)/mre_app_support/components || mkdir $(DIST)/mre_app_support/components
|
test -d $(DIST)/mre_app_support/components || mkdir $(DIST)/mre_app_support/components
|
||||||
|
|
|
@ -0,0 +1,75 @@
|
||||||
|
; MRE Package File for Win32
|
||||||
|
;
|
||||||
|
; The files specified in this manifest will be added to
|
||||||
|
; the list of files specified in basebrowser-win manifest
|
||||||
|
; to create the MRE package
|
||||||
|
;
|
||||||
|
|
||||||
|
[mre]
|
||||||
|
|
||||||
|
;
|
||||||
|
; oji/LiveConnect support
|
||||||
|
;
|
||||||
|
components\oji.dll
|
||||||
|
components\oji.xpt
|
||||||
|
jsj3250.dll
|
||||||
|
|
||||||
|
;
|
||||||
|
; Type info support for nsIController
|
||||||
|
;
|
||||||
|
components\xuldoc.xpt
|
||||||
|
|
||||||
|
;
|
||||||
|
; history
|
||||||
|
;
|
||||||
|
components\history.xpt
|
||||||
|
|
||||||
|
;
|
||||||
|
; html parser
|
||||||
|
;
|
||||||
|
components\htmlparser.xpt
|
||||||
|
|
||||||
|
;
|
||||||
|
; javascript
|
||||||
|
;
|
||||||
|
components\jsloader.dll
|
||||||
|
|
||||||
|
;
|
||||||
|
; imagelib
|
||||||
|
;
|
||||||
|
components\imgbmp.dll
|
||||||
|
components\imgxbm.dll
|
||||||
|
components\imgmng.dll
|
||||||
|
components\imgicon.dll
|
||||||
|
components\imgicon.xpt
|
||||||
|
components\imglib2.xpt
|
||||||
|
|
||||||
|
;
|
||||||
|
; l10n libraries
|
||||||
|
;
|
||||||
|
components\universalchardet.dll
|
||||||
|
|
||||||
|
;
|
||||||
|
; necko xpts
|
||||||
|
;
|
||||||
|
components\necko_cookie.xpt
|
||||||
|
components\necko_file.xpt
|
||||||
|
components\necko_viewsource.xpt
|
||||||
|
|
||||||
|
;
|
||||||
|
; webbrowserpersist
|
||||||
|
;
|
||||||
|
components\webbrowserpersist.xpt
|
||||||
|
|
||||||
|
;
|
||||||
|
; xml
|
||||||
|
;
|
||||||
|
components\xmlextras.dll
|
||||||
|
components\xmlextras.xpt
|
||||||
|
|
||||||
|
;
|
||||||
|
; XP Install Support
|
||||||
|
;
|
||||||
|
xpicleanup.exe
|
||||||
|
components\xpinstal.dll
|
||||||
|
components\xpinstall.xpt
|
|
@ -0,0 +1,40 @@
|
||||||
|
;
|
||||||
|
; MRE app support package file for Win32
|
||||||
|
; embedding resources.
|
||||||
|
;
|
||||||
|
; The files specified in this manifest will be added to
|
||||||
|
; the list of files specified in basebrowser-win-supp
|
||||||
|
; manifest to create the MRE application support package
|
||||||
|
;
|
||||||
|
;
|
||||||
|
|
||||||
|
[mre_app_support]
|
||||||
|
|
||||||
|
;
|
||||||
|
; layout
|
||||||
|
;
|
||||||
|
res\dtd\xhtml11.dtd
|
||||||
|
|
||||||
|
;
|
||||||
|
; MathML Support
|
||||||
|
;
|
||||||
|
; http://bugzilla.mozilla.org/show_bug.cgi?id=137029
|
||||||
|
;
|
||||||
|
res\dtd\mathml.dtd
|
||||||
|
|
||||||
|
;
|
||||||
|
; wallet
|
||||||
|
;
|
||||||
|
defaults\wallet\DistinguishedSchema.tbl
|
||||||
|
defaults\wallet\FieldSchema.tbl
|
||||||
|
defaults\wallet\VcardSchema.tbl
|
||||||
|
defaults\wallet\SchemaConcat.tbl
|
||||||
|
defaults\wallet\SchemaStrings.tbl
|
||||||
|
defaults\wallet\PositionalSchema.tbl
|
||||||
|
defaults\wallet\StateSchema.tbl
|
||||||
|
|
||||||
|
;
|
||||||
|
; XP Install Support
|
||||||
|
;
|
||||||
|
defaults\pref\xpinstall.js
|
||||||
|
res\cmessage.txt
|
Загрузка…
Ссылка в новой задаче