From acd235df63935af4e1b743d065b06760421b8108 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Sat, 24 Mar 2001 14:36:25 +0000 Subject: [PATCH] If doing jar only builds, unzip all known jar files and add select chrome files to embed.jar. Bug #72390 --- embedding/config/makefile.win | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/embedding/config/makefile.win b/embedding/config/makefile.win index 0b0773a4b9a7..b959cb7ab04b 100644 --- a/embedding/config/makefile.win +++ b/embedding/config/makefile.win @@ -25,7 +25,34 @@ 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 +!if "$(_CHROME_FILE_FORMAT)" != "jar" + $(PERL) $(DEPTH)\config\make-jars.pl -v -f $(_CHROME_FILE_FORMAT) -s $(DIST)\bin\chrome -d $(DIST)\bin\chrome < embed-jar.mn +!else + nsinstall -D $(DIST)\Embed\tmpchrome\US + unzip -d $(DIST)\Embed\tmpchrome\US $(DIST)\bin\chrome\US.jar + nsinstall -D $(DIST)\Embed\tmpchrome\blue + unzip -d $(DIST)\Embed\tmpchrome\blue $(DIST)\bin\chrome\blue.jar + nsinstall -D $(DIST)\Embed\tmpchrome\chatzilla + unzip -d $(DIST)\Embed\tmpchrome\chatzilla $(DIST)\bin\chrome\chatzilla.jar + nsinstall -D $(DIST)\Embed\tmpchrome\classic + unzip -d $(DIST)\Embed\tmpchrome\classic $(DIST)\bin\chrome\classic.jar + nsinstall -D $(DIST)\Embed\tmpchrome\en-US + unzip -d $(DIST)\Embed\tmpchrome\en-US $(DIST)\bin\chrome\en-US.jar + nsinstall -D $(DIST)\Embed\tmpchrome\en-mac + unzip -d $(DIST)\Embed\tmpchrome $(DIST)\bin\chrome\en-mac.jar + nsinstall -D $(DIST)\Embed\tmpchrome\en-unix + unzip -d $(DIST)\Embed\tmpchrome\en-unix $(DIST)\bin\chrome\en-unix.jar + nsinstall -D $(DIST)\Embed\tmpchrome\en-win + unzip -d $(DIST)\Embed\tmpchrome\en-win $(DIST)\bin\chrome\en-win.jar + nsinstall -D $(DIST)\Embed\tmpchrome\messenger + unzip -d $(DIST)\Embed\tmpchrome\messenger $(DIST)\bin\chrome\messenger.jar + nsinstall -D $(DIST)\Embed\tmpchrome\modern + unzip -d $(DIST)\Embed\tmpchrome\modern $(DIST)\bin\chrome\modern.jar + nsinstall -D $(DIST)\Embed\tmpchrome\toolkit + unzip -d $(DIST)\Embed\tmpchrome\toolkit $(DIST)\bin\chrome\toolkit.jar + $(PERL) $(DEPTH)\config\make-jars.pl -v -f $(_CHROME_FILE_FORMAT) -s $(DIST)\Embed\tmpchrome -d $(DIST)\bin\chrome < embed-jar.mn + $(RM) -rf $(DIST)\Embed\tmpchrome +!endif install:: embed_chrome $(PERL) $(DEPTH)\xpinstall\packager\pkgcp.pl -s $(DIST)\bin -d $(DIST) --f basebrowser-win -o dos -v