From f1924b64942c3782c0f1e61f6e948ca00485f5e5 Mon Sep 17 00:00:00 2001
From: "chak%netscape.com" <chak%netscape.com>
Date: Fri, 16 Aug 2002 23:15:54 +0000
Subject: [PATCH] Fix for #162829 - Add additional missing files to the current
 MRE package. r=leaf, sr=alecf

---
 embedding/config/Makefile.in  |  4 ++
 embedding/config/gre-win      | 75 +++++++++++++++++++++++++++++++++++
 embedding/config/gre-win-supp | 40 +++++++++++++++++++
 embedding/config/mre-win      |  0
 embedding/config/mre-win-supp |  0
 5 files changed, 119 insertions(+)
 create mode 100644 embedding/config/gre-win
 create mode 100644 embedding/config/gre-win-supp
 create mode 100644 embedding/config/mre-win
 create mode 100644 embedding/config/mre-win-supp

diff --git a/embedding/config/Makefile.in b/embedding/config/Makefile.in
index 0f7ea02eec6..fc83c74f989 100644
--- a/embedding/config/Makefile.in
+++ b/embedding/config/Makefile.in
@@ -35,6 +35,8 @@ ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
   BASEBROWSER = basebrowser-win
   BASEBROWSER_SUPP = basebrowser-win-supp
   CLIENTMANIFEST = client-win
+  MREMANIFEST = mre-win
+  MREMANIFEST_SUPP = mre-win-supp
   _PLATFORM = dos
   WINAPP=mfcembed
   #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) $(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
+	$(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) $(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
+	$(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
 	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
diff --git a/embedding/config/gre-win b/embedding/config/gre-win
new file mode 100644
index 00000000000..b701e982b39
--- /dev/null
+++ b/embedding/config/gre-win
@@ -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
diff --git a/embedding/config/gre-win-supp b/embedding/config/gre-win-supp
new file mode 100644
index 00000000000..f59f1bedb50
--- /dev/null
+++ b/embedding/config/gre-win-supp
@@ -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
diff --git a/embedding/config/mre-win b/embedding/config/mre-win
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/embedding/config/mre-win-supp b/embedding/config/mre-win-supp
new file mode 100644
index 00000000000..e69de29bb2d