зеркало из https://github.com/mozilla/gecko-dev.git
bug 445191 - Add upload target for xulrunner, upload SDK if it exists, and add 'sdk', 'upload' targets to client.mk. r=ted
This commit is contained in:
Родитель
d94d60dcac
Коммит
0e788a0092
|
@ -256,7 +256,7 @@ endif
|
||||||
# loop through them.
|
# loop through them.
|
||||||
|
|
||||||
ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_BUILD_PROJECTS),,1))
|
ifeq (,$(MOZ_CURRENT_PROJECT)$(if $(MOZ_BUILD_PROJECTS),,1))
|
||||||
configure depend build install export libs clean realclean distclean alldep preflight postflight maybe_clobber_profiledbuild::
|
configure depend build install export libs clean realclean distclean alldep preflight postflight maybe_clobber_profiledbuild upload sdk::
|
||||||
set -e; \
|
set -e; \
|
||||||
for app in $(MOZ_BUILD_PROJECTS); do \
|
for app in $(MOZ_BUILD_PROJECTS); do \
|
||||||
$(MAKE) -f $(TOPSRCDIR)/client.mk $@ MOZ_CURRENT_PROJECT=$$app; \
|
$(MAKE) -f $(TOPSRCDIR)/client.mk $@ MOZ_CURRENT_PROJECT=$$app; \
|
||||||
|
@ -359,7 +359,7 @@ build:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
|
||||||
# Other targets
|
# Other targets
|
||||||
|
|
||||||
# Pass these target onto the real build system
|
# Pass these target onto the real build system
|
||||||
install export libs clean realclean distclean alldep maybe_clobber_profiledbuild:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
|
install export libs clean realclean distclean alldep maybe_clobber_profiledbuild upload sdk:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
|
||||||
$(MOZ_MAKE) $@
|
$(MOZ_MAKE) $@
|
||||||
|
|
||||||
####################################
|
####################################
|
||||||
|
|
|
@ -512,6 +512,7 @@ upload:
|
||||||
$(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR)) \
|
$(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR)) \
|
||||||
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)) \
|
$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)) \
|
||||||
$(call QUOTED_WILDCARD,$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip) \
|
$(call QUOTED_WILDCARD,$(DIST)/$(SYMBOL_ARCHIVE_BASENAME).zip) \
|
||||||
|
$(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \
|
||||||
$(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
|
$(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f))))
|
||||||
|
|
||||||
ifndef MOZ_PKG_SRCDIR
|
ifndef MOZ_PKG_SRCDIR
|
||||||
|
|
|
@ -90,6 +90,9 @@ sdk:
|
||||||
distclean::
|
distclean::
|
||||||
@$(MAKE) -C xulrunner/installer distclean
|
@$(MAKE) -C xulrunner/installer distclean
|
||||||
|
|
||||||
|
upload::
|
||||||
|
@$(MAKE) -C xulrunner/installer upload
|
||||||
|
|
||||||
ifeq ($(OS_TARGET),Linux)
|
ifeq ($(OS_TARGET),Linux)
|
||||||
deb: package
|
deb: package
|
||||||
@$(MAKE) -C xulrunner/installer deb
|
@$(MAKE) -C xulrunner/installer deb
|
||||||
|
|
Загрузка…
Ссылка в новой задаче