Bug 730328 - Sign Thunderbird builds using auto-signing - port build config changes. r+a=Standard8
--- a/client.mk
+++ b/client.mk
@@ -221,17 +221,17 @@ everything: clean build
ifdef MOZ_OBJDIR
PGO_OBJDIR = $(MOZ_OBJDIR)
else
PGO_OBJDIR := $(TOPSRCDIR)
endif
profiledbuild::
$(MAKE) -f $(TOPSRCDIR)/client.mk build MOZ_PROFILE_GENERATE=1
- $(MAKE) -C $(PGO_OBJDIR) package
+ $(MAKE) -C $(PGO_OBJDIR) stage-package
OBJDIR=${PGO_OBJDIR} $(PROFILE_GEN_SCRIPT)
$(MAKE) -f $(TOPSRCDIR)/client.mk maybe_clobber_profiledbuild
$(MAKE) -f $(TOPSRCDIR)/client.mk build MOZ_PROFILE_USE=1
#####################################################
# Build date unification
ifdef MOZ_UNIFY_BDATE
--- a/mail/build.mk
+++ b/mail/build.mk
@@ -80,16 +80,19 @@ installer:
@$(MAKE) -C mail/installer installer
package:
@$(MAKE) -C mail/installer
package-compare:
@$(MAKE) -C mail/installer package-compare
+stage-package:
+ @$(MAKE) -C mail/installer stage-package
+
install::
@$(MAKE) -C mail/installer install
source-package::
@$(MAKE) -C mail/installer source-package
upload::
@$(MAKE) -C mail/installer upload
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -106,16 +106,17 @@ endif
NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
ifndef LIBXUL_SDK
INSTALL_SDK = 1
endif
GENERATE_CACHE=1
+include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/signing.mk
include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
ifeq (Darwin, $(OS_ARCH))
BINPATH = $(_BINPATH)
DEFINES += -DAPPNAME=$(_APPNAME)
else
BINPATH = bin
endif