Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-18154

HTML output directory is incorrect when folderWhereYouRunDoxygen is used

    XMLWordPrintable

Details

    Description

      When the "folder where you run Doxygen" setting is used, the HTML_OUTPUT setting in the Doxyfile is interpreted relative to that location, instead of being relative to the OUTPUT_DIRECTORY setting (which itself is relative to the folderWhereYouRunDoxygen). This causes publication of the generated documentation to fail.

      Attachments

        Activity

          Descending order - Click to sort in ascending order
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Gregory Boissinot
          Path:
          src/main/java/hudson/plugins/doxygen/DoxygenDirectoryParser.java
          src/test/java/hudson/plugins/doxygen/DoxygenArchiverTest.java
          src/test/java/hudson/plugins/doxygen/DoxygenDirectoryParserTest.java
          src/test/resources/hudson/plugins/doxygen/Doxyfile-dot
          http://jenkins-ci.org/commit/doxygen-plugin/171a66a82dacd93a1038fea4be34295067408cbc
          Log:
          Merge pull request #6 from kbriggs/bugfix-JENKINS-18154

          JENKINS-18154 Use correct HTML output with folderWhereYouRunDoxygen

          Compare: https://github.com/jenkinsci/doxygen-plugin/compare/e39037fd930c...171a66a82dac

          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Gregory Boissinot Path: src/main/java/hudson/plugins/doxygen/DoxygenDirectoryParser.java src/test/java/hudson/plugins/doxygen/DoxygenArchiverTest.java src/test/java/hudson/plugins/doxygen/DoxygenDirectoryParserTest.java src/test/resources/hudson/plugins/doxygen/Doxyfile-dot http://jenkins-ci.org/commit/doxygen-plugin/171a66a82dacd93a1038fea4be34295067408cbc Log: Merge pull request #6 from kbriggs/bugfix- JENKINS-18154 JENKINS-18154 Use correct HTML output with folderWhereYouRunDoxygen Compare: https://github.com/jenkinsci/doxygen-plugin/compare/e39037fd930c...171a66a82dac
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Kieron Briggs
          Path:
          src/test/java/hudson/plugins/doxygen/DoxygenArchiverTest.java
          src/test/resources/hudson/plugins/doxygen/Doxyfile-dot
          http://jenkins-ci.org/commit/doxygen-plugin/7943ee7971676e8b8c44ac9acfb9729d026dfc25
          Log:
          JENKINS-18154 Add test for OUTPUT_DIRECTORY=.

          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Kieron Briggs Path: src/test/java/hudson/plugins/doxygen/DoxygenArchiverTest.java src/test/resources/hudson/plugins/doxygen/Doxyfile-dot http://jenkins-ci.org/commit/doxygen-plugin/7943ee7971676e8b8c44ac9acfb9729d026dfc25 Log: JENKINS-18154 Add test for OUTPUT_DIRECTORY=.
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Kieron Briggs
          Path:
          src/main/java/hudson/plugins/doxygen/DoxygenDirectoryParser.java
          src/test/java/hudson/plugins/doxygen/DoxygenArchiverTest.java
          src/test/java/hudson/plugins/doxygen/DoxygenDirectoryParserTest.java
          http://jenkins-ci.org/commit/doxygen-plugin/f9b10f47eac5609d3419240831f80bd6083bb3c3
          Log:
          JENKINS-18154 remove isDirectoryAbsolute()

          The refactor of getDoxygenGeneratedDir() has made isDirectoryAbsolute()
          redundant; remove it.

          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Kieron Briggs Path: src/main/java/hudson/plugins/doxygen/DoxygenDirectoryParser.java src/test/java/hudson/plugins/doxygen/DoxygenArchiverTest.java src/test/java/hudson/plugins/doxygen/DoxygenDirectoryParserTest.java http://jenkins-ci.org/commit/doxygen-plugin/f9b10f47eac5609d3419240831f80bd6083bb3c3 Log: JENKINS-18154 remove isDirectoryAbsolute() The refactor of getDoxygenGeneratedDir() has made isDirectoryAbsolute() redundant; remove it.
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Kieron Briggs
          Path:
          src/main/java/hudson/plugins/doxygen/DoxygenDirectoryParser.java
          http://jenkins-ci.org/commit/doxygen-plugin/730f19870fc64dc710bd2b8321f535410e623c01
          Log:
          JENKINS-18154 Refactor getDoxygenGeneratedDir() to use FilePath

          Using the FilePath abstraction instead of concatenating path strings
          simplifies the logic substantially; it no longer matters whether the
          path is relative or absolute, for example.

          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Kieron Briggs Path: src/main/java/hudson/plugins/doxygen/DoxygenDirectoryParser.java http://jenkins-ci.org/commit/doxygen-plugin/730f19870fc64dc710bd2b8321f535410e623c01 Log: JENKINS-18154 Refactor getDoxygenGeneratedDir() to use FilePath Using the FilePath abstraction instead of concatenating path strings simplifies the logic substantially; it no longer matters whether the path is relative or absolute, for example.
          kbriggs Kieron Briggs added a comment -

          New patch submission: https://github.com/jenkinsci/doxygen-plugin/pull/6

          kbriggs Kieron Briggs added a comment - New patch submission: https://github.com/jenkinsci/doxygen-plugin/pull/6
          View 6 older comments

          People

            gbois Gregory Boissinot
            kbriggs Kieron Briggs
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: