bug 1385227, generate full update from l10n-stage directly, r=rail

For regular builds, we build the mar from an unpackaged exe on windows.
For repacks, we just built that from our l10n-stage directory,
don't unpack again.

MozReview-Commit-ID: 8gQ9G23RgzB

--HG--
extra : rebase_source : b3eb944a0cf423a4b0e22d8884fc90780a3bb109
extra : source : 84091f931dff9e1253b0cfa96b4197255a94ddb2

tools/update-packaging/Makefile.in

@@ -28,9 +28,6 @@ full-update:: complete-patch
 ifeq ($(OS_TARGET), WINNT)
 MOZ_PKG_FORMAT	:= SFX7Z
 UNPACKAGE	= '$(subst $(DIST),$(ABS_DIST),$(INSTALLER_PACKAGE))'
-ifdef AB_CD
-UNPACKAGE	= '$(PACKAGE_BASE_DIR)/$(PACKAGE)'
-endif
 endif
 
 include $(topsrcdir)/config/rules.mk
@@ -52,10 +49,13 @@ endif
 dir-stage := $(call mkdir_deps,$(STAGE_DIR))
 
 complete-patch:: $(dir-stage)
+# unpack the windows installer, unless we're an l10n repack, we just packed this
+ifndef IS_LANGUAGE_REPACK
 ifeq ($(OS_TARGET), WINNT)
 	test -f $(UNPACKAGE)
 	$(RM) -rf '$(PACKAGE_DIR)'
 	cd $(PACKAGE_BASE_DIR) && $(INNER_UNMAKE_PACKAGE)
+endif
 endif
 	MAR=$(MAR_BIN) \
 	MOZ_PRODUCT_VERSION=$(MOZ_APP_VERSION) \