diff --git a/release_builder/create-release-branch-for.sh b/release_builder/create-release-branch-for.sh index e0e3dd2..658b2f5 100755 --- a/release_builder/create-release-branch-for.sh +++ b/release_builder/create-release-branch-for.sh @@ -45,7 +45,7 @@ setVersionTo() { echo "$V" > version git add version echo "new version: $V" | git commit --file=- - git tag "version/$V" +# git tag "version/$V" } createBranch() { diff --git a/release_builder/create-release-branch.sh b/release_builder/create-release-branch.sh index caa6288..914ab4a 100755 --- a/release_builder/create-release-branch.sh +++ b/release_builder/create-release-branch.sh @@ -1,7 +1,7 @@ #!/bin/bash -THIS_RELEASE="2018.2" -NEXT_RELEASE="2018.3" +THIS_RELEASE="2018.3" +NEXT_RELEASE="2018.4" SUBMODULES="simgear flightgear fgdata getstart" #:<< 'COMMENT_END' @@ -28,7 +28,7 @@ read something for f in $SUBMODULES .; do pushd "$f" echo "Pushing $f" - git checkout release/${THIS_RELEASE} && git push origin release/${THIS_RELEASE} && git push origin version/${THIS_RELEASE}.1 && git push origin version/${NEXT_RELEASE}.0 && git checkout next && git push + git checkout release/${THIS_RELEASE} && git push origin release/${THIS_RELEASE} && git checkout next && git push popd done diff --git a/release_builder/create_changelog.sh b/release_builder/create_changelog.sh new file mode 100755 index 0000000..72e25e0 --- /dev/null +++ b/release_builder/create_changelog.sh @@ -0,0 +1,17 @@ +#!/bin/bash +cat << EOF +Changelog for FlightGear from $1 to $2 +========================== +EOF +for submodule in simgear flightgear fgdata; do +cat << EOF + +$submodule +-------------------------- +EOF + pushd $submodule > /dev/null 2>&1 + git log --pretty=format:%s version/${1}..version/${2} |while read f; do + echo "* $f"; + done + popd +done diff --git a/release_builder/set-version.sh b/release_builder/set-version.sh new file mode 100755 index 0000000..09c94fe --- /dev/null +++ b/release_builder/set-version.sh @@ -0,0 +1,51 @@ +#!/bin/bash +#This file is part of FlightGear +# +#FlightGear is free software: you can redistribute it and/or modify +#it under the terms of the GNU General Public License as published by +#the Free Software Foundation, either version 2 of the License, or +#(at your option) any later version. +# +#FlightGear is distributed in the hope that it will be useful, +#but WITHOUT ANY WARRANTY; without even the implied warranty of +#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +#GNU General Public License for more details. +# +#You should have received a copy of the GNU General Public License +#along with FlightGear If not, see . + +if [ -z "$1" -o -z "$2" ]; then + echo "usage: major.minor.micro path" + exit +fi + + +IFS='.' read -r -a VERSION_A <<< "$1" +shift +if [ ${#VERSION_A[@]} != 3 ]; then + echo "Need version as 'number.number.number'" + exit +fi +MAJOR_VERSION=${VERSION_A[0]} +MINOR_VERSION=${VERSION_A[1]} +MICRO_VERSION=${VERSION_A[2]} + + +setVersionTo() { + local V="$1" + echo "setting version to $V" + echo "$V" > version + git add version + echo "new version: $V" | git commit --file=- + git tag "version/$V" +} + +while [ $# -gt 0 ]; do + echo "Processing $1" + pushd $1 > /dev/null + git config user.name "Automatic Release Builder" + git config user.email "build@flightgear.org" + setVersionTo "${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}" + popd > /dev/null + shift +done