summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2019-03-29 05:42:30 +0000
committerChris Johns <chrisj@rtems.org>2019-03-29 05:43:33 +0000
commit63a27095cb2579d8479650af7565e9793a8cb2e7 (patch)
treeba8fe476f33517360bb2c058b76bef61c07ed236
parent7dfa32c60dd97f4cb88fe08a35c3d63b235a95e4 (diff)
Update to the latest doxygen config file.HEADmaster
-rwxr-xr-xdoxygen/builder/rtems-doxygen-build-branches66
-rwxr-xr-xdoxygen/builder/rtems-doxygen-build-cron15
-rwxr-xr-xdoxygen/builder/rtems-doxygen-publish3
-rwxr-xr-xdoxygen/builder/rtems-doxygen-unpack-branches9
-rwxr-xr-xdoxygen/builder/rtems-doxygen-upload2
5 files changed, 63 insertions, 32 deletions
diff --git a/doxygen/builder/rtems-doxygen-build-branches b/doxygen/builder/rtems-doxygen-build-branches
index 249582d..c060c0d 100755
--- a/doxygen/builder/rtems-doxygen-build-branches
+++ b/doxygen/builder/rtems-doxygen-build-branches
@@ -2,7 +2,7 @@
#
# RTEMS Kernel Project
#
-# Copyright 2017 Chris Johns <chrisj@rtems.org>
+# Copyright 2017-2019 Chris Johns <chrisj@rtems.org>
# All rights reserved
#
# Public domain
@@ -134,32 +134,44 @@ cd ${repo}
rm -rf ${prefix}
log mkdir -p ${prefix}
mkdir -p ${prefix}
- log cd ${prefix}
- cd ${prefix}
- log "Creating: Doxyfile"
- top_srcdir=$(echo ${top}/${repo}/cpukit | sed -e 's/\//\\\//g')
- perl=$(which perl | sed -e 's/\//\\\//g')
- cat ${top}/${repo}/cpukit/Doxyfile.in | \
- sed -e "s/@PACKAGE_VERSION@/${release}/g" \
- -e "s/@top_srcdir@/${top_srcdir}/g" \
- -e "s/@PERL@/${perl}/g" \
- -e "s/^INPUT[[:space:]].*=.*$/INPUT = ${top_srcdir}/g" \
- -e "s/^FULL_PATH_NAMES[[:space:]].*=.*$/FULL_PATH_NAMES = NO/g" \
- -e "s/^GENERATE_LATEX[[:space:]].*=.*$/GENERATE_LATEX = no/g" \
- -e "s/^HAVE_DOT[[:blank:]]/DOT_NUM_THREADS = 1\\
- HAVE_DOT /g"> Doxyfile
- log "Building: Doxyfile in ${prefix}"
- ${doxygen} Doxyfile >> ${log_file} 2>&1
- log cd ..
- cd ..
- log rm -rf tmp
- rm -rf tmp
- log mv ${b} tmp
- mv ${b} tmp
- log mv tmp/cpukit_doxy/html ${b}
- mv tmp/cpukit_doxy/html ${b}
- log rm -rf tmp
- rm -rf tmp
+ # Pre-5 building
+ if [ -f ${top}/${repo}/cpukit/Doxyfile.in ]; then
+ log cd ${prefix}
+ cd ${prefix}
+ log "Creating: Doxyfile"
+ top_srcdir=$(echo ${top}/${repo}/cpukit | sed -e 's/\//\\\//g')
+ perl=$(which perl | sed -e 's/\//\\\//g')
+ cat ${top}/${repo}/cpukit/Doxyfile.in | \
+ sed -e "s/@PACKAGE_VERSION@/${release}/g" \
+ -e "s/@top_srcdir@/${top_srcdir}/g" \
+ -e "s/@PERL@/${perl}/g" \
+ -e "s/^INPUT[[:space:]].*=.*$/INPUT = ${top_srcdir}/g" \
+ -e "s/^FULL_PATH_NAMES[[:space:]].*=.*$/FULL_PATH_NAMES = NO/g" \
+ -e "s/^GENERATE_LATEX[[:space:]].*=.*$/GENERATE_LATEX = no/g" \
+ -e "s/^HAVE_DOT[[:blank:]]/DOT_NUM_THREADS = 1\\
+ HAVE_DOT /g"> Doxyfile
+ log "Building: Doxyfile in ${prefix}"
+ ${doxygen} Doxyfile >> ${log_file} 2>&1
+ log cd ..
+ cd ..
+ log rm -rf tmp
+ rm -rf tmp
+ log mv ${b} tmp
+ mv ${b} tmp
+ log mv tmp/cpukit_doxy/html ${b}
+ mv tmp/cpukit_doxy/html ${b}
+ log rm -rf tmp
+ rm -rf tmp
+ else
+ log cd ${top}/${repo}
+ cd ${top}/${repo}
+ log rm -rf doc
+ rm -rf doc
+ log "Building: Doxyfile in ${prefix}"
+ ${doxygen} Doxyfile >> ${log_file} 2>&1
+ log mv doc/* ${prefix}/
+ mv doc/* ${prefix}/
+ fi
log cd ${cwd}
cd ${cwd}
echo ${hash} > ${hash_cache}/${b}
diff --git a/doxygen/builder/rtems-doxygen-build-cron b/doxygen/builder/rtems-doxygen-build-cron
index f49425a..a2aab94 100755
--- a/doxygen/builder/rtems-doxygen-build-cron
+++ b/doxygen/builder/rtems-doxygen-build-cron
@@ -18,6 +18,19 @@ set -e
#
cd $(dirname $0)
-./rtems-doxygen-upload
+#
+# The lock file.
+#
+LOCK=.cron-lock
+
+#
+# Trap to remove the lock file/
+#
+trap "rm -f ${LOCK}" EXIT
+
+if [ ! -f .cron-lock ]; then
+ touch ${LOCK}
+ ./rtems-doxygen-upload
+fi
exit 0
diff --git a/doxygen/builder/rtems-doxygen-publish b/doxygen/builder/rtems-doxygen-publish
index 4f12eab..e4c4b9a 100755
--- a/doxygen/builder/rtems-doxygen-publish
+++ b/doxygen/builder/rtems-doxygen-publish
@@ -44,7 +44,8 @@ new=${top}/latest/new
#
if [ -d ${new} ]; then
${rm} -rf ${current}.tags ${current}/*
- ${cp} -r ${new}/.tags ${new}/* ${current}/.
+ ${cp} -r ${new}/.tags ${current}/.
+ ${cp} -r ${new}/. ${current}/.
${rm} -rf ${new}
fi
diff --git a/doxygen/builder/rtems-doxygen-unpack-branches b/doxygen/builder/rtems-doxygen-unpack-branches
index 299e82f..d151172 100755
--- a/doxygen/builder/rtems-doxygen-unpack-branches
+++ b/doxygen/builder/rtems-doxygen-unpack-branches
@@ -139,8 +139,13 @@ if [ -f ${latest_tags} ]; then
log "New: ${b} from ${src} (${hash})"
log rm -rf ${new}/${b}
rm -rf ${new}/${b}
- log cp -r ${src} ${new}/${b}
- ${cp} -r ${src} ${new}/${b}
+ if [ -d ${src}/html ]; then
+ log cp -r ${src}/html/. ${new}/${b}
+ ${cp} -r ${src}/html/. ${new}/${b}
+ else
+ log cp -r ${src} ${new}/${b}
+ ${cp} -r ${src} ${new}/${b}
+ fi
log "Update ${b} in tags"
cat ${new_tags} | grep -v ${b} > ${new_tags}.tmp
echo "${b} ${hash}" >> ${new_tags}.tmp
diff --git a/doxygen/builder/rtems-doxygen-upload b/doxygen/builder/rtems-doxygen-upload
index f9cb7d8..a80b1c5 100755
--- a/doxygen/builder/rtems-doxygen-upload
+++ b/doxygen/builder/rtems-doxygen-upload
@@ -36,7 +36,7 @@ if [ ! -d latest ]; then
fi
cd latest
- #../rtems-doxygen-build-branches
+ ../rtems-doxygen-build-branches
if [ -f rtems-doxygen-latest.tar.gz ] && [ -f rtems-doxygen-latest-tags ]; then
if [ ! -d ${handover} ]; then
${mkdir} -p ${handover}