Bug 978211 - various asan/mar/pretty/mach fixes; r=glandium
authorMike Shal <mshal@mozilla.com>
Thu, 03 Jul 2014 22:14:59 -0400
changeset 195342 1e4bf244a89c037e5d585889a58844fc112f5ab7
parent 195341 fa90c963385bdf795d1f027f1cbbaf5893dd4aab
child 195343 ade872c15c024a3266722c096d40e52ed70d202e
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersglandium
bugs978211
milestone33.0a1
Bug 978211 - various asan/mar/pretty/mach fixes; r=glandium - Linux ASAN nightly builds do not do update packaging - Only set mar properties if the mar file was actually created - Unset MOZ_SIGN_CMD for pretty-* steps
Makefile.in
build/gen_mach_buildprops.py
build/unix/mozconfig.asan
--- a/Makefile.in
+++ b/Makefile.in
@@ -251,33 +251,33 @@ export MOZ_SOURCE_STAMP
 endif
 
 .PHONY: update-packaging
 update-packaging:
 	$(MAKE) -C tools/update-packaging
 
 .PHONY: pretty-package
 pretty-package:
-	$(MAKE) package MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) package MOZ_PKG_PRETTYNAMES=1
 
 .PHONY: pretty-package-tests
 pretty-package-tests:
-	$(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) package-tests MOZ_PKG_PRETTYNAMES=1
 
 .PHONY: pretty-l10n-check
 pretty-l10n-check:
-	$(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) l10n-check MOZ_PKG_PRETTYNAMES=1
 
 .PHONY: pretty-update-packaging
 pretty-update-packaging:
-	$(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) -C tools/update-packaging MOZ_PKG_PRETTYNAMES=1
 
 .PHONY: pretty-installer
 pretty-installer:
-	$(MAKE) installer MOZ_PKG_PRETTYNAMES=1
+	unset MOZ_SIGN_CMD && $(MAKE) installer MOZ_PKG_PRETTYNAMES=1
 
 #XXX: this is a hack, since we don't want to clobber for MSVC
 # PGO support, but we can't do this test in client.mk
 ifneq ($(OS_ARCH)_$(GNU_CC), WINNT_)
 # No point in clobbering if PGO has been explicitly disabled.
 ifndef NO_PROFILE_GUIDED_OPTIMIZE
 maybe_clobber_profiledbuild: clean
 else
--- a/build/gen_mach_buildprops.py
+++ b/build/gen_mach_buildprops.py
@@ -25,16 +25,18 @@ def getFileHashAndSize(filename):
 
         size = os.path.getsize(filename)
     except:
         pass
 
     return (sha1Hash, size)
 
 def getMarProperties(filename):
+    if not os.path.exists(filename):
+        return {}
     (complete_mar_hash, complete_mar_size) = getFileHashAndSize(filename)
     return {
         'completeMarFilename': os.path.basename(filename),
         'completeMarSize': complete_mar_size,
         'completeMarHash': complete_mar_hash,
     }
 
 def getUrlProperties(filename):
--- a/build/unix/mozconfig.asan
+++ b/build/unix/mozconfig.asan
@@ -1,11 +1,8 @@
-if [ "x$IS_NIGHTLY" = "xyes" ]; then
-  MOZ_AUTOMATION_UPDATE_PACKAGING=1
-fi
 MOZ_AUTOMATION_TALOS_SENDCHANGE=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/build/mozconfig.common"
 
 # Use Clang as specified in manifest
 export CC="$topsrcdir/clang/bin/clang -fgnu89-inline"
 export CXX="$topsrcdir/clang/bin/clang++"