Bug 419503 - Dirty working tree: about.mappings

Removing 'UPDATE_BRANDING' as a variable since we've removed that
profile. Was causing a "warning" in log. 

5 files changed, 4 insertions, 10 deletions

diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 43c5b328d..0a08084b6 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -465,17 +465,16 @@ fn-basebuilder-dir ()
 }
 
 
-# USAGE: fn-maven-build-aggregator BUILD_ID REPO_DIR LOCAL_REPO DEBUG QUIET SIGNING UPDATE_BRANDING MAVEN_BREE
+# USAGE: fn-maven-build-aggregator BUILD_ID REPO_DIR LOCAL_REPO DEBUG QUIET SIGNING MAVEN_BREE
 #   BUILD_ID: I20121116-0700
 #   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
 #   LOCAL_REPO: /shared/eclipse/builds/R4_2_maintenance/localMavenRepo
 #   VERBOSE: true
 #   SIGNING: true
-#   UPDATE_BRANDING: true
 # TODO: depends on BUILD_TYPE being exported/global
 fn-maven-build-aggregator () 
 {
-    checkNArgs $# 8
+    checkNArgs $# 7
     if [[ $? != 0 ]]; then return 1; fi
     BUILD_ID="$1"; shift
     REPO_DIR="$1"; shift
@@ -496,9 +495,7 @@ fn-maven-build-aggregator ()
     if $SIGNING; then
         MARGS="$MARGS -Peclipse-sign"
     fi
-    if $UPDATE_BRANDING; then
-        MARGS="$MARGS -Pupdate-branding-plugins"
-    fi
+
     MARGS="$MARGS ${MAVEN_BREE}"
 
     # Here we count on $BUILD_TYPE being exported. TODO: make parameter later? 
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index a9745388b..3bdd29059 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -52,7 +52,6 @@ COMMITTER_ID=e4Build
 # MVN_DEBUG=true means verbose; gives comparator info
 export MVN_DEBUG=${MVN_DEBUG:-true}
 export MVN_QUIET=${MVN_QUIET:-false}
-export UPDATE_BRANDING=true
 
 # Need bree-libs for production builds
 MAVEN_BREE=-Pbree-libs
diff --git a/production/master-build.sh b/production/master-build.sh
index 9672bb181..e3484ea69 100644
--- a/production/master-build.sh
+++ b/production/master-build.sh
@@ -166,7 +166,6 @@ fn-write-property COMMITTER_ID
 fn-write-property MVN_DEBUG
 fn-write-property MVN_QUIET
 fn-write-property SIGNING
-fn-write-property UPDATE_BRANDING
 fn-write-property REPO_AND_ACCESS
 fn-write-property MAVEN_BREE
 fn-write-property GIT_PUSH
diff --git a/production/run-maven-build.sh b/production/run-maven-build.sh
index fabc119e5..9a331bbc1 100644
--- a/production/run-maven-build.sh
+++ b/production/run-maven-build.sh
@@ -29,7 +29,7 @@ if [ -z "$BUILD_ID" ]; then
     BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
 fi
 
-fn-maven-build-aggregator "$BUILD_ID" "$aggDir" "$LOCAL_REPO" $MVN_DEBUG $MVN_QUIET $SIGNING $UPDATE_BRANDING $MAVEN_BREE
+fn-maven-build-aggregator "$BUILD_ID" "$aggDir" "$LOCAL_REPO" $MVN_DEBUG $MVN_QUIET $SIGNING $MAVEN_BREE
 exitCode=$?
 
 # first make sure exit code is well formed
diff --git a/production/sdk/relengUtils/re-master-build.sh b/production/sdk/relengUtils/re-master-build.sh
index 4056ab83e..74f9d0bfc 100755
--- a/production/sdk/relengUtils/re-master-build.sh
+++ b/production/sdk/relengUtils/re-master-build.sh
@@ -118,7 +118,6 @@ fn-write-property COMMITTER_ID
 fn-write-property MVN_DEBUG
 fn-write-property MVN_QUIET
 fn-write-property SIGNING
-fn-write-property UPDATE_BRANDING
 fn-write-property REPO_AND_ACCESS
 fn-write-property MAVEN_BREE
 fn-write-property GIT_PUSH