From d46ebab2fd6db0cf700c26135e0ab158e0893f0d Mon Sep 17 00:00:00 2001 From: Thomas Berezansky Date: Sat, 21 May 2011 10:06:46 -0400 Subject: [PATCH] 4 piece version, replace fix Support rel_#_#_#_text branch version Reverse order of two replaces for sanity reasons Signed-off-by: Thomas Berezansky --- build/tools/apply_version.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/tools/apply_version.sh b/build/tools/apply_version.sh index 74dd075498..df766f8bde 100755 --- a/build/tools/apply_version.sh +++ b/build/tools/apply_version.sh @@ -10,7 +10,8 @@ VERSION=${1:-AUTO} if [ $VERSION = "AUTO" ]; then # Auto-pick version based on branch name echo AUTO VERSION - VERSION=`echo $GIT_BRANCH | sed 's/^rel_\([0-9]\+\)_\([0-9]\+\)_\([0-9]\+\)$/\1.\2.\3/'` + VERSION=`echo $GIT_BRANCH | sed 's/^rel_\([0-9]\+\)_\([0-9]\+\)_\([0-9]\+\)_\(.\+\)$/\1.\2.\3-\4/'` + VERSION=`echo $VERSION | sed 's/^rel_\([0-9]\+\)_\([0-9]\+\)_\([0-9]\+\)$/\1.\2.\3/'` VERSION=`echo $VERSION | sed 's/^rel_\([0-9]\+\)_\([0-9]\+\)_\(.\+\)$/\1.\2-\3/'` if [ "$VERSION" = "$GIT_BRANCH" ]; then echo "AUTO VERSION FAILED." @@ -27,7 +28,7 @@ UNDER_VERSION=`echo $VERSION | sed -e 's/\./_/g' -e 's/-/_/g'` echo "Applying to Application.pm - HEAD -> $DASH_VERSION" echo "Alt: $SHORT_DASH_VERSION -> $DASH_VERSION" -sed -i -e "s/HEAD/$DASH_VERSION/" -e "s/$SHORT_DASH_VERSION/$DASH_VERSION/" $GIT_ABS/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +sed -i -e "s/$SHORT_DASH_VERSION/$DASH_VERSION/" -e "s/HEAD/$DASH_VERSION/" $GIT_ABS/Open-ILS/src/perlmods/lib/OpenILS/Application.pm echo "Applying to windowssetup.nsi - Master -> $SHORT_VERSION" sed -i "s/Master/$SHORT_VERSION/" $GIT_ABS/Open-ILS/xul/staff_client/windowssetup.nsi -- 2.11.0