Merge. Refresh from viewer-release after 3.6.13 release.

Thu, 09 Jan 2014 15:26:02 -0500

author
Monty Brandenberg <monty@lindenlab.com>
date
Thu, 09 Jan 2014 15:26:02 -0500
changeset 40742
cb80fdfec947
parent 40741
67f869e108d0
parent 40239
e0748c1fffd6
child 40743
ea15863d07ea

Merge. Refresh from viewer-release after 3.6.13 release.

     1.1 --- a/.hgtags	Thu Jan 09 15:18:54 2014 -0500
     1.2 +++ b/.hgtags	Thu Jan 09 15:26:02 2014 -0500
     1.3 @@ -471,3 +471,4 @@
     1.4  5b54b36862ff8bc3b6935673c9d1c1f22ee8d521 3.6.10-release
     1.5  2feb70a4cfde43f2898d95ff8fcae3e67805c7c2 3.6.11-release
     1.6  88bbfd7a6971033f3aa103f3a3500ceb4c73521b 3.6.12-release
     1.7 +0d9b9e50f1a8880e05f15688a9ec7d09e0e81013 3.6.13-release
     2.1 --- a/BuildParams	Thu Jan 09 15:18:54 2014 -0500
     2.2 +++ b/BuildParams	Thu Jan 09 15:26:02 2014 -0500
     2.3 @@ -49,11 +49,13 @@
     2.4  
     2.5  # Setup default packaging parameters.
     2.6  sourceid = ""
     2.7 -additional_packages = "Amazon Desura B C"
     2.8 +additional_packages = "Amazon Desura A B C"
     2.9  Amazon_sourceid = "1207v_Amazon"
    2.10  Amazon_viewer_channel_suffix = "Amazon"
    2.11  Desura_sourceid = "1208_desura"
    2.12  Desura_viewer_channel_suffix = "Desura"
    2.13 +A_sourceid = "1300_A"
    2.14 +A_viewer_channel_suffix = "A"
    2.15  B_sourceid = "1301_B"
    2.16  B_viewer_channel_suffix = "B"
    2.17  C_sourceid = "1302_C"
     3.1 --- a/build.sh	Thu Jan 09 15:18:54 2014 -0500
     3.2 +++ b/build.sh	Thu Jan 09 15:26:02 2014 -0500
     3.3 @@ -36,24 +36,59 @@
     3.4    echo build-vc100
     3.5  }
     3.6  
     3.7 +viewer_channel_suffix()
     3.8 +{
     3.9 +    local package_name="$1"
    3.10 +    local suffix_var="${package_name}_viewer_channel_suffix"
    3.11 +    local suffix=$(eval "echo \$${suffix_var}")
    3.12 +    if [ "$suffix"x = ""x ]
    3.13 +    then
    3.14 +        echo ""
    3.15 +    else
    3.16 +        echo "_$suffix"
    3.17 +    fi
    3.18 +}
    3.19 +
    3.20  installer_Darwin()
    3.21  {
    3.22 -  ls -1tr "$(build_dir_Darwin ${last_built_variant:-Release})/newview/"*"$additional_package_name"*.dmg 2>/dev/null | sed 1q
    3.23 +  local package_name="$1"
    3.24 +  local package_dir="$(build_dir_Darwin ${last_built_variant:-Release})/newview/"
    3.25 +  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i386\\.dmg\$"
    3.26 +  # since the additional packages are built after the base package,
    3.27 +  # sorting oldest first ensures that the unqualified package is returned
    3.28 +  # even if someone makes a qualified name that duplicates the last word of the base name
    3.29 +  local package=$(ls -1tr "$package_dir" 2>/dev/null | grep -E "$pattern" | head -n 1)
    3.30 +  test "$package"x != ""x && echo "$package_dir/$package"
    3.31  }
    3.32  
    3.33  installer_Linux()
    3.34  {
    3.35 -  ls -1tr "$(build_dir_Linux ${last_built_variant:-Release})/newview/"*"$additional_package_name"*.tar.bz2 2>/dev/null | grep -v symbols | sed 1q
    3.36 +  local package_name="$1"
    3.37 +  local package_dir="$(build_dir_Linux ${last_built_variant:-Release})/newview/"
    3.38 +  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$"
    3.39 +  # since the additional packages are built after the base package,
    3.40 +  # sorting oldest first ensures that the unqualified package is returned
    3.41 +  # even if someone makes a qualified name that duplicates the last word of the base name
    3.42 +  package=$(ls -1tr "$package_dir" 2>/dev/null | grep -E "$pattern" | head -n 1)
    3.43 +  test "$package"x != ""x && echo "$package_dir/$package"
    3.44  }
    3.45  
    3.46  installer_CYGWIN()
    3.47  {
    3.48 -  v=${last_built_variant:-Release}
    3.49 -  d=$(build_dir_CYGWIN $v)
    3.50 -  if [ -r "$d/newview/$additional_package_name$v/touched.bat" ]
    3.51 +  local package_name="$1"
    3.52 +  local variant=${last_built_variant:-Release}
    3.53 +  local build_dir=$(build_dir_CYGWIN ${variant})
    3.54 +  local package_dir
    3.55 +  if [ "$package_name"x = ""x ]
    3.56    then
    3.57 -    p=$(sed 's:.*=::' "$d/newview/$additional_package_name$v/touched.bat")
    3.58 -    echo "$d/newview/$additional_package_name$v/$p"
    3.59 +      package_dir="${build_dir}/newview/${variant}"
    3.60 +  else
    3.61 +      package_dir="${build_dir}/newview/${package_name}/${variant}"
    3.62 +  fi
    3.63 +  if [ -r "${package_dir}/touched.bat" ]
    3.64 +  then
    3.65 +    local package_file=$(sed 's:.*=::' "${package_dir}/touched.bat")
    3.66 +    echo "${package_dir}/${package_file}"
    3.67    fi
    3.68  }
    3.69  
    3.70 @@ -275,7 +310,7 @@
    3.71      if $build_viewer_deb && [ "$last_built_variant" == "Release" ]
    3.72      then
    3.73        begin_section "Build Viewer Debian Package"
    3.74 -      local have_private_repo=false
    3.75 +      have_private_repo=false
    3.76        # mangle the changelog
    3.77        dch --force-bad-version \
    3.78            --distribution unstable \
    3.79 @@ -362,19 +397,14 @@
    3.80        # Upload additional packages.
    3.81        for package_id in $additional_packages
    3.82        do
    3.83 -        case $arch in
    3.84 -        CYGWIN) export additional_package_name="$package_id/" ;;
    3.85 -        *) export additional_package_name=$package_id ;;
    3.86 -        esac
    3.87 -        package=$(installer_$arch)
    3.88 +        package=$(installer_$arch "$package_id")
    3.89          if [ x"$package" != x ]
    3.90          then
    3.91            upload_item installer "$package" binary/octet-stream
    3.92          else
    3.93 -          record_failure "Failed to upload $package_id package ($package::$additional_package_name)."
    3.94 +          record_failure "Failed to find additional package for '$package_id'."
    3.95          fi
    3.96        done
    3.97 -      export additional_package_name=""
    3.98  
    3.99        case "$last_built_variant" in
   3.100        Release)
     4.1 --- a/indra/newview/VIEWER_VERSION.txt	Thu Jan 09 15:18:54 2014 -0500
     4.2 +++ b/indra/newview/VIEWER_VERSION.txt	Thu Jan 09 15:26:02 2014 -0500
     4.3 @@ -1,1 +1,1 @@
     4.4 -3.6.13
     4.5 +3.6.14
     5.1 --- a/indra/newview/installers/windows/installer_template.nsi	Thu Jan 09 15:18:54 2014 -0500
     5.2 +++ b/indra/newview/installers/windows/installer_template.nsi	Thu Jan 09 15:26:02 2014 -0500
     5.3 @@ -301,6 +301,23 @@
     5.4      Return
     5.5  FunctionEnd
     5.6  
     5.7 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     5.8 +; Function CheckOldExeName
     5.9 +; Viewer versions < 3.6.12 used the name 'SecondLife.exe'
    5.10 +; If that name is found in the install folder, delete it to invalidate any
    5.11 +; old shortcuts to it that may be in non-standard locations, so that the user
    5.12 +; does not end up running the old version (potentially getting caught in an 
    5.13 +; infinite update loop). See MAINT-3575
    5.14 +; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    5.15 +
    5.16 +Function CheckOldExeName
    5.17 +  IfFileExists "$INSTDIR\SecondLife.exe" CHECKOLDEXE_FOUND CHECKOLDEXE_DONE
    5.18 +
    5.19 +CHECKOLDEXE_FOUND:
    5.20 +  Delete "$INSTDIR\SecondLife.exe"
    5.21 +CHECKOLDEXE_DONE:
    5.22 +FunctionEnd
    5.23 +
    5.24  
    5.25  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    5.26  ; Function CheckWillUninstallV2               
    5.27 @@ -673,6 +690,9 @@
    5.28  Delete "$INSTDIR\motions\*.lla"
    5.29  Delete "$INSTDIR\trial\*.html"
    5.30  Delete "$INSTDIR\newview.exe"
    5.31 +Delete "$INSTDIR\SecondLife.exe"
    5.32 +;; MAINT-3099 workaround - prevent these log files, if present, from causing a user alert
    5.33 +Delete "$INSTDIR\VivoxVoiceService-*.log"
    5.34  ;; Remove entire help directory
    5.35  Delete "$INSTDIR\help\Advanced\*"
    5.36  RMDir  "$INSTDIR\help\Advanced"
    5.37 @@ -920,6 +940,7 @@
    5.38  Call CloseSecondLife			; Make sure we're not running
    5.39  Call CheckNetworkConnection		; ping secondlife.com
    5.40  Call CheckWillUninstallV2               ; See if a V2 install exists and will be removed.
    5.41 +Call CheckOldExeName                    ; Clean up a previous version of the exe
    5.42  
    5.43  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
    5.44  StrCmp $DO_UNINSTALL_V2 "" PRESERVE_DONE
     6.1 --- a/indra/newview/viewer_manifest.py	Thu Jan 09 15:18:54 2014 -0500
     6.2 +++ b/indra/newview/viewer_manifest.py	Thu Jan 09 15:26:02 2014 -0500
     6.3 @@ -136,13 +136,11 @@
     6.4                      settings_install['CmdLineGridChoice']['Value'] = self.grid()
     6.5                      print "Set CmdLineGridChoice in settings_install.xml to '%s'" % self.grid()
     6.6  
     6.7 -                # did we actually copy anything into settings_install dict?
     6.8 -                if settings_install:
     6.9 -                    # put_in_file(src=) need not be an actual pathname; it
    6.10 -                    # only needs to be non-empty
    6.11 -                    self.put_in_file(llsd.format_pretty_xml(settings_install),
    6.12 -                                     "settings_install.xml",
    6.13 -                                     src="environment")
    6.14 +                # put_in_file(src=) need not be an actual pathname; it
    6.15 +                # only needs to be non-empty
    6.16 +                self.put_in_file(llsd.format_pretty_xml(settings_install),
    6.17 +                                 "settings_install.xml",
    6.18 +                                 src="environment")
    6.19  
    6.20                  self.end_prefix("app_settings")
    6.21  

mercurial