Fix for #151574 - Add MRE packaging make target to embedding/config

r=adamlock,  sr=darin

embedding/config/Makefile.in

@@ -32,6 +32,7 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 else
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
   BASEBROWSER = basebrowser-win
+  BASEBROWSER_SUPP = basebrowser-win-supp
   _PLATFORM = dos
   WINAPP=mfcembed
   #WINAPP=winembed
@@ -62,6 +63,9 @@ endif
 
 libs:: embed_chrome
 	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(BASEBROWSER) -o $(_PLATFORM) -v
+ifeq ($(OS_ARCH),WINNT)
+	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(BASEBROWSER_SUPP) -o $(_PLATFORM) -v
+endif
 	$(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/Embed/chrome
 	$(NSINSTALL) -t $(srcdir)/readme.html $(DIST)/Embed
 ifeq ($(OS_ARCH),WINNT)
@@ -78,4 +82,15 @@ ifdef MOZ_DEBUG
 endif
 endif # WINNT
 
-
+ifeq ($(OS_ARCH),WINNT)
+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) -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
+	$(NSINSTALL) -t $(srcdir)/installed-chrome.txt $(DIST)/mre_app_support/chrome
+	mkdir $(DIST)/mre_app_support/plugins
+	mkdir $(DIST)/mre_app_support/components
+endif # WINNT

embedding/config/basebrowser-win

@@ -1,5 +1,5 @@
 ; Base Embedding Package File for Win32
-;
+; 
 ;
 ;
 
@@ -21,7 +21,6 @@
 ;
 mozctl.dll
 mozctlx.dll
-res\MozillaControl.html
 
 
 ; 
@@ -128,7 +127,6 @@ components\jsurl.xpt
 ; layout
 moz_art_lgpl.dll
 components\gkcontent.dll
-res\dtd\*
 components\gklayout.dll                   
 components\gkparser.dll                 
 components\gkview.dll                   
@@ -200,11 +198,8 @@ components\pipboot.dll
 components\pipboot.xpt
 components\pipnss.dll
 components\pipnss.xpt
-chrome\pipnss.jar
 components\pippki.dll
 components\pippki.xpt
-chrome\pippki.jar
-defaults\pref\security-prefs.js
 nss3.dll
 smime3.dll
 softokn3.dll
@@ -239,21 +234,9 @@ components\chardet.dll
 ; components\ucvtw2.dll for traditional chinese
 ; components\ucvibm.dll for ibm
 
-
-res\language.properties
-res\langGroups.properties
-res\charsetData.properties
-res\charsetalias.properties
-res\wincharset.properties
-; res\strres.properties 
-
 ; required i18n libs
 components\strres.dll
 
-; required prefs files
-defaults\pref\all.js
-defaults\pref\winpref.js
-
 ; uriloader
 components\urildr.dll
 components\uriloader.xpt
@@ -276,42 +259,8 @@ components\xpcom_nativeapp.xpt
 components\xpcom_thread.xpt
 components\xpcom_xpti.xpt
 
-; 
-; Widget-Toolkit and Res (consult hyatt@netscape.com before modifying):
-; 
-chrome\embed.jar
-
-; 
-; res:
-; 
-res\html.css   
-res\quirk.css
-res\viewsource.css
-res\ua.css
-res\forms.css
-res\arrow.gif
-res\arrowd.gif
-res\loading-image.gif
-res\broken-image.gif
-res\builtin\htmlBindings.xml
-res\builtin\platformHTMLBindings.xml
-res\entityTables\*
-res\fonts\*
-
 ;
 ; MathML
 ;
 components\ucvmath.dll
-res\mathml.css
 
-; needed for ftp:// dir listings etc
-res\html\gopher-audio.gif
-res\html\gopher-binary.gif
-res\html\gopher-find.gif
-res\html\gopher-image.gif
-res\html\gopher-menu.gif
-res\html\gopher-movie.gif
-res\html\gopher-sound.gif
-res\html\gopher-telnet.gif
-res\html\gopher-text.gif
-res\html\gopher-unknown.gif

