From d720715921912fac877488abdd93af255bd4b86a Mon Sep 17 00:00:00 2001
From: Rail Aliiev <rail@mozilla.com>
Date: Fri, 23 Oct 2015 22:59:54 -0400
Subject: [PATCH] Bug 1142231 - [build-promotion] Create SDK in each en-US
 build. r=nthomas

---
 browser/config/mozconfigs/linux32/beta             | 4 ++++
 browser/config/mozconfigs/linux32/release          | 5 +++++
 browser/config/mozconfigs/linux64/beta             | 4 ++++
 browser/config/mozconfigs/linux64/release          | 5 +++++
 browser/config/mozconfigs/macosx-universal/beta    | 5 +++++
 browser/config/mozconfigs/macosx-universal/release | 5 +++++
 browser/config/mozconfigs/whitelist                | 4 ++++
 browser/config/mozconfigs/win32/beta               | 5 +++++
 browser/config/mozconfigs/win32/release            | 5 +++++
 browser/config/mozconfigs/win64/beta               | 5 +++++
 browser/config/mozconfigs/win64/release            | 5 +++++
 build/compare-mozconfig/compare-mozconfigs.py      | 5 +++++
 12 files changed, 57 insertions(+)

diff --git a/browser/config/mozconfigs/linux32/beta b/browser/config/mozconfigs/linux32/beta
index 0583e0faf30..543b6f1d7e8 100644
--- a/browser/config/mozconfigs/linux32/beta
+++ b/browser/config/mozconfigs/linux32/beta
@@ -1,4 +1,8 @@
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
 
 . "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
 
diff --git a/browser/config/mozconfigs/linux32/release b/browser/config/mozconfigs/linux32/release
index 95ed134b402..41e8edbd974 100644
--- a/browser/config/mozconfigs/linux32/release
+++ b/browser/config/mozconfigs/linux32/release
@@ -2,6 +2,11 @@
 # safeguard below
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
 . "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
 
 ac_add_options --enable-official-branding
diff --git a/browser/config/mozconfigs/linux64/beta b/browser/config/mozconfigs/linux64/beta
index 3b0c563c2a6..24492992d6b 100644
--- a/browser/config/mozconfigs/linux64/beta
+++ b/browser/config/mozconfigs/linux64/beta
@@ -1,4 +1,8 @@
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
 
diff --git a/browser/config/mozconfigs/linux64/release b/browser/config/mozconfigs/linux64/release
index e564d667172..6c59868be84 100644
--- a/browser/config/mozconfigs/linux64/release
+++ b/browser/config/mozconfigs/linux64/release
@@ -2,6 +2,11 @@
 # safeguard below
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
 . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
 
 ac_add_options --enable-official-branding
diff --git a/browser/config/mozconfigs/macosx-universal/beta b/browser/config/mozconfigs/macosx-universal/beta
index db7e684797d..64e7ca84781 100644
--- a/browser/config/mozconfigs/macosx-universal/beta
+++ b/browser/config/mozconfigs/macosx-universal/beta
@@ -1,5 +1,10 @@
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
 . "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
 
 ac_add_options --enable-official-branding
diff --git a/browser/config/mozconfigs/macosx-universal/release b/browser/config/mozconfigs/macosx-universal/release
index a0cec5e2f02..8942f6229ee 100644
--- a/browser/config/mozconfigs/macosx-universal/release
+++ b/browser/config/mozconfigs/macosx-universal/release
@@ -2,6 +2,11 @@
 # safeguard below
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
 . "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
 
 ac_add_options --enable-official-branding
diff --git a/browser/config/mozconfigs/whitelist b/browser/config/mozconfigs/whitelist
index 6e6f4f985df..65b66b6f2cf 100644
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -73,6 +73,10 @@ for platform in all_platforms:
         'ac_add_options --enable-official-branding',
         'mk_add_options MOZ_MAKE_FLAGS="-j4"',
         'export BUILDING_RELEASE=1',
+        'if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then',
+        'MOZ_AUTOMATION_UPLOAD_SYMBOLS=1',
+        'MOZ_AUTOMATION_UPDATE_PACKAGING=1',
+        'fi',
         'MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}',
     ]
 whitelist['release']['win32'] += ['mk_add_options MOZ_PGO=1']
diff --git a/browser/config/mozconfigs/win32/beta b/browser/config/mozconfigs/win32/beta
index a7ce3db41f6..c83335fbd12 100644
--- a/browser/config/mozconfigs/win32/beta
+++ b/browser/config/mozconfigs/win32/beta
@@ -1,5 +1,10 @@
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
 
diff --git a/browser/config/mozconfigs/win32/release b/browser/config/mozconfigs/win32/release
index 79cbea75df9..ea1f242efbd 100644
--- a/browser/config/mozconfigs/win32/release
+++ b/browser/config/mozconfigs/win32/release
@@ -2,6 +2,11 @@
 # safeguard below
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
 
diff --git a/browser/config/mozconfigs/win64/beta b/browser/config/mozconfigs/win64/beta
index 29d02d82c4a..6b9960abc3c 100644
--- a/browser/config/mozconfigs/win64/beta
+++ b/browser/config/mozconfigs/win64/beta
@@ -1,5 +1,10 @@
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
diff --git a/browser/config/mozconfigs/win64/release b/browser/config/mozconfigs/win64/release
index 0b8e36b210a..389a1ea4b40 100644
--- a/browser/config/mozconfigs/win64/release
+++ b/browser/config/mozconfigs/win64/release
@@ -2,6 +2,11 @@
 # safeguard below
 MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 
+if [ -n "$ENABLE_RELEASE_PROMOTION" ]; then
+  MOZ_AUTOMATION_UPLOAD_SYMBOLS=1
+  MOZ_AUTOMATION_UPDATE_PACKAGING=1
+fi
+
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
diff --git a/build/compare-mozconfig/compare-mozconfigs.py b/build/compare-mozconfig/compare-mozconfigs.py
index 598c00ea262..876e336fe56 100644
--- a/build/compare-mozconfig/compare-mozconfigs.py
+++ b/build/compare-mozconfig/compare-mozconfigs.py
@@ -85,11 +85,16 @@ def verify_mozconfigs(mozconfig_pair, nightly_mozconfig_pair, platform,
             # compare to whitelist
             message = ""
             if line[0] == '-':
+                # handle lines that move around in diff
+                if '+' + line[1:] in diff_list:
+                    continue
                 if platform in mozconfigWhitelist.get('release', {}):
                     if clean_line in \
                             mozconfigWhitelist['release'][platform]:
                         continue
             elif line[0] == '+':
+                if '-' + line[1:] in diff_list:
+                    continue
                 if platform in mozconfigWhitelist.get('nightly', {}):
                     if clean_line in \
                             mozconfigWhitelist['nightly'][platform]: