Updated references to isis_version.txt (DOI-USGS#5464)

* Updated references to isis_version.txt

* Updated changelog

CHANGELOG.md

@@ -40,6 +40,7 @@ release.
 - Skypt has been refactored to be callable; old Makefile tests have been removed and replaced by gtests. Issue: [#5443](https://github.com/USGS-Astrogeology/ISIS3/issues/5443)
 
 ### Fixed
+- Fixed bug in which not all references to 'version' file were replaced with new 'isis_version.txt' file [#5374](https://github.com/DOI-USGS/ISIS3/issues/5374)
 - Fixed a bug in which the IrregularBodyCameraGroundMap unit test was removed but not the associated truth file. [#5461](https://github.com/DOI-USGS/ISIS3/issues/5461)
 - Fixed a bug in which the histogram tool used the entire image to calculate bin size, which caused an issue with high dynamic range images. [#5371](https://github.com/DOI-USGS/ISIS3/issues/5371)
 - Fixed a bug in which 'version' file was compiled as source and prevented subsequent ISIS recompilation [#5374](https://github.com/DOI-USGS/ISIS3/issues/5374)

isis/config/config.mak

@@ -5,7 +5,7 @@
 SHELL=bash
 .SILENT:
 
-ISISLOCALVERSION := $(shell head -n 3 $(ISISROOT)/version | tail -n 1 | sed 's/\#.*//' | sed 's/ *$$//')
+ISISLOCALVERSION := $(shell head -n 3 $(ISISROOT)/isis_version.txt | tail -n 1 | sed 's/\#.*//' | sed 's/ *$$//')
 QMAKE ?= $(shell which qmake 2 >& /dev/null)
 
 ifeq ($(QMAKE),)

isis/scripts/isisVarInit.py

@@ -64,7 +64,7 @@ def activate_text(shell: dict, env_vars: dict, cat=False) -> str:
         lines.append(shell["activate_extra"])
 
     if cat:
-        lines.append("cat $ISISROOT/version")
+        lines.append("cat $ISISROOT/isis_version.txt")
 
     return "\n".join(lines)
 

isis/src/base/objs/Environment/Environment.cpp

@@ -118,23 +118,23 @@ namespace Isis {
       line1 = validPartOfLine.cap();
     }
     else {
-      IString msg = "$ISISROOT/version line 1, no valid text found";
+      IString msg = "$ISISROOT/isis_version.txt line 1, no valid text found";
       throw IException(IException::Programmer, msg, _FILEINFO_);
     }
 
     if (validPartOfLine.indexIn(line2) != -1) {
       line2 = validPartOfLine.cap();
     }
     else {
-      IString msg = "$ISISROOT/version line 2, no valid text found";
+      IString msg = "$ISISROOT/isis_version.txt line 2, no valid text found";
       throw IException(IException::Programmer, msg, _FILEINFO_);
     }
 
     if (validPartOfLine.indexIn(line4) != -1) {
       line4 = validPartOfLine.cap();
     }
     else {
-      IString msg = "$ISISROOT/version line 4, no valid text found";
+      IString msg = "$ISISROOT/isis_version.txt line 4, no valid text found";
       throw IException(IException::Programmer, msg, _FILEINFO_);
     }