зеркало из https://github.com/mozilla/gecko-dev.git
Replace chrome:: target with install::. Using chrome:: was causing |make -j3 install| builds to fail to execute the chrome:: target due to a suspected bug in gnu make. (|make MAKE='make -j3' install| works fine.)
This commit is contained in:
Родитель
faf2600ea4
Коммит
74757e3db2
|
@ -1218,12 +1218,10 @@ else
|
|||
_JAR_REGCHROME_DISABLE_JAR=0
|
||||
endif
|
||||
|
||||
chrome:: $(CHROME_DEPS)
|
||||
install:: $(CHROME_DEPS)
|
||||
@if test -f $(JAR_MANIFEST); then $(PERL) $(MOZILLA_DIR)/config/make-jars.pl -f $(MOZ_CHROME_FILE_FORMAT) -d $(DIST)/bin/chrome -s $(srcdir) < $(JAR_MANIFEST); fi
|
||||
|
||||
install:: chrome
|
||||
|
||||
REGCHROME = $(PERL) $(MOZILLA_DIR)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt $(_JAR_REGCHROME_DISABLE_JAR)
|
||||
REGCHROME = $(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt $(_JAR_REGCHROME_DISABLE_JAR)
|
||||
|
||||
##############################################################################
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ DIRS = txmgr public idl base txtsvc
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content editor comm.jar
|
||||
@$(REGCHROME) content editor-region comm.jar
|
||||
@$(REGCHROME) locale en-US/editor en-US.jar
|
||||
|
|
|
@ -37,7 +37,7 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content editor comm.jar
|
||||
@$(REGCHROME) content editor-region comm.jar
|
||||
@$(REGCHROME) locale en-US/editor en-US.jar
|
||||
|
|
|
@ -27,7 +27,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content embed embed.jar
|
||||
@$(REGCHROME) skin modern/embed embed.jar
|
||||
@$(REGCHROME) locale en-US/embed embed.jar
|
||||
|
|
|
@ -74,6 +74,6 @@ EXTRA_DSO_LDOPTS = \
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content cookie comm.jar
|
||||
@$(REGCHROME) locale en-US/cookie en-US.jar
|
||||
|
|
|
@ -30,7 +30,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content cview cview.jar
|
||||
@$(REGCHROME) skin modern/cview cview.jar
|
||||
@$(REGCHROME) locale en-US/cview cview.jar
|
||||
|
|
|
@ -28,6 +28,6 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
$(REGCHROME) content help help.jar
|
||||
$(REGCHROME) locale en-US/help help.jar
|
||||
|
|
|
@ -30,7 +30,7 @@ DIRS=content skin locale
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
$(REGCHROME) content inspector inspector.jar
|
||||
$(REGCHROME) locale en-US/inspector inspector.jar
|
||||
$(REGCHROME) skin modern/inspector inspector.jar
|
||||
|
|
|
@ -39,7 +39,7 @@ include $(topsrcdir)/config/rules.mk
|
|||
install::
|
||||
$(INSTALL) $(srcdir)/js/lib/chatzilla-service.js $(DIST)/bin/components
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content chatzilla chatzilla.jar
|
||||
@$(REGCHROME) skin modern/chatzilla chatzilla.jar
|
||||
@$(REGCHROME) locale en-US/chatzilla chatzilla.jar
|
||||
|
|
|
@ -40,7 +40,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content venkman venkman.jar
|
||||
@$(REGCHROME) skin modern/venkman venkman.jar
|
||||
@$(REGCHROME) locale en-US/venkman venkman.jar
|
||||
|
|
|
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
$(REGCHROME) content vixen vixen.jar
|
||||
$(REGCHROME) skin modern/vixen vixen.jar
|
||||
$(REGCHROME) locale en-US/vixen vixen.jar
|
||||
|
|
|
@ -30,6 +30,6 @@ DIRS = public src editor signonviewer walletpreview build
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content wallet comm.jar
|
||||
@$(REGCHROME) locale en-US/wallet en-US.jar
|
||||
|
|
|
@ -45,7 +45,7 @@ include $(srcdir)/../config/xmlterm_config.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content xmlterm xmlterm.jar
|
||||
@$(REGCHROME) locale en-US/xmlterm xmlterm.jar
|
||||
@$(REGCHROME) skin modern/xmlterm xmlterm.jar
|
||||
|
|
|
@ -30,7 +30,7 @@ DIRS = public base db news local mime compose imap addrbook import absync
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content messenger messenger.jar
|
||||
@$(REGCHROME) content messenger-region messenger.jar
|
||||
@$(REGCHROME) locale en-US/messenger en-US.jar
|
||||
|
|
|
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content necko comm.jar
|
||||
@$(REGCHROME) locale en-US/necko en-US.jar
|
||||
|
||||
|
|
|
@ -28,6 +28,6 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
$(REGCHROME) content pippki pippki.jar
|
||||
$(REGCHROME) locale en-US/pippki pippki.jar
|
||||
|
|
|
@ -28,6 +28,6 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
$(REGCHROME) content pipnss pipnss.jar
|
||||
$(REGCHROME) locale en-US/pipnss pipnss.jar
|
||||
|
|
|
@ -40,7 +40,7 @@ DIRS = communicator/bookmarks/win \
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) skin classic/communicator classic.jar
|
||||
@$(REGCHROME) skin classic/editor classic.jar
|
||||
@$(REGCHROME) skin classic/global classic.jar
|
||||
|
|
|
@ -27,7 +27,7 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) skin modern/communicator modern.jar
|
||||
@$(REGCHROME) skin modern/editor modern.jar
|
||||
@$(REGCHROME) skin modern/global modern.jar
|
||||
|
|
|
@ -30,7 +30,7 @@ DIRS = public src samples resources
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content navigator comm.jar
|
||||
@$(REGCHROME) content navigator-region comm.jar
|
||||
@$(REGCHROME) content navigator-platform comm.jar
|
||||
|
|
|
@ -30,7 +30,7 @@ DIRS = resources
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content communicator comm.jar
|
||||
@$(REGCHROME) content communicator-region comm.jar
|
||||
@$(REGCHROME) content communicator-platform comm.jar
|
||||
|
|
|
@ -34,6 +34,6 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content communicator comm.jar
|
||||
@$(REGCHROME) locale en-US/communicator en-US.jar
|
||||
|
|
|
@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content communicator comm.jar
|
||||
@$(REGCHROME) locale en-US/communicator en-US.jar
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ build.dtd: build.dtd.in $(DEPTH)/config/build_number
|
|||
@$(RM) -f $@
|
||||
$(PERL) -I$(topsrcdir)/config $(topsrcdir)/config/aboutime.pl $@ $(DEPTH)/config/build_number $<
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content global toolkit.jar
|
||||
@$(REGCHROME) content global-region toolkit.jar
|
||||
@$(REGCHROME) content global-platform toolkit.jar
|
||||
|
|
|
@ -34,6 +34,6 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
chrome::
|
||||
install::
|
||||
@$(REGCHROME) content global toolkit.jar
|
||||
@$(REGCHROME) locale en-US/global en-US.jar
|
||||
|
|
Загрузка…
Ссылка в новой задаче