Use the XUL pre-processor on our static installed-chrome.txt isntead of having a version for unix and a version for windows.

Thanks to bryner for the tip
This commit is contained in:
scott%scott-macgregor.org 2004-03-15 22:44:00 +00:00
Родитель 22cb21cb50
Коммит fc6d5e7969
3 изменённых файлов: 8 добавлений и 61 удалений

Просмотреть файл

@ -92,12 +92,7 @@ ifneq (,$(findstring pref,$(MOZ_EXTENSIONS)))
$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(PREF) -o $(_PLATFORM) -v
endif
$(NSINSTALL) -t $(DIST)/bin/$(APP_NAME)$(BIN_SUFFIX) $(DIST)/$(APP_NAME)/
ifeq ($(OS_ARCH),WINNT)
cp $(MOZILLA_DIR)/mail/config/installed-chrome-win.txt $(DIST)/$(APP_NAME)/chrome/installed-chrome.txt
else
cp $(MOZILLA_DIR)/mail/config/installed-chrome-unix.txt $(DIST)/$(APP_NAME)/chrome/installed-chrome.txt
endif
$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) installed-chrome.txt > $(DIST)/$(APP_NAME)/chrome/installed-chrome.txt
libs::
$(MAKE) mail_chrome

Просмотреть файл

@ -1,55 +0,0 @@
content,install,url,jar:resource:/chrome/mail.jar!/content/necko/
content,install,url,jar:resource:/chrome/mail.jar!/content/mozapps/
content,install,url,jar:resource:/chrome/mail.jar!/content/xbl-marquee/
content,install,url,jar:resource:/chrome/mail.jar!/content/editor/
content,install,url,jar:resource:/chrome/mail.jar!/content/editor-region/
content,install,url,jar:resource:/chrome/mail.jar!/content/help/
content,install,url,jar:resource:/chrome/mail.jar!/content/mozldap/
content,install,url,jar:resource:/chrome/mail.jar!/content/navigator/
content,install,url,jar:resource:/chrome/mail.jar!/content/navigator-region/
content,install,url,jar:resource:/chrome/mail.jar!/content/navigator-platform/
content,install,url,jar:resource:/chrome/mail.jar!/content/communicator-platform/
content,install,url,jar:resource:/chrome/mail.jar!/content/communicator-region/
content,install,url,jar:resource:/chrome/mail.jar!/content/communicator/downloadmanager/
content,install,url,jar:resource:/chrome/mail.jar!/content/global/
content,install,url,jar:resource:/chrome/mail.jar!/content/global-platform/
content,install,url,jar:resource:/chrome/mail.jar!/content/global-region/
content,install,url,jar:resource:/chrome/mail.jar!/content/wallet/
content,install,url,jar:resource:/chrome/mail.jar!/content/communicator/
content,install,url,jar:resource:/chrome/mail.jar!/content/pipnss/
content,install,url,jar:resource:/chrome/mail.jar!/content/pippki/
content,install,url,jar:resource:/chrome/mail.jar!/content/autoconfig/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-mdn/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-views/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-smime/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-mapi/
content,install,url,jar:resource:/chrome/mail.jar!/content/messenger-region/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/global/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/communicator/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/editor/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/messenger/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/navigator/
skin,install,url,jar:resource:/chrome/qute.jar!/skin/classic/mozapps/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/wallet/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/pipnss/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/pippki/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/autoconfig/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-mdn/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-views/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/messenger-smime/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/US/messenger-region/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/necko/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/editor/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/mozldap/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/mozapps/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/navigator/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/communicator/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/global/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/US/global-region/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/global-platform/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/messenger-mapi/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/communicator-platform/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/navigator-platform/
skin,install,select,classic/1.0

Просмотреть файл

@ -48,8 +48,15 @@ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/navigator/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/communicator/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/en-US/global/
locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/US/global-region/
#ifdef XP_WIN
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/global-platform/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/messenger-mapi/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/communicator-platform/
locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/navigator-platform/
#else
locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/global-platform/
locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/messenger-mapi/
locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/communicator-platform/
locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/navigator-platform/
#endif
skin,install,select,classic/1.0