embedding/config/basebrowser-win-supp

@@ -0,0 +1,74 @@
+;
+; Base Embedding Package File for Win32
+; embedding resources. Please place any
+; references to res, prefs, chrome etc.
+; in this file
+;
+
+[Embed]
+
+;
+; ActiveX control
+;
+res\MozillaControl.html
+
+; layout
+res\dtd\*
+
+; psm2
+; Optional - only if you need PSM2 support
+chrome\pipnss.jar
+chrome\pippki.jar
+defaults\pref\security-prefs.js
+
+; required l10n resources
+
+res\language.properties
+res\langGroups.properties
+res\charsetData.properties
+res\charsetalias.properties
+res\wincharset.properties
+; res\strres.properties 
+
+; required prefs files
+defaults\pref\all.js
+defaults\pref\winpref.js
+
+; 
+; Widget-Toolkit and Res (consult hyatt@netscape.com before modifying):
+; 
+chrome\embed.jar
+
+; 
+; res:
+; 
+res\html.css   
+res\quirk.css
+res\viewsource.css
+res\ua.css
+res\forms.css
+res\arrow.gif
+res\arrowd.gif
+res\loading-image.gif
+res\broken-image.gif
+res\builtin\htmlBindings.xml
+res\builtin\platformHTMLBindings.xml
+res\entityTables\*
+res\fonts\*
+
+;
+; MathML
+;
+res\mathml.css
+
+; needed for ftp:// dir listings etc
+res\html\gopher-audio.gif
+res\html\gopher-binary.gif
+res\html\gopher-find.gif
+res\html\gopher-image.gif
+res\html\gopher-menu.gif
+res\html\gopher-movie.gif
+res\html\gopher-sound.gif
+res\html\gopher-telnet.gif
+res\html\gopher-text.gif
+res\html\gopher-unknown.gif

embedding/config/gre.pl

@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+
+#
+# mre.pl
+#
+
+while (<STDIN>) {
+  s/\[Embed\]/\[$ARGV[0]\]/;
+  print;
+}

embedding/config/makefile.win

@@ -61,6 +61,7 @@ embed_chrome: embed-jar.mn
 
 libs:: embed_chrome
  $(PERL) $(DEPTH)\xpinstall\packager\pkgcp.pl -s $(DIST)\bin -d $(DIST) --f basebrowser-win -o dos -v
+ $(PERL) $(DEPTH)\xpinstall\packager\pkgcp.pl -s $(DIST)\bin -d $(DIST) --f basebrowser-win-supp -o dos -v
  $(MAKE_INSTALL) installed-chrome.txt $(DIST)\Embed\chrome
  $(MAKE_INSTALL) readme.html $(DIST)\Embed
 !IF  "$(APP)" == "mfcembed"
@@ -75,3 +76,14 @@ libs:: embed_chrome
 
 clobber::
  rm -f $(DIST)\Embed\chrome\installed-chrome.txt
+
+mre:: embed_chrome
+ $(PERL) mre.pl mre < basebrowser-win > mre-win.tmp
+ $(PERL) $(DEPTH)\xpinstall\packager\pkgcp.pl -s $(DIST)\bin -d $(DIST) --f mre-win.tmp -o dos -v
+ -$(RM) -f mre-win.tmp
+ $(PERL) mre.pl mre_app_support < basebrowser-win-supp > mre-win-supp.tmp
+ $(PERL) $(DEPTH)\xpinstall\packager\pkgcp.pl -s $(DIST)\bin -d $(DIST) --f mre-win-supp.tmp -o dos -v
+ -$(RM) -f mre-win-supp.tmp
+ $(MAKE_INSTALL) installed-chrome.txt $(DIST)\mre_app_support\chrome
+ $(MKDIR) $(DIST)\mre_app_support\plugins
+ $(MKDIR) $(DIST)\mre_app_support\components

embedding/config/mre.pl

@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+
+#
+# mre.pl
+#
+
+while (<STDIN>) {
+  s/\[Embed\]/\[$ARGV[0]\]/;
+  print;
+}