bug 445191 - Add upload target for xulrunner, upload SDK if it exists, and add 'sdk', 'upload' targets to client.mk. r=ted
authorChris AtLee <catlee@mozilla.com>
Tue, 31 Mar 2009 09:43:31 -0400
changeset 26762 a5556353ba2cc53df231b28ae05c6bc6dc6a878c
parent 26761 8b4409c3a9f84134bba82dcbeec5b4e1a655323c
child 26763 6be868e5714cdcf387c9316d204b8c208d720ea5
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs445191
milestone1.9.2a1pre
bug 445191 - Add upload target for xulrunner, upload SDK if it exists, and add 'sdk', 'upload' targets to client.mk. r=ted
client.mk
toolkit/mozapps/installer/packager.mk
xulrunner/build.mk
--- a/client.mk
+++ b/client.mk
@@ -251,17 +251,17 @@ else
 	done
 endif
 endif
 
 # If we're building multiple projects, but haven't specified which project,
 # loop through them.
 
 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; \
 	for app in $(MOZ_BUILD_PROJECTS); do \
 	  $(MAKE) -f $(TOPSRCDIR)/client.mk $@ MOZ_CURRENT_PROJECT=$$app; \
 	done
 
 else
 
 # MOZ_CURRENT_PROJECT: either doing a single-project build, or building an
@@ -354,17 +354,17 @@ endif
 
 build::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
 	$(MOZ_MAKE)
 
 ####################################
 # Other targets
 
 # 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) $@
 
 ####################################
 # Postflight
 
 build alldep postflight::
 ifdef MOZ_POSTFLIGHT
 	set -e; \
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -507,16 +507,17 @@ QUOTED_WILDCARD = $(if $(wildcard $(subs
 
 upload:
 	$(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) \
 		$(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE)) \
 		$(call QUOTED_WILDCARD,$(INSTALLER_PACKAGE)) \
 		$(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR)) \
 		$(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)) \
 		$(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))))
 
 ifndef MOZ_PKG_SRCDIR
 MOZ_PKG_SRCDIR = $(topsrcdir)
 endif
 
 CREATE_SOURCE_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \
   --mode="go-w" --exclude=".hg*" --exclude="CVS" --exclude=".cvs*" -f
--- a/xulrunner/build.mk
+++ b/xulrunner/build.mk
@@ -85,12 +85,15 @@ install:
 	@$(MAKE) -C xulrunner/installer install
 
 sdk:
 	@$(MAKE) -C xulrunner/installer make-sdk
 
 distclean::
 	@$(MAKE) -C xulrunner/installer distclean
 
+upload::
+	@$(MAKE) -C xulrunner/installer upload
+
 ifeq ($(OS_TARGET),Linux)
 deb: package
 	@$(MAKE) -C xulrunner/installer deb
 endif