solenv/bin/mkdocs_portal.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
New commits: commit 454ad54ccfbfd09c46a46211a9469d3d85050fbd Author: Norbert Thiebaud <[email protected]> Date: Sun Mar 27 19:47:41 2016 -0500 mkdoc_portal: fix issue with main doc page generation Change-Id: I64fd0e7c9a574b0ed8164ca6faaf589a2ed83ed5 diff --git a/solenv/bin/mkdocs_portal.sh b/solenv/bin/mkdocs_portal.sh index 55b2ebb..4a05d19 100755 --- a/solenv/bin/mkdocs_portal.sh +++ b/solenv/bin/mkdocs_portal.sh @@ -1,5 +1,9 @@ #!/bin/bash +if [ -n "$debug" ] ; then + set -x +fi + SRCDIR="$1" BASE_OUTPUT="$2" @@ -51,11 +55,11 @@ local output="$1" </div> <div id="foot"> <small> - <p>Generated by Libreoffice <a href="http://cgit.freedesktop.org/libreoffice/core/plain/solenv/bin/mkdocs.sh";>Module Description Tool</a></p> + <p>Generated by Libreoffice CI on $(hostname)</p> <p>Last updated: EOF -date -f '+%F %T' >> $output +date '+%F %T' >> $output cat - >> $output <<EOF </p> </small> @@ -90,8 +94,12 @@ header "LibreOffice Modules" " " "$BASE_OUTPUT/index.html" for module_name in *; do if [ -d $module_name ]; then - cur_file=$(echo $module_name/README* $module_name/readme.txt*) - if [ -f "$cur_file" ]; then + if [ -f $module_name/readme.txt ] ; then + cur_file="$module_name/readme.txt" + elif [ -f $module_name/README ] ; then + cur_file="$module_name/README" + fi + if [ -n "$cur_file" ]; then # write index.html entry text="<h2><a href=\"${module_name}.html\">${module_name}</a></h2>\n" text="${text}$(head -n1 $cur_file | proc_text )" @@ -101,7 +109,7 @@ for module_name in *; do header "$module_name" "<a href=\"index.html\">LibreOffice</a> » ${module_name}" "$BASE_OUTPUT/${module_name}.html" text="<p><b>View module in:</b>" text="${text} <a href=\"http://cgit.freedesktop.org/libreoffice/core/tree/${module_name}\";>cgit</a>" - if $(echo $INPUT_PROJECTS | grep -q $module_name); then + if [ -d ./docs/${module_name} ] ; then text="${text} <a href=\"${module_name}/html/classes.html\">Doxygen</a>" fi text="${text} </p><p> </p>" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
