From 469529ac63993ba5300fae173391f8ddbbc2d0c4 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 10 Nov 2015 11:27:22 -0500
Subject: reenable doxygen for teamcity linux builds, minor documentation
 cleanup

---
 BuildParams | 2 ++
 build.sh    | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/BuildParams b/BuildParams
index c9a6b5fb43..9180ae9092 100755
--- a/BuildParams
+++ b/BuildParams
@@ -19,6 +19,8 @@ build_Linux_Debug = false
 build_Darwin_Debug = false
 build_Debug = false
 
+# enable Doxygen building on Linux for TeamCity (it can be done manually on any platform)
+build_Linux_Doxygen = true
 
 # Update Public Inworld Build Status Indicators (setting should mirror "public_build")
 email_status_this_is_os = true
diff --git a/build.sh b/build.sh
index 3e279c81da..8807be45eb 100755
--- a/build.sh
+++ b/build.sh
@@ -109,7 +109,7 @@ pre_build()
      -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url
 
- end_section "Configure $variant"
+  end_section "Configure $variant"
 }
 
 package_llphysicsextensions_tpv()
@@ -395,15 +395,13 @@ then
         then
             llphysicsextensions_package=$(cat $build_dir/llphysicsextensions_package)
             upload_item private_artifact "$llphysicsextensions_package" binary/octet-stream
-        else
-            echo "No llphysicsextensions_package"
         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" binary/octet-stream
+            upload_item log "$build_dir/doxygen_warnings.log" text/plain
         fi
         if [ -d "$build_dir/doxygen/html" ]
         then
@@ -412,7 +410,6 @@ then
         fi
         ;;
       *)
-        echo "Skipping mapfile for $last_built_variant"
         ;;
       esac
 
-- 
cgit v1.2.3