Merge pull request #1146 from remibergsma/build_script_fixes

make sure all files are updates with new versionDuring the previous release I had to edit these manually. This will fix that so all versions get updated.

* pr/1146:
  Use version for RC branch name instead of branch
  make sure all files are updates with new version

Signed-off-by: Remi Bergsma <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-11-30 22:23:49 +01:00
commit cb50eb8e17
2 changed files with 14 additions and 6 deletions

View File

@ -101,6 +101,11 @@ perl -pi -e "s/-SNAPSHOT//" build/replace.properties
perl -pi -e "s/-SNAPSHOT//" services/console-proxy/plugin/pom.xml
perl -pi -e "s/-SNAPSHOT//" tools/marvin/setup.py
perl -pi -e "s/-SNAPSHOT//" tools/marvin/marvin/deployAndRun.py
perl -pi -e "s/-SNAPSHOT//" debian/changelog
perl -pi -e "s/-SNAPSHOT//" services/iam/plugin/pom.xml
perl -pi -e "s/-SNAPSHOT//" services/iam/pom.xm
perl -pi -e "s/-SNAPSHOT//" services/iam/server/pom.xml
case "$currentversion" in
*-SNAPSHOT*)
perl -pi -e 's/-SNAPSHOT//' debian/rules
@ -122,12 +127,8 @@ mv $tmpfilenm debian/changelog
git clean -f
#create a RC branch
RELEASE_BRANCH="RC"`date +%Y%m%dT%H%M`
if [ "$branch" = "master" ]; then
BRANCHNAME=$version-$RELEASE_BRANCH
else
BRANCHNAME=$branch-$RELEASE_BRANCH
fi
RC_BRANCH_SUFFIX="RC"`date +%Y%m%dT%H%M`
BRANCHNAME=$version-$RC_BRANCH_SUFFIX
git branch $BRANCHNAME
git checkout $BRANCHNAME

View File

@ -66,6 +66,13 @@ mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P sim
mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml
perl -pi -e "s/$currentversion/$version/" deps/XenServerJava/pom.xml
perl -pi -e "s/$currentversion/$version/" tools/apidoc/pom.xml
perl -pi -e "s/$currentversion/$version/" debian/changelog
perl -pi -e "s/$currentversion/$version/" tools/marvin/setup.py
perl -pi -e "s/$currentversion/$version/" services/iam/plugin/pom.xml
perl -pi -e "s/$currentversion/$version/" services/iam/pom.xm
perl -pi -e "s/$currentversion/$version/" services/iam/server/pom.xml
perl -pi -e "s/$currentversion/$version/" tools/checkstyle/pom.xml
perl -pi -e "s/$currentversion/$version/" services/console-proxy/plugin/pom.xml
git clean -f
echo 'commit changes'