also build documentation in Rocky-8 container

// BelongsTo: CS-331
hpc-gridware · May 24, 2024 · 5342b37 · 5342b37
1 parent 4c92fbf
commit 5342b37
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/container/build_and_test.sh b/container/build_and_test.sh
@@ -5,6 +5,7 @@
 DO_SOURCE_BASHRC=0
 DO_GCS=0
 DO_BUILD=1
+DO_BUILD_DOC=0
 DO_TARGZ=1
 DO_UNITTEST=1
 DO_INSTALL=1
@@ -27,6 +28,7 @@ Usage()
    echo "   Options:"
    echo "   -h          print this help"
    echo "   -bashrc     source /root/.bashrc"
+   echo "   -doc        also build documentation"
    echo "   -gcs        build Cluster Scheduler with Gridware extensions"
    exit $1
 }
@@ -38,12 +40,15 @@ ParseArgs()
          -h)
             Usage 0
             ;;
-         -gcs)
-            DO_GCS=1
-            ;;
          -bashrc)
             DO_SOURCE_BASHRC=1
             ;;
+         -doc)
+            DO_BUILD_DOC=1
+            ;;
+         -gcs)
+            DO_GCS=1
+            ;;
           *)
             Usage 1
             ;;
@@ -77,6 +82,11 @@ echo $CMAKE_OPTIONS
 
 if [ $DO_BUILD -ne 0 ]; then
    echo "Building Cluster Scheduler"
+
+   if [ $DO_BUILD_DOC -ne 0 ]; then
+      CMAKE_OPTIONS="$CMAKE_OPTIONS -DINSTALL_SGE_DOC=ON"
+   fi
+
    cd /build
    cmake $CMAKE_OPTIONS
    if [ $? -ne 0 ]; then

diff --git a/container/build_rocky_8/Dockerfile b/container/build_rocky_8/Dockerfile
@@ -40,8 +40,12 @@ RUN dnf install -y openssl-devel && dnf clean all
 RUN dnf install -y git autoconf automake gcc-toolset-13 systemd-devel patchelf && dnf clean all
 RUN dnf install -y libtirpc-devel  && dnf clean all
 
-# for building documentation
-RUN dnf --enablerepo=devel install -y doxygen graphviz pandoc && dnf clean all
+# building documentation
+RUN dnf --enablerepo=devel install -y pandoc texlive texlive-xetex \
+    texlive-ucharcat texlive-tcolorbox texlive-fancyvrb texlive-titlesec && dnf clean all
+
+# for building source code (doxygen) documentation
+RUN dnf --enablerepo=devel install -y doxygen graphviz && dnf clean all
 
 # for testing
 RUN dnf install -y expect tcl gnuplot xterm && dnf clean all

diff --git a/container/build_rocky_8/Makefile b/container/build_rocky_8/Makefile
@@ -48,11 +48,11 @@ interactive:
 
 .PHONY: ocs
 ocs:
-	docker run --rm --name $(CONTAINER_NAME) -v $(MOUNT_DIR):/clusterscheduler $(DOCKER_USER)/$(IMAGE_NAME) $(BUILD_AND_TEST) -bashrc
+	docker run --rm --name $(CONTAINER_NAME) -v $(MOUNT_DIR):/clusterscheduler $(DOCKER_USER)/$(IMAGE_NAME) $(BUILD_AND_TEST) -bashrc -doc
 
 .PHONY: gcs
 gcs:
-	docker run --rm --name $(CONTAINER_NAME) -v $(MOUNT_DIR):/clusterscheduler $(DOCKER_USER)/$(IMAGE_NAME) $(BUILD_AND_TEST) -bashrc -gcs
+	docker run --rm --name $(CONTAINER_NAME) -v $(MOUNT_DIR):/clusterscheduler $(DOCKER_USER)/$(IMAGE_NAME) $(BUILD_AND_TEST) -bashrc -gcs -doc
 
 .PHONY: clean
 clean:

diff --git a/doc/markdown/manual/head.tex b/doc/markdown/manual/head.tex
@@ -50,7 +50,8 @@
 % redefine quote environment to use the myquote environment, see https://tex.stackexchange.com/a/337587/114857
 \renewenvironment{quote}{\begin{myquote}}{\end{myquote}}
 
-\usepackage{fancyvrb,newverbs}
+% \usepackage{fancyvrb,newverbs}
+\usepackage{fancyvrb}
 \usepackage[top=2cm, bottom=1.5cm, left=2cm, right=2cm]{geometry}
 
 % change background color for inline code in