merge viewer-release following 3.7.29-release

BuildParams

@@ -71,121 +71,9 @@ additional_packages = ""
 # for the package in a setting that overrides the compiled-in value
 ################################################################
 
-# Notifications - to configure email notices, add a setting like this:
-# <username>_<reponame>.email = <email-address>
+# Notifications - to configure email notices use the TeamCity parameter
+# setting screen for your project or build configuration to set the
+# environment variable 'email' to a space-separated list of email addresses
 
-# ========================================
-# mesh-development
-# ========================================
-mesh-development.viewer_channel = "Project Viewer - Mesh"
-mesh-development.viewer_grid = aditi
-mesh-development.build_debug_release_separately = true
-mesh-development.build_CYGWIN_Debug = false
-mesh-development.build_viewer_update_version_manager = false
-
-# ========================================
-# mesh-development-release-1-candidate
-# ========================================
-mesh-development-release-1-candidate.viewer_channel = "Project Viewer - Mesh"
-mesh-development-release-1-candidate.viewer_grid = agni
-mesh-development-release-1-candidate.build_debug_release_separately = true
-mesh-development-release-1-candidate.build_CYGWIN_Debug = false
-mesh-development-release-1-candidate.build_viewer_update_version_manager = false
-
-# ========================================
-# mesh-development-rc
-# ========================================
-mesh-development-rc.viewer_channel = "Project Viewer - Mesh"
-mesh-development-rc.viewer_grid = agni
-mesh-development-rc.build_debug_release_separately = true
-mesh-development-rc.build_CYGWIN_Debug = false
-mesh-development-rc.build_viewer_update_version_manager = false
-
-# ========================================
-# mesh-asset-deprecation
-# ========================================
-mesh-asset-deprecation.viewer_channel = "Project Viewer - Mesh Asset Deprecation"
-mesh-asset-deprecation.viewer_grid = aditi
-mesh-asset-deprecation.build_debug_release_separately = true
-mesh-asset-deprecation.build_CYGWIN_Debug = false
-mesh-asset-deprecation.build_viewer_update_version_manager = false
-
-# ========================================
-# viewer-mesh
-# ========================================
-
-viewer-mesh.build_viewer = true
-viewer-mesh.build_server = false
-viewer-mesh.build_Linux = true
-viewer-mesh.build_hg_bundle = true
-viewer-mesh.build_viewer_update_version_manager = false
-viewer-mesh.build_Debug = false
-viewer-mesh.build_RelWithDebInfo = false
-viewer-mesh.viewer_channel = "Project Viewer - Mesh"
-viewer-mesh.viewer_grid = aditi
-viewer-mesh.email = shining@lists.lindenlab.com
-
-# =================================================================
-# asset delivery 2010 projects
-# =================================================================
-viewer-asset-delivery.viewer_channel = "Second Life Development"
-viewer-asset-delivery.build_viewer_update_version_manager = false
-viewer-asset-delivery.email = monty@lindenlab.com
-viewer-asset-delivery.build_server = false
-viewer-asset-delivery.build_server_tests = false
-
-viewer-asset-delivery-metrics.viewer_channel = "Second Life Development"
-viewer-asset-delivery-metrics.build_viewer_update_version_manager = false
-viewer-asset-delivery-metrics.email = monty@lindenlab.com
-viewer-asset-delivery-metrics.build_server = false
-viewer-asset-delivery-metrics.build_server_tests = false
-
-# ========================================
-# Simon says
-# ========================================
-simon_viewer-dev-private.public_build = false
-simon_viewer-dev-private.email_status_this_is_os = false
-
-
-# ========================================
-# Vir
-# ========================================
-vir-project-1.viewer_channel = "Second Life Release"
-
-# ========================================
-# Merov
-# ========================================
-merov-viewer-maint-2287.viewer_channel = "Second Life Project Merchant Outbox"
-merov-viewer-maint-2287.login_channel = "Second Life Project Merchant Outbox"
-merov-viewer-maint-2287.build_viewer_update_version_manager = false
-merov-viewer-maint-2287.codeticket_add_context = false
-
-# ========================================
-# THX-1138 / Runway projects
-# ========================================
-viewer-thx1138-runway-shared.viewer_channel = "Project Viewer - THX-1138 Runway"
-viewer-thx1138-runway-shared.viewer_grid = uma
-viewer-thx1138-runway-shared.build_debug_release_separately = true
-viewer-thx1138-runway-shared.build_CYGWIN_Debug = false
-viewer-thx1138-runway-shared.build_viewer_update_version_manager = false
-
-viewer-thx1138.viewer_channel = "Project Viewer - THX-1138"
-viewer-thx1138.viewer_grid = uma
-viewer-thx1138.build_debug_release_separately = true
-viewer-thx1138.build_CYGWIN_Debug = false
-viewer-thx1138.build_viewer_update_version_manager = false
-
-runway-merge.viewer_channel = "Project Viewer - Runway Merge"
-runway-merge.viewer_grid = agni
-runway-merge.build_debug_release_separately = true
-runway-merge.build_CYGWIN_Debug = false
-runway-merge.build_viewer_update_version_manager = false
-
-runway.viewer_channel = "Project Viewer - Runway"
-runway.viewer_grid = agni
-runway.build_debug_release_separately = true
-runway.build_CYGWIN_Debug = false
-runway.build_viewer_update_version_manager = false
-# eof
 
 

