From 601ac051dbcbbe428707d436c63a04fb08c13a67 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 1 Sep 2023 11:28:34 +0200 Subject: [PATCH] documentation/Makefile: Remove gh-pages rules Co-authored-by: Andrew Johnson --- documentation/Makefile | 15 +++++-------- documentation/commit-gh.sh | 45 -------------------------------------- documentation/mainpage.dox | 15 ------------- 3 files changed, 5 insertions(+), 70 deletions(-) delete mode 100755 documentation/commit-gh.sh delete mode 100644 documentation/mainpage.dox diff --git a/documentation/Makefile b/documentation/Makefile index 433b29a5b..2d5c9a4ee 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -11,19 +11,14 @@ EXPAND_ME += OS_CLASS CMPLR_CLASS TARGETS += doxygen DOXYGEN = doxygen -ME = documentation/O.$(T_A)/html -GH_FILES = $(ME)/ $(ME)/.nojekyll $(ME)/*.* $(ME)/*/*.* include $(TOP)/configure/RULES -doxygen: Doxyfile ../mainpage.dox $(INSTALL_HTMLS) +ifndef T_A +doxygen: all +else +doxygen: Doxyfile $(DOXYGEN) - rsync -av $(TOP)/html/ html/ +endif .PHONY: doxygen - -commit: doxygen - $(TOUCH) html/.nojekyll - (cd $(TOP) && $(CURDIR)/../commit-gh.sh $(GH_FILES)) - -.PHONY: commit diff --git a/documentation/commit-gh.sh b/documentation/commit-gh.sh deleted file mode 100755 index d630165d2..000000000 --- a/documentation/commit-gh.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -set -e -x -# Usage: commit-gh -# -# Creates a commit containing only the files in the sub-directory provided as an argument -# -# Does not disturb the working copy or index - -prefix="$1" -shift - -# Commit to this branch -BRANCH=refs/heads/gh-pages - -# Use the main branch description as the gh-pages commit message -MSG=`git describe --tags --always` - -# Scratch space -TDIR=`mktemp -d -p $PWD` - -# Automatic cleanup of scratch space -trap 'rm -rf $TDIR' INT TERM QUIT EXIT - -export GIT_INDEX_FILE="$TDIR/index" - -# Add listed files to a new (empty) index -git update-index --add "$@" - -# Write the index into the repo, get tree hash -TREE=`git write-tree --prefix="$prefix"` - -echo "TREE $TREE" -git cat-file -p $TREE - -# Create a commit with our new tree -# Reference current branch head as parent (if any) -CMT=`git commit-tree -m "$MSG" $TREE` - -echo "COMMIT $CMT" -git cat-file -p $CMT - -# Update the branch with the new commit tree hash -git update-ref $BRANCH $CMT - -echo "Done" diff --git a/documentation/mainpage.dox b/documentation/mainpage.dox deleted file mode 100644 index ed3d688ef..000000000 --- a/documentation/mainpage.dox +++ /dev/null @@ -1,15 +0,0 @@ -/** -@mainpage EPICS Base - -Documentation index - -@li @ref releasenotes -@li @ref install -@li EPICS Component Reference Manual -@li Field Modifiers and Channel Filters -@li Extensible IOC Database Links -@li Channel Access Reference Manual -@li msi: Macro Substitution and Include Tool -@li Perl 5 Interface to Channel Access - -*/