Compare commits

...

6 Commits

Author SHA1 Message Date
Automatic Release Builder
328fcda3f2 Update submodules for 2020.3.1 2020-10-26 09:30:48 +00:00
Automatic Release Builder
0fa6277203 Make set-version.sh handle new naming
Now we renamed simgear-version and flightgear-version, this
script needed to get smarter.
2020-10-26 09:29:23 +00:00
Automatic Release Builder
06be626360 new version: 2020.3.1 2020-10-26 09:10:09 +00:00
Automatic Release Builder
18cc06fa95 Update submodules spec 2020-10-14 11:31:11 +01:00
Automatic Release Builder
31c79982bf Set submodule versions 2020-10-13 22:44:53 +01:00
Automatic Release Builder
333dbb4aef Update version information 2020-10-13 22:43:35 +01:00
7 changed files with 27 additions and 14 deletions

10
.gitmodules vendored
View File

@@ -1,11 +1,11 @@
[submodule "simgear"]
path = simgear
url = ../simgear
branch = release/2020.2
branch = release/2020.3
[submodule "flightgear"]
path = flightgear
url = ../flightgear
branch = release/2020.2
branch = release/2020.3
[submodule "fgrun"]
path = fgrun
url = ../fgrun
@@ -13,12 +13,12 @@
[submodule "fgdata"]
path = fgdata
url = ../fgdata
branch = release/2020.2
branch = release/2020.3
[submodule "windows-3rd-party"]
path = windows-3rd-party
url = ../windows-3rd-party
branch = release/2020.2
branch = release/2020.3
[submodule "getstart"]
path = getstart
url = ../getstart
branch = release/2020.2
branch = release/2020.3

2
fgdata

Submodule fgdata updated: 97afe3a0aa...ae1a2b153f

View File

@@ -33,9 +33,9 @@ MICRO_VERSION=${VERSION_A[2]}
setVersionTo() {
local V="$1"
echo "setting version to $V"
echo "$V" > flightgear-version
git add flightgear-version
echo "setting version to $V in $2"
echo "$V" > $2
git add $2
echo "new version: $V" | git commit --file=-
git tag "version/$V"
}
@@ -43,9 +43,22 @@ setVersionTo() {
while [ $# -gt 0 ]; do
echo "Processing $1"
pushd $1 > /dev/null
case $1 in
flightgear)
versionFileName="flightgear-version"
;;
simgear)
versionFileName="simgear-version"
;;
*)
versionFileName="version"
;;
esac
git config user.name "Automatic Release Builder"
git config user.email "build@flightgear.org"
setVersionTo "${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}"
setVersionTo "${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}" $versionFileName
popd > /dev/null
shift
done

Submodule simgear updated: bd9f04d980...78d073a0f0

View File

@@ -1 +1 @@
2020.2.1
2020.3.1