i#2260 web: Finalize new automated web generation (#2408)

Fixes issues with the initial commit of the Action to generate
the new web content:
- Wrong path to runsuite_wrapper.pl
- Add missing submodules
- Add package.cmake copy of embedded docs
- Add error checking for an empty glob
- Fix install path for embedded docs

Removes the old drmemory_docs generation step from the ci-package
action.

Issue: #2260

Author: derekbruening

.github/workflows/ci-docs.yml

@@ -53,6 +53,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        submodules: true
 
     - name: Fetch Sources
       run: |
@@ -85,7 +87,7 @@ jobs:
 
     - name: Build Docs
       working-directory: ${{ github.workspace }}
-      run: ./suite/runsuite_wrapper.pl travis 64_only
+      run: ./tests/runsuite_wrapper.pl travis 64_only
       env:
         CI_TARGET: package
         VERSION_NUMBER: ${{ steps.version.outputs.version_number }}
@@ -100,7 +102,7 @@ jobs:
 
     - name: Deploy Embedded Docs
       run: |
-        rsync -av --delete embed/html/ drmemory.github.io/docs/
+        rsync -av --delete html_embed/ drmemory.github.io/docs/
         cd drmemory.github.io
         git config --local user.name "cronbuild"
         git config --local user.email "drmemory-devs@googlegroups.com"

.github/workflows/ci-package.yml

@@ -92,24 +92,15 @@ jobs:
       env:
         CI_TARGET: package
         VERSION_NUMBER: ${{ steps.version.outputs.version_number }}
-        DEPLOY_DOCS: yes
+        # Docs are deployed separately in ci-docs.yml.
+        DEPLOY_DOCS: no
 
     - name: Upload Artifacts
       uses: actions/upload-artifact@v2
       with:
         name: linux-tarball
         path: DrMemory-Linux-${{ steps.version.outputs.version_number }}.tar.gz
 
-    - name: Deploy Docs
-      uses: crazy-max/ghaction-github-pages@v2
-      with:
-        build_dir: html
-        repo: DynamoRIO/drmemory_docs
-        target_branch: master
-      env:
-        # We need a personal access token for write access to another repo.
-        GH_PAT: ${{ secrets.DOCS_TOKEN }}
-
   ###########################################################################
   # Mac tarball with x86-64 build:
   osx:

package.cmake

@@ -222,9 +222,12 @@ if (NOT arg_sub_package)
   if (arg_copy_docs)
     # Prepare for copying the documentation to our Github Pages site by placing it
     # in a single fixed-name location with a .nojekyll file.
-    message("Copying documentation into ${arg_outdir}/html")
+    message("Copying standalone documentation into ${arg_outdir}/html")
     message("Looking for ${last_package_build_dir}/_CPack_Packages/*/*/DrMemory-*/drmemory/docs/html")
     file(GLOB allhtml "${last_package_build_dir}/_CPack_Packages/*/*/DrMemory-*/drmemory/docs/html")
+    if (NOT allhtml)
+      message(FATAL_ERROR "failed to find html docs dir")
+    endif ()
     # If there's a source package we'll have multiple.  Just take the first one.
     list(GET allhtml 0 html)
     if (EXISTS "${html}")
@@ -233,9 +236,30 @@ if (NOT arg_sub_package)
         ${CMAKE_COMMAND} -E copy_directory ${html} "${arg_outdir}/html")
       # Create a .nojekyll file so Github Pages will display this as raw html.
       execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${arg_outdir}/html/.nojekyll")
-      message("Successully copied docs")
+      message("Successully copied standalone docs")
     else ()
       message(FATAL_ERROR "failed to find html docs")
     endif ()
+
+    message("Copying embedded documentation into ${arg_outdir}/html_embed")
+    message("Looking for ${last_package_build_dir}/_CPack_Packages/*/*/DrMemory-*/drmemory/docs_embed/html")
+    file(GLOB allhtml "${last_package_build_dir}/_CPack_Packages/*/*/DrMemory-*/drmemory/docs_embed/html")
+    if (NOT allhtml)
+      message(FATAL_ERROR "failed to find embedded html docs dir")
+    endif ()
+    # If there's a source package we'll have multiple.  Just take the first one.
+    list(GET allhtml 0 html)
+    if (EXISTS "${html}")
+      execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
+        "${arg_outdir}/html_embed")
+      execute_process(COMMAND
+        ${CMAKE_COMMAND} -E copy_directory ${html} "${arg_outdir}/html_embed")
+      # Create a .nojekyll file so Github Pages will display this as raw html.
+      execute_process(COMMAND ${CMAKE_COMMAND} -E touch
+        "${arg_outdir}/html_embed/.nojekyll")
+      message("Successully copied embedded docs")
+    else ()
+      message(FATAL_ERROR "failed to find embedded html docs")
+    endif ()
   endif ()
 endif ()