Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update build branches script

Browse source
This commit is contained in:
Victor Shcherb 2011-04-20 01:35:04 +02:00
parent f7d6327d5d
commit 061db5339b
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build-scripts/build_branches.sh
View file

@ -25,14 +25,13 @@ do
git diff --exit-code "$BRANCH" "$GIT_ORIGIN_NAME/$BRANCH" --quiet
RES_DIFF=$?
if [ $RES_DIFF != 0 ]; then
echo "Checkouting branch and create build for $BRANCH"
## reset all previous changes in working tree
git checkout .
git reset HEAD --hard
git checkout $BRANCH
git merge $GIT_ORIGIN_NAME/$BRANCH
sed -e "s/\(APP_DESCRIPTION.*=.*\"\).*\(\".*\)/\1$SHORT_DATE $BRANCH\2/g" $VERSION_FILE > ${VERSION_FILE}.bak
echo "Checkouting branch and create build for $BRANCH"
## reset all previous changes in working tree
git checkout .
git reset HEAD --hard
git checkout $BRANCH
git reset $GIT_ORIGIN_NAME/$BRANCH --hard
sed -e "s/\(APP_DESCRIPTION.*=.*\"\).*\(\".*\)/\1$SHORT_DATE $BRANCH\2/g" $VERSION_FILE > ${VERSION_FILE}.bak
mv ${VERSION_FILE}.bak ${VERSION_FILE}
## build map creator