diff --git a/build_appimage.sh b/build_appimage.sh index 5ef097a..2c3fb2f 100644 --- a/build_appimage.sh +++ b/build_appimage.sh @@ -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 diff --git a/build_release_linux.sh b/build_release_linux.sh index 4dc8533..2cd5f7f 100755 --- a/build_release_linux.sh +++ b/build_release_linux.sh @@ -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 diff --git a/build_release_windows.bat b/build_release_windows.bat index 0f1aaaf..9d5bb4a 100755 --- a/build_release_windows.bat +++ b/build_release_windows.bat @@ -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= version - git add version + echo "$V" > flightgear-version + git add flightgear-version echo "new version: $V" | git commit --file=- # git tag "version/$V" } diff --git a/release_builder/set-version.sh b/release_builder/set-version.sh index 09c94fe..7064ca7 100755 --- a/release_builder/set-version.sh +++ b/release_builder/set-version.sh @@ -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" }