Skip to content
Snippets Groups Projects
Commit b97a4c8f authored by Oz Linden's avatar Oz Linden
Browse files

move doxygen upload so that it is not treated with installers

parent d2acfde2
No related branches found
No related tags found
No related merge requests found
...@@ -238,8 +238,8 @@ do ...@@ -238,8 +238,8 @@ do
build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | sed -n 's/^ *\(##teamcity.*\)/\1/p' build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | sed -n 's/^ *\(##teamcity.*\)/\1/p'
if `cat "$build_dir/build_ok"` if `cat "$build_dir/build_ok"`
then then
if [ "$variant" == "Release" ] case "$variant" in
then Release)
if [ -r "$build_dir/autobuild-package.xml" ] if [ -r "$build_dir/autobuild-package.xml" ]
then then
begin_section "Autobuild metadata" begin_section "Autobuild metadata"
...@@ -254,9 +254,22 @@ do ...@@ -254,9 +254,22 @@ do
else else
record_event "no autobuild metadata at '$build_dir/autobuild-package.xml'" record_event "no autobuild metadata at '$build_dir/autobuild-package.xml'"
fi fi
else ;;
record_event "do not record autobuild metadata for $variant" Doxygen)
fi if [ -r "$build_dir/doxygen_warnings.log" ]
then
record_event "Doxygen warnings generated; see doxygen_warnings.log"
upload_item log "$build_dir/doxygen_warnings.log" text/plain
fi
if [ -d "$build_dir/doxygen/html" ]
then
(cd "$build_dir/doxygen/html"; tar cjf "$build_dir/viewer-doxygen.tar.bz2" .)
upload_item docs "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream
fi
;;
*)
;;
esac
else else
record_failure "Build of \"$variant\" failed." record_failure "Build of \"$variant\" failed."
fi fi
...@@ -398,18 +411,6 @@ then ...@@ -398,18 +411,6 @@ then
upload_item private_artifact "$llphysicsextensions_package" binary/octet-stream upload_item private_artifact "$llphysicsextensions_package" binary/octet-stream
fi fi
;; ;;
Doxygen)
if [ -r "$build_dir/doxygen_warnings.log" ]
then
record_event "Doxygen warnings generated; see doxygen_warnings.log"
upload_item log "$build_dir/doxygen_warnings.log" text/plain
fi
if [ -d "$build_dir/doxygen/html" ]
then
(cd "$build_dir/doxygen/html"; tar cjf "$build_dir/viewer-doxygen.tar.bz2" .)
upload_item docs "$build_dir/viewer-doxygen.tar.bz2" binary/octet-stream
fi
;;
*) *)
;; ;;
esac esac
...@@ -417,9 +418,9 @@ then ...@@ -417,9 +418,9 @@ then
# Run upload extensions # Run upload extensions
if [ -d ${build_dir}/packages/upload-extensions ]; then if [ -d ${build_dir}/packages/upload-extensions ]; then
for extension in ${build_dir}/packages/upload-extensions/*.sh; do for extension in ${build_dir}/packages/upload-extensions/*.sh; do
begin_section "Upload Extenstion $extension" begin_section "Upload Extension $extension"
. $extension . $extension
end_section "Upload Extenstion $extension" end_section "Upload Extension $extension"
done done
fi fi
fi fi
...@@ -427,6 +428,8 @@ then ...@@ -427,6 +428,8 @@ then
else else
echo skipping upload of installer echo skipping upload of installer
fi fi
else else
echo skipping upload of installer due to failed build. echo skipping upload of installer due to failed build.
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment