From dfd7826d864014131921bd6ca21334060a1174ac Mon Sep 17 00:00:00 2001
From: jkriege2 <jan@jkrieger.de>
Date: Sat, 23 Apr 2022 14:19:01 +0200
Subject: [PATCH] Doxygen Github Action Update

---
 .github/workflows/doxygen_build_deploy.yml | 43 ++++++++++++----------
 Doxyfile                                   | 12 +++---
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/doxygen_build_deploy.yml b/.github/workflows/doxygen_build_deploy.yml
index 1ef6522f9e..1f834ac5bc 100644
--- a/.github/workflows/doxygen_build_deploy.yml
+++ b/.github/workflows/doxygen_build_deploy.yml
@@ -21,9 +21,9 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      #- uses: actions/checkout@v3
-      #  with: 
-      #    path: JKQtPlotter
+      - uses: actions/checkout@v3
+        with: 
+          path: JKQtPlotter
             
       - name: Install dependencies
         run: |
@@ -34,26 +34,31 @@ jobs:
       
       - name: Update Doxygen to 1.9.3
         run: |
-          pwd
+          currDir=`pwd`
           cd $GITHUB_WORKSPACE
           mkdir doxygen
           wget -O - https://netcologne.dl.sourceforge.net/project/doxygen/rel-1.9.3/doxygen-1.9.3.linux.bin.tar.gz | tar --strip-components=1 -xz -C doxygen
-          sudo export PATH=$GITHUB_WORKSPACE/doxygen/bin:${PATH}
-          doxygen --version
-                  
-      #- name: Run Doxygen
-      #  run: |
-      #    cd JKQtPlotter
-      #    cd doc
-      #    doxygen --version
-      #    doxygen Doxyfile
-      #    echo "" > html/.nojekyll
-      #    cd ..
-      #    cd ..
- 
-      - uses: DenverCoder1/doxygen-github-pages-action@v1
+          export PATH=$GITHUB_WORKSPACE/doxygen/bin:${PATH}
+          echo PATH=$PATH
+          cd $currDir
+          $GITHUB_WORKSPACE/doxygen/bin/doxygen --version
+
+      - name: Run Doxygen
+        run: |
+          $GITHUB_WORKSPACE/doxygen/bin/doxygen --version
+          cd JKQtPlotter
+          pwd
+          ls
+          $GITHUB_WORKSPACE/doxygen/bin/doxygen 
+      
+      - name: Create .nojekyll (ensures pages with underscores work on gh pages)
+        run: touch JKQtPlotter/doc/html/.nojekyll
+        shell: bash
+
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@3.7.1
         with:
           github_token: ${{ secrets.GH_PAGES_SECRET }}
           branch: gh-pages
-          folder: doc/html
+          folder: JKQtPlotter/doc/html
           
diff --git a/Doxyfile b/Doxyfile
index 14ce117583..8abd82d9d8 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -971,7 +971,9 @@ EXCLUDE                = moc_*.* \
                          doc/qtmarketplace_metadata \
                          qmake \
                          cmake \
-                         .github
+                         .github \
+                         doxygen \
+                         doxygen/bin
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
@@ -1311,7 +1313,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  = jkqtplotter_stylesheet.css
+HTML_EXTRA_STYLESHEET  = doc/jkqtplotter_stylesheet.css
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1321,9 +1323,9 @@ HTML_EXTRA_STYLESHEET  = jkqtplotter_stylesheet.css
 # files will be copied as-is; there are no commands or markers available.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_FILES       = images/icon_code.png \
-                         images/icon_note.png \
-                         images/icon_see.png
+HTML_EXTRA_FILES       = doc/images/icon_code.png \
+                         doc/images/icon_note.png \
+                         doc/images/icon_see.png
 
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to