diff options
| author | David Williams | 2013-10-26 03:50:49 +0000 |
|---|---|---|
| committer | David Williams | 2013-10-26 03:50:49 +0000 |
| commit | af387d995ebe761ce86459508a79ebf7af39d61d (patch) | |
| tree | ba3fcc627792bd52519a1d3400865acf84de7754 /production/build-functions.shsource | |
| parent | df4dd3283c67dec1136bba53df8b07cd88c68108 (diff) | |
| download | eclipse.platform.releng.aggregator-af387d995ebe761ce86459508a79ebf7af39d61d.tar.gz eclipse.platform.releng.aggregator-af387d995ebe761ce86459508a79ebf7af39d61d.tar.xz eclipse.platform.releng.aggregator-af387d995ebe761ce86459508a79ebf7af39d61d.zip | |
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.
Diffstat (limited to 'production/build-functions.shsource')
| -rwxr-xr-x | production/build-functions.shsource | 9 |
1 files changed, 3 insertions, 6 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? |