Changed embedding installation to package embedding chrome into an embed.jar file. b=67423, r=valeski@netscape.com

embedding/config/Makefile.in

@@ -26,7 +26,10 @@ VPATH           = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-install::
+embed_chrome: embed-jar.mn
+	$(PERL) $(MOZILLA_DIR)/config/make-jars.pl -v -d $(DIST)/bin/chrome -s $(DIST)/bin/chrome < embed-jar.mn
+
+install:: embed_chrome
 	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/basebrowser-unix -o unix -v
 	$(INSTALL) $(srcdir)/installed-chrome.txt $(DIST)/Embed/chrome
 

embedding/config/basebrowser-unix

@@ -6,9 +6,10 @@
 [Embed]
 
 ; 
-; Sample App:
+; Sample App + launch script
 ; 
 gtkEmbed
+run-mozilla.sh
 
 ; 
 ; NSPR:
@@ -86,6 +87,10 @@ components/libtimer_gtk.so
 components/libgfx_gtk.so                     
 components/gfx.xpt 
 
+; jar
+components/libjar50.so
+components/jar.xpt
+
 ; layout
 components/libgklayout.so                   
 components/libhtmlpars.so                 
@@ -186,10 +191,7 @@ components/xpcom_xpti.xpt
 ;
 ; Widget-Toolkit and Res (consult hyatt@netscape.com before modifying):
 ; 
-chrome/toolkit/content/global/*
-chrome/classic/skin/classic/global/*
-chrome/en-US/locale/en-US/global/*
-chrome/en-US/locale/en-US/necko/*
+chrome/embed.jar
 ; 
 ; res:
 ; 

embedding/config/basebrowser-win

@@ -111,6 +111,10 @@ components\necko_strconv.xpt
 components\nsgif.dll                    
 components\nsjpg.dll                    
 
+; jar
+components\jar50.dll
+components\jar.xpt
+
 ; prefs
 components\pref.xpt                     
 components\xppref32.dll
@@ -186,10 +190,7 @@ components\xpcom_xpti.xpt
 ; 
 ; Widget-Toolkit and Res (consult hyatt@netscape.com before modifying):
 ; 
-chrome\toolkit\content\global\*
-chrome\classic\skin\classic\global\*
-chrome\en-US\locale\en-US\global\*
-chrome\en-US\locale\en-US\necko\*
+chrome\embed.jar
 
 ; 
 ; res:

embedding/config/installed-chrome.txt

@@ -1,6 +1,6 @@
-content,install,url,resource:/chrome/toolkit/content/global/
-locale,install,url,resource:/chrome/en-US/locale/en-US/global/
-locale,install,url,resource:/chrome/en-US/locale/en-US/necko/
-skin,install,url,resource:/chrome/classic/skin/classic/global/
+content,install,url,jar:resource:/chrome/embed.jar!/content/global/
+locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/global/
+locale,install,url,jar:resource:/chrome/embed.jar!/locale/en-US/necko/
+skin,install,url,jar:resource:/chrome/embed.jar!/skin/classic/global/
 skin,install,select,classic/1.0 
 locale,install,select,en-US 

embedding/config/makefile.win

@@ -24,8 +24,10 @@ MODULE=embed_base
 include <$(DEPTH)\config\rules.mak>
 include <$(DEPTH)\config\config.mak>
 
+embed_chrome: embed-jar.mn
+        $(PERL) $(DEPTH)\config\make-jars.pl -v $(_NO_FLOCK) -s $(DIST)\bin\chrome -d $(DIST)\bin\chrome < embed-jar.mn
 
-install:: 
+install:: embed_chrome
  $(PERL) $(DEPTH)\xpinstall\packager\pkgcp.pl -s $(DIST)\bin -d $(DIST) --f basebrowser-win -o dos -v
  $(MAKE_INSTALL) installed-chrome.txt $(DIST)\Embed\chrome