Unverified Commit a3b35031 authored by Austin Sanders's avatar Austin Sanders Committed by GitHub
Browse files

Updated references to isis_version.txt (#5464) 

* Updated references to isis_version.txt

* Updated changelog
parent 66fdc5b7

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+3 −3
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 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_);

    }
@@ -126,7 +126,7 @@ namespace Isis { 
      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_);

    }
@@ -134,7 +134,7 @@ namespace Isis { 
      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_);

    }