build.sh

@@ -134,7 +134,7 @@ package_llphysicsextensions_tpv()
           echo "${autobuild_package_filename}" > $build_dir/llphysicsextensions_package
       fi
   else
-      echo "Do not provide llphysicsextensions_tpv for $variant"
+      record_event "Do not provide llphysicsextensions_tpv for $variant"
       llphysicsextensions_package=""
   fi
   end_section "PhysicsExtensions_TPV"
@@ -155,7 +155,9 @@ build()
     # Run build extensions
     if [ $build_ok -eq 0 -a -d ${build_dir}/packages/build-extensions ]; then
         for extension in ${build_dir}/packages/build-extensions/*.sh; do
+            begin_section "Extension $extension"
             . $extension
+            end_section "Extension $extension"
             if [ $build_ok -ne 0 ]; then
                 break
             fi
@@ -175,25 +177,6 @@ build()
 }
 
 # This is called from the branch independent script upon completion of all platform builds.
-build_docs()
-{
-  begin_section "Building Documentation"
-  begin_section "Autobuild metadata"
-  if [ -r "$build_dir/autobuild-package.xml" ]
-  then
-      upload_item docs "$build_dir/autobuild-package.xml" text/xml
-  else
-      record_event "no metadata at '$build_dir/autobuild-package.xml'"
-  fi
-  end_section "Autobuild metadata"
-  if [ "$arch" != "Linux" ]
-  then
-      record_dependencies_graph # defined in build.sh
-  else
-      echo "TBD - skipping linux graph (probable python version dependency)" 1>&2
-  fi
-  end_section "Building Documentation"
-}
 
 
 # Check to see if we were invoked from the wrapper, if not, re-exec ourselves from there
@@ -259,57 +242,44 @@ do
 
   if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1
   then
-    if $build_link_parallel
-    then
-      begin_section BuildParallel
-      ( build "$variant" "$build_dir" > "$build_dir/build.log" 2>&1 ) &
-      build_processes="$build_processes $!"
-      end_section BuildParallel
-    else
       begin_section "Build$variant"
       build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | sed -n 's/^ *\(##teamcity.*\)/\1/p'
       if `cat "$build_dir/build_ok"`
       then
-        echo so far so good.
+          if [ "$variant" == "Release" ]
+          then
+              if [ -r "$build_dir/autobuild-package.xml" ]
+              then
+                  begin_section "Autobuild metadata"
+                  record_event "Upload autobuild metadata"
+                  upload_item docs "$build_dir/autobuild-package.xml" text/xml
+                  if [ "$arch" != "Linux" ]
+                  then
+                      record_dependencies_graph # defined in buildscripts/hg/bin/build.sh
+                  else
+                      record_event "no dependency graph for linux (probable python version dependency)" 1>&2
+                  fi
+                  end_section "Autobuild metadata"
+              else
+                  record_event "no autobuild metadata at '$build_dir/autobuild-package.xml'"
+              fi
+          else
+              record_event "do not record autobuild metadata for $variant"
+          fi
       else
         record_failure "Build of \"$variant\" failed."
       fi
+
       end_section "Build$variant"
-    fi
-  else
-    record_failure "Build Prep for \"$variant\" failed."
   fi
   end_section "Do$variant"
+  if ! $succeeded 
+  then
+      record_event "remaining variants skipped due to $variant failure"
+      break
+  fi
 done
 
-build_docs
-
-# If we are building variants in parallel, wait, then collect results.
-# This requires that the build dirs are variant specific
-if $build_link_parallel && [ x"$build_processes" != x ]
-then
-  begin_section WaitParallel
-  wait $build_processes
-  for variant in $variants
-  do
-    eval '$build_'"$variant" || continue
-    eval '$build_'"$arch"_"$variant" || continue
-
-    begin_section "Build$variant"
-    build_dir=`build_dir_$arch $variant`
-    build_dir_stubs="$build_dir/win_setup/$variant"
-    tee -a $build_log < "$build_dir/build.log" | sed -n 's/^ *\(##teamcity.*\)/\1/p'
-    if `cat "$build_dir/build_ok"`
-    then
-      echo so far so good.
-    else
-      record_failure "Parallel build of \"$variant\" failed."
-    fi
-    end_section "Build$variant"
-  done
-  end_section WaitParallel
-fi
-
 # build debian package
 if [ "$arch" == "Linux" ]
 then
@@ -376,7 +346,7 @@ then
       end_section "Upload Debian Repository"
       
     else
-      echo skipping debian build
+      echo debian build not enabled
     fi
   else
     echo skipping debian build due to failed build.
@@ -446,7 +416,9 @@ then
       # Run upload extensions
       if [ -d ${build_dir}/packages/upload-extensions ]; then
           for extension in ${build_dir}/packages/upload-extensions/*.sh; do
+              begin_section "Upload Extenstion $extension"
               . $extension
+              end_section "Upload Extenstion $extension"
           done
       fi