From 1a21bbb1ce7717ea6065ca19d6eac83407ec7a6a Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Sat, 24 Mar 2001 13:38:53 +0000 Subject: [PATCH] Extract chrome files from moz .jars to create embed.jar if building with jar chrome only. Bug #72390. Shoudl fix tinderbox bustage too. git-svn-id: svn://10.0.0.236/trunk@90341 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/config/Makefile.in | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mozilla/embedding/config/Makefile.in b/mozilla/embedding/config/Makefile.in index 300118d2936..293bb468c6c 100644 --- a/mozilla/embedding/config/Makefile.in +++ b/mozilla/embedding/config/Makefile.in @@ -27,7 +27,19 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/config/rules.mk embed_chrome: embed-jar.mn - $(PERL) $(MOZILLA_DIR)/config/make-jars.pl -v -d $(DIST)/bin/chrome -s $(DIST)/bin/chrome < $(MOZILLA_DIR)/embedding/config/embed-jar.mn +ifneq (jar,$(MOZ_CHROME_FILE_FORMAT)) + $(PERL) $(MOZILLA_DIR)/config/make-jars.pl -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/bin/chrome < $(MOZILLA_DIR)/embedding/config/embed-jar.mn +else + for f in $(DIST)/bin/chrome/*.jar; do \ + b=`basename $$f | sed -e 's|.jar$$||'` ; \ + echo "$$b" ; \ + $(NSINSTALL) -D $(DIST)/Embed/tmpchrome/$$b ;\ + unzip -d $(DIST)/Embed/tmpchrome/$$b $$f ; \ + done + $(PERL) $(MOZILLA_DIR)/config/make-jars.pl -v -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(DIST)/Embed/tmpchrome < $(MOZILLA_DIR)/embedding/config/embed-jar.mn + $(RM) -rf $(DIST)/Embed/tmpchrome +endif + install:: embed_chrome $(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/basebrowser-unix -o unix -v