From df3ce171e834c4fa6ec9c3e98bd8f50959753418 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Mon, 30 Nov 2015 21:39:02 +0100 Subject: [PATCH 1/2] make sure all files are updates with new version --- tools/build/build_asf.sh | 5 +++++ tools/build/setnextversion.sh | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh index 424b7887b60..3847c25d429 100755 --- a/tools/build/build_asf.sh +++ b/tools/build/build_asf.sh @@ -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 diff --git a/tools/build/setnextversion.sh b/tools/build/setnextversion.sh index a41676db6db..f6eb04aa763 100755 --- a/tools/build/setnextversion.sh +++ b/tools/build/setnextversion.sh @@ -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' From 7d7420fd1e5908e1bc4ee04a314241212f7a6481 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Mon, 30 Nov 2015 22:01:11 +0100 Subject: [PATCH 2/2] Use version for RC branch name instead of branch 4.6.1-RC20151130T2142 versus 4.6-RC20151130T2142 --- tools/build/build_asf.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh index 3847c25d429..9378b85be71 100755 --- a/tools/build/build_asf.sh +++ b/tools/build/build_asf.sh @@ -127,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