Rob,

 What we ended up doing was:

1) do a retag in our first bf step, before we call the adaptor to look for changes.

2) inside the apaptor we added a second command:

                    "<execute> $ANT_HOME${SWITCH}bin${SWITCH}ant -verbose -lib "$Build_Toolkit_Path" -f "$Build_Toolkit_Path${SWITCH}update_build_label.xml" -D"repositoryAddress"="$URI" -D"buildResultUUID"="$buildResultUuid" -D"userId"="$User_Name" -D"password"="$Password" -D"newBuildLabel"=BUILD_${Major}.${Minor}.${Point}.${B}</execute>
</command>"

Major,Minor.Point are properties defined in the rtc build definition, and are set by the development team.

3) We modified the old ant_helper.xml file, and created "update_build_label.xml" to contain the following:

       <buildResultPublisher
        buildResultUUID="${buildResultUUID}"
        repositoryAddress="${repositoryAddress}"
        userId="${userId}"
        password="${password}"
    label="${newBuildLabel}"
         verbose="true"
         failOnError="false"