From 754b347d7c31ec88d1a06419af3d944c8beb5495 Mon Sep 17 00:00:00 2001
From: Julian Smith <jules@op59.net>
Date: Fri, 3 Jul 2020 09:27:07 +0100
Subject: [PATCH] Cope with renamed version => flightgear-version file.

---
 build_appimage.sh                            | 2 +-
 build_release_linux.sh                       | 2 +-
 build_release_windows.bat                    | 2 +-
 hudson_mac_package_release.rb                | 2 +-
 release_builder/create-release-branch-for.sh | 4 ++--
 release_builder/set-version.sh               | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

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=<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
diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb
index cf23a64..1640d10 100755
--- a/hudson_mac_package_release.rb
+++ b/hudson_mac_package_release.rb
@@ -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
diff --git a/release_builder/create-release-branch-for.sh b/release_builder/create-release-branch-for.sh
index 658b2f5..b8f881b 100755
--- a/release_builder/create-release-branch-for.sh
+++ b/release_builder/create-release-branch-for.sh
@@ -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"
 }
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"
 }