Cope with renamed version => flightgear-version file.

This commit is contained in:
Julian Smith 2020-07-03 09:27:07 +01:00
parent cf95fc3530
commit 754b347d7c
6 changed files with 8 additions and 8 deletions

View File

@ -70,6 +70,6 @@ wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/
chmod +x linuxdeployqt-continuous-x86_64.AppImage
#set VERSION for AppImage creation
export VERSION=`cat flightgear/version`
export VERSION=`cat flightgear/flightgear-version`
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/org.flightgear.FlightGear.desktop -appimage

View File

@ -5,7 +5,7 @@ if [ "$WORKSPACE" == "" ]; then
exit 1
fi
VERSION=`cat flightgear/version`
VERSION=`cat flightgear/flightgear-version`
#####################################################################################
# ensure fgrcc can run when linked against libSimGearCore, for example

View File

@ -129,7 +129,7 @@ osgversion --so-number > %TEMP%\osg-so-number.txt
osgversion --version-number > %TEMP%\osg-version.txt
osgversion --openthreads-soversion-number > %TEMP%\openthreads-so-number.txt
SET /P FLIGHTGEAR_VERSION=<flightgear\version
SET /P FLIGHTGEAR_VERSION=<flightgear\flightgear-version
SET /P OSG_VERSION=<%TEMP%\osg-version.txt
SET /P OSG_SO_NUMBER=<%TEMP%\osg-so-number.txt
SET /P OT_SO_NUMBER=<%TEMP%\openthreads-so-number.txt

View File

@ -70,7 +70,7 @@ t = Time.new
fgCurrentYear = t.year
fgBundleIdentifier = "org.flightgear.mac"
fgVersion = File.read("#{srcDir}/version").strip
fgVersion = File.read("#{srcDir}/flightgear-version").strip
volName="\"FlightGear #{fgVersion}\""
if $isRelease

View File

@ -42,8 +42,8 @@ NEXT_MINOR_VERSION=${VERSION_A[1]}
setVersionTo() {
local V="$1"
echo "setting version to $V"
echo "$V" > version
git add version
echo "$V" > flightgear-version
git add flightgear-version
echo "new version: $V" | git commit --file=-
# git tag "version/$V"
}

View File

@ -34,8 +34,8 @@ MICRO_VERSION=${VERSION_A[2]}
setVersionTo() {
local V="$1"
echo "setting version to $V"
echo "$V" > version
git add version
echo "$V" > flightgear-version
git add flightgear-version
echo "new version: $V" | git commit --file=-
git tag "version/$V"
}