Skip to content

Commit

Permalink
ISIS Docs build fix for incorrect path and -WEBHELP issues (#4511)
Browse files Browse the repository at this point in the history
* Add missing dot command from graphviz package

When building ISIS documentation, the dot command is not found. This dependancy is in the graphiviz package, which is added to the environment files.

* Fixed path to ISIS docs for -WEBHELP

The hardcoded path to ISIS docs was incorrect. The path to docmentation is $ISISROOT/docs - the s was missing in the path spec.
  • Loading branch information
KrisBecker authored and jessemapel committed Jul 31, 2021
1 parent 1a2145a commit e5def87
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies:
- geos>=3.7,<3.8
- geotiff
- gmp
- graphviz
- gsl>=2.6
- hdf5
- icu
Expand Down
1 change: 1 addition & 0 deletions environment_gcc4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies:
- geos=3.7.1
- geotiff
- gmp
- graphviz
- gsl
- hdf5
- icu
Expand Down
5 changes: 4 additions & 1 deletion isis/src/base/objs/UserInterface/UserInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,9 @@ namespace Isis {
* @throws Isis::IException::User - -ERRLIST expects a file name
* @throws Isis::IException::User - -ONERROR only accpets CONTINUE and ABORT as valid values
* @throws Isis::IException::Unknown - -GUI and -PID are incompatible arguments
*
* @internal
* @history 2021-06-05 Kris Becker - Fixed path to ISIS docs
*/
void UserInterface::evaluateOption(const QString name,
const QString value) {
Expand Down Expand Up @@ -680,7 +683,7 @@ namespace Isis {
else if(name == "-WEBHELP") {
Isis::PvlGroup &pref = Isis::Preference::Preferences().findGroup("UserInterface");
QString command = pref["GuiHelpBrowser"];
command += " $ISISROOT/doc/Application/presentation/Tabbed/";
command += " $ISISROOT/docs/Application/presentation/Tabbed/";
command += FileName(p_progName).name() + "/" + FileName(p_progName).name() + ".html";
// cannot test else in unit test - don't want to open webhelp
if (unitTest) {
Expand Down
1 change: 1 addition & 0 deletions isis/src/base/objs/UserInterface/UserInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ namespace Isis {
* @history 2018-04-20 Adam Goins - Modified loadHistory() to print out the last command
* so that users can see the actual command that the -last arg loads.
* Fixes #4779.
* @history 2021-06-05 Kris Becker - Fixed path to ISIS documentation when -WEBHELP is used
*
*/

Expand Down

0 comments on commit e5def87

Please sign in to comment.