merge changes for storm-1072

5e617d77 · Oz Linden · e0ca936f · 8bc82922 · 5e617d77 · 5e617d77
Commit 5e617d77 authored 14 years ago by Oz Linden
--- a/.hgignore
+++ b/.hgignore
@@ -11,7 +11,10 @@ syntax: glob
 *.DS_Store
 LICENSES
 indra/.distcc
-indra/build-darwin-*
+build-linux-*
+build-darwin-*
+build-vc80/
+build-vc100/
 indra/build-vc[0-9]*
 indra/CMakeFiles
 indra/lib/mono/1.0/*.dll

--- a/.hgtags
+++ b/.hgtags
@@ -82,6 +82,10 @@ f1827b441e05bf37c68e2c15ebc6d09e9b03f527 2.6.0-start
 9283d6d1d7eb71dfe4c330e7c9144857e7356bde 2.6.0-beta1
 9283d6d1d7eb71dfe4c330e7c9144857e7356bde DRTVWR-40_2.6.0-beta1
 c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-start
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 DRTVWR-43_2.6.1-beta1
+c5bdef3aaa2744626aef3c217ce29e1900d357b3 2.6.1-beta1
 9e4641f4a7870c0f565a25a2971368d5a29516a1 DRTVWR-41_2.6.0-beta2
 9e4641f4a7870c0f565a25a2971368d5a29516a1 2.6.0-beta2
 56b2778c743c2a964d82e1caf11084d76a87de2c 2.6.2-start
+42f32494bac475d0737799346f6831558ae8bf5d DRTVWR-39_2.6.0-release
+42f32494bac475d0737799346f6831558ae8bf5d 2.6.0-release
--- a/BuildParams
+++ b/BuildParams
@@ -61,14 +61,12 @@ viewer-release.viewer_channel = "Second Life Release"
 viewer-release.login_channel = "Second Life Release"
 viewer-release.build_debug_release_separately = true
 viewer-release.build_viewer_update_version_manager = true
-viewer-release.release-viewer.jira = DRTVWR-13
 viewer-pre-release.viewer_channel = "Second Life Release"
 viewer-pre-release.login_channel = "Second Life Release"
 viewer-pre-release.build_debug_release_separately = true
 viewer-pre-release.build_viewer_update_version_manager = true
-#viewer-pre-release.release-viewer.jira = DRTVWR-13
+viewer-pre-release.release-viewer.jira = DRTVWR-39
 # =======================================
 # brad
 # ========================================
@@ -157,6 +155,7 @@ media.build_viewer_update_version_manager = false
 # ================
 oz-viewer-devreview.build_debug_release_separately = true
+viewer-devreview.build_debug_release_separately = true
 oz_viewer-poreview.build_debug_release_separately = true
 oz-project-1.build_debug_release_separately = true
 oz-project-2.build_debug_release_separately = true
@@ -194,5 +193,23 @@ viewer-asset-delivery-metrics.email = monty@lindenlab.com
 viewer-asset-delivery-metrics.build_server = false
 viewer-asset-delivery-metrics.build_server_tests = false
+#==============================================================================
+# autobuild viewers
+#==============================================================================
+viewer-autobuild2010.build_debug_release_separately = true
+viewer-autobuild2010.viewer_channel = "Project Viewer - VS2010"
+viewer-autobuild2010.login_channel = "Project Viewer - VS2010"
+viewer-autobuild2010.viewer_grid = agni
+viewer-autobuild2010.build_link_parallel = false
+#======================================== 
+# VS2010 
+#======================================== 
+viewer-vs2010.viewer_channel = "Project Viewer - VS2010"
+viewer-vs2010.login_channel = "Project Viewer - VS2010"
+viewer-vs2010.viewer_grid = agni
+viewer-vs2010.build_debug_release_separately = true
+viewer-vs2010.build_viewer_update_version_manager = false
+viewer-vs2010.build_link_parallel = false
 # eof
--- a/autobuild.xml
+++ b/autobuild.xml
--- a/build.sh
+++ b/build.sh
@@ -22,12 +22,12 @@ build_dir_Darwin()
 build_dir_Linux()
 {
-  echo viewer-linux-i686-$(echo $1 | tr A-Z a-z)
+  echo build-linux-i686
 }
 build_dir_CYGWIN()
 {
-  echo build-vc80
+  echo build-vc100
 }
 installer_Darwin()
@@ -50,47 +50,18 @@ installer_CYGWIN()
 pre_build()
 {
  local variant="$1"
-  local build_dir="$2"
  begin_section "Pre$variant"
-  #export PATH="/cygdrive/c/Program Files/Microsoft Visual Studio 8/Common7/IDE/:$PATH"
+    "$AUTOBUILD" configure -c $variant -- -DPACKAGE:BOOL=ON -DRELEASE_CRASH_REPORTING:BOOL=ON -DUSE_PRECOMPILED_HEADERS=FALSE "-DVIEWER_CHANNEL:STRING=\"$viewer_channel\"" "-DVIEWER_LOGIN_CHANNEL:STRING=\"$viewer_login_channel\""
-  python develop.py \
-    --incredibuild \
-    --unattended \
-    -t $variant \
-    -G "$cmake_generator" \
-   configure \
-    -DGRID:STRING="$viewer_grid" \
-    -DVIEWER_CHANNEL:STRING="$viewer_channel" \
-    -DVIEWER_LOGIN_CHANNEL:STRING="$login_channel" \
-    -DINSTALL_PROPRIETARY:BOOL=ON \
-    -DRELEASE_CRASH_REPORTING:BOOL=ON \
-    -DLOCALIZESETUP:BOOL=ON \
-    -DPACKAGE:BOOL=ON \
-    -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
-    -DLL_TESTS:BOOL="$run_tests"
  end_section "Pre$variant"
 }
 build()
 {
  local variant="$1"
-  local build_dir="$2"
  if $build_viewer
  then
    begin_section "Viewer$variant"
-    if python develop.py \
+    if "$AUTOBUILD" build --no-configure -c $variant
-      --incredibuild \
-      --unattended \
-      -t $variant \
-      -G "$cmake_generator" \
-      build package
-#     && \
-#      python develop.py \
-#        --incredibuild \
-#      --unattended \
-#      -t $variant \
-#      -G "$cmake_generator" \
-#      build package
    then
      echo true >"$build_dir"/build_ok
    else
@@ -110,6 +81,7 @@ build_docs()
  end_section Docs
 }
 # Check to see if we were invoked from the wrapper, if not, re-exec ourselves from there
 if [ "x$arch" = x ]
 then
@@ -117,15 +89,11 @@ then
  if [ -x "$top/../buildscripts/hg/bin/build.sh" ]
  then
    exec "$top/../buildscripts/hg/bin/build.sh" "$top"
-  elif [ -r "$top/README" ]
-  then
-    cat "$top/README"
-    exit 1
  else
    cat <<EOF
 This script, if called in a development environment, requires that the branch
 independent build script repository be checked out next to this repository.
-This repository is located at http://hg.secondlife.com/buildscripts
+This repository is located at http://hg.lindenlab.com/parabuild/buildscripts
 EOF
    exit 1
  fi
@@ -138,7 +106,7 @@ eval '$build_'"$arch" || pass
 # File no longer exists in code-sep branch, so let's make sure it exists in order to use it.
 if test -f scripts/update_version_files.py ; then
  begin_section UpdateVer
-  scripts/update_version_files.py \
+  python scripts/update_version_files.py \
          --channel="$viewer_channel" \
          --server_channel="$server_channel" \
          --revision=$revision \
@@ -149,10 +117,53 @@ fi
 # Now retrieve the version for use in the version manager
 # First three parts only, $revision will be appended automatically.
-build_viewer_update_version_manager_version=`scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'`
+build_viewer_update_version_manager_version=`python scripts/get_version.py --viewer-version | sed 's/\.[0-9]*$//'`
+if [ -z "$AUTOBUILD" ]
+then
+  export autobuild_dir="$here/../../../autobuild/bin/"
+  if [ -d "$autobuild_dir" ]
+  then
+    export AUTOBUILD="$autobuild_dir"autobuild
+    if [ -x "$AUTOBUILD" ]
+    then
+      # *HACK - bash doesn't know how to pass real pathnames to native windows python
+      case "$arch" in
+      CYGWIN) AUTOBUILD=$(cygpath -u $AUTOBUILD.cmd) ;;
+      esac
+    else
+      record_failure "Not executable: $AUTOBUILD"
+      exit 1
+    fi
+  else
+    record_failure "Not found: $autobuild_dir"
+    exit 1
+  fi
+fi
+# load autbuild provided shell functions and variables
+# Merov: going back to the previous code that passes even if it fails catching a failure
+# TODO: use the correct code here under and fix the llbase import in python code
+#if "$AUTOBUILD" source_environment > source_environment
+#then
+#  . source_environment
+#else
+  # dump environment variables for debugging
+#  env|sort
+#  record_failure "autobuild source_environment failed"
+#  cat source_environment >&3
+#  exit 1
+#fi
+eval "$("$AUTOBUILD" source_environment)"
+# dump environment variables for debugging
+env|sort
+# Install packages.
+"$AUTOBUILD" install --skip-license-check
 # Now run the build
-cd indra
 succeeded=true
 build_processes=
 last_built_variant=
@@ -169,59 +180,11 @@ do
  build_dir_stubs="$build_dir/win_setup/$variant"
  rm -rf "$build_dir"
  mkdir -p "$build_dir"
+  mkdir -p "$build_dir/tmp"
+  #export TMP="$build_dir/tmp"
  if pre_build "$variant" "$build_dir" >> "$build_log" 2>&1
  then
-    if $build_coverity
+    if $build_link_parallel
-    then
-      mkdir -p "$build_dir/cvbuild"
-      coverity_config=`cygpath --windows "$coverity_dir/config/coverity_config.xml"`
-      coverity_tmpdir=`cygpath --windows "$build_dir/cvbuild"`
-      coverity_root=`cygpath --windows "$top/latest"`
-      case "$variant" in
-      Release)
-        begin_section Coverity
-        begin_section CovBuild
-        "$coverity_dir"/bin/cov-build\
-           --verbose 4 \
-           --config "$coverity_config"\
-           --dir "$coverity_tmpdir"\
-             python develop.py -t $variant -G "$cmake_generator" build "$coverity_product"\
-          >> "$build_log" 2>&1\
-         &&\
-        end_section CovBuild\
-         &&\
-        begin_section CovAnalyze\
-         &&\
-        "$coverity_dir"/bin/cov-analyze\
-           --security\
-           --concurrency\
-           --dir "$coverity_tmpdir"\
-          >> "$build_log" 2>&1\
-         &&\
-        end_section CovAnalyze\
-         &&\
-        begin_section CovCommit\
-         &&\
-        "$coverity_dir"/bin/cov-commit-defects\
-           --stream "$coverity_product"\
-           --dir "$coverity_tmpdir"\
-           --host "$coverity_server"\
-           --strip-path "$coverity_root"\
-           --target "$branch/$arch"\
-           --version "$revision"\
-           --description "$repo: $variant $revision"\
-           --user admin --password coverity\
-          >> "$build_log" 2>&1\
-          || record_failure "Coverity Build Failed"
-        # since any step could have failed, rely on the enclosing block to close any pending sub-blocks
-        end_section Coverity
-       ;;
-      esac
-      if test -r "$build_dir"/cvbuild/build-log.txt
-      then
-        upload_item log "$build_dir"/cvbuild/build-log.txt text/plain
-      fi
-    elif $build_link_parallel
    then
      begin_section BuildParallel
      ( build "$variant" "$build_dir" > "$build_dir/build.log" 2>&1 ) &
@@ -229,10 +192,7 @@ do
      end_section BuildParallel
    else
      begin_section "Build$variant"
-      build "$variant" "$build_dir" >> "$build_log" 2>&1
+      build "$variant" "$build_dir" 2>&1 | tee -a "$build_log" | grep --line-buffered "^##teamcity"
-      begin_section Tests
-      grep --line-buffered "^##teamcity" "$build_log"
-      end_section Tests
      if `cat "$build_dir/build_ok"`
      then
        echo so far so good.
@@ -261,15 +221,13 @@ then
    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" | grep --line-buffered "^##teamcity"
    if `cat "$build_dir/build_ok"`
    then
      echo so far so good.
    else
      record_failure "Parallel build of \"$variant\" failed."
    fi
-    begin_section Tests
-    tee -a $build_log < "$build_dir/build.log" | grep --line-buffered "^##teamcity"
-    end_section Tests
    end_section "Build$variant"
  done
  end_section WaitParallel

--- a/doc/contributions.txt
+++ b/doc/contributions.txt
 Linden Lab would like to acknowledge source code contributions from the
 following residents. The Second Life resident name is given below,
 along with the issue identifier corresponding to the patches we've
-received from them. To see more about these contributions, visit the
+received from them.
-browsable version: http://wiki.secondlife.com/wiki/Source_contributions
 Able Whitman
 	VWR-650
@@ -410,9 +409,14 @@ Jonathan Yap
 	VWR-17801
 	VWR-24347
 	STORM-975
-	STORM-990
+	STORM-1019
+	STORM-844
+	STORM-643
 	STORM-1020
 	STORM-1064
+	STORM-960
+	STORM-1077
+	STORM-953
 Kage Pixel
 	VWR-11
 Ken March
@@ -573,6 +577,10 @@ Nicholaz Beresford
 	VWR-2412
 	VWR-2682
 	VWR-2684
+Nicky Perian
+	OPEN-1
+	OPEN-1087
+	STORM-1090
 Nounouch Hapmouche
 	VWR-238
 Patric Mills
@@ -642,6 +650,7 @@ Robin Cornelius
 	SNOW-747
 	STORM-422
 	STORM-960
+	STORM-1019
 	VWR-2488
 	VWR-9557
 	VWR-10579
@@ -836,6 +845,8 @@ Whoops Babii
 Wilton Lundquist
 	VWR-7682
 WolfPup Lowenhar
+	OPEN-1
+	OPEN-37
 	SNOW-622
 	SNOW-772
 	STORM-102

--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -103,7 +103,7 @@ if (VIEWER)
 endif (VIEWER)
 # Linux builds the viewer and server in 2 separate projects
-# In order for ./develop.py build server to work on linux, 
+# In order for build server to work on linux, 
 # the viewer project needs a server target.
 # This is not true for mac and windows.
 if (LINUX) 

--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -7,10 +7,10 @@ include(Variables)
 # Portable compilation flags.
 set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -DLL_DEBUG=1")
 set(CMAKE_CXX_FLAGS_RELEASE
-    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DNDEBUG") 
+    "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -DNDEBUG") 
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-    "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
+    "-DLL_RELEASE=1 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 # Configure crash reporting
 set(RELEASE_CRASH_REPORTING OFF CACHE BOOL "Enable use of crash reporting in release builds")
@@ -36,13 +36,13 @@ if (WINDOWS)
  # Don't build DLLs.
  set(BUILD_SHARED_LIBS OFF)
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP"
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Od /Zi /MDd /MP -D_SCL_SECURE_NO_WARNINGS=1"
      CACHE STRING "C++ compiler debug options" FORCE)
  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2"
+      "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MD /MP /Ob2 -D_SECURE_STL=0"
      CACHE STRING "C++ compiler release-with-debug options" FORCE)
  set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2"
+      "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
      CACHE STRING "C++ compiler release options" FORCE)
  set(CMAKE_CXX_STANDARD_LIBRARIES "")
@@ -59,17 +59,8 @@ if (WINDOWS)
      /Zc:forScope
      /nologo
      /Oy-
-      )
-  if(MSVC80 OR MSVC90)
-    set(CMAKE_CXX_FLAGS_RELEASE
-      "${CMAKE_CXX_FLAGS_RELEASE} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
-      CACHE STRING "C++ compiler release options" FORCE)
-    add_definitions(
      /Zc:wchar_t-
      )
-  endif (MSVC80 OR MSVC90)
  # Are we using the crummy Visual Studio KDU build workaround?
  if (NOT VS_DISABLE_FATAL_WARNINGS)

--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -32,27 +32,21 @@ else (STANDALONE)
      )
  elseif (DARWIN)
    if (LLCOMMON_LINK_SHARED)
-      set(APR_selector     "0.3.7.dylib")
+      set(APR_selector     "0.dylib")
-      set(APRUTIL_selector "0.3.8.dylib")
+      set(APRUTIL_selector "0.dylib")
    else (LLCOMMON_LINK_SHARED)
      set(APR_selector     "a")
      set(APRUTIL_selector "a")
    endif (LLCOMMON_LINK_SHARED)
-    set(APR_LIBRARIES 
+    set(APR_LIBRARIES libapr-1.${APR_selector})
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.${APR_selector}
+    set(APRUTIL_LIBRARIES libaprutil-1.${APRUTIL_selector})
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.${APR_selector}
-      )
-    set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.${APRUTIL_selector}
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.${APRUTIL_selector}
-      )
    set(APRICONV_LIBRARIES iconv)
  else (WINDOWS)
    set(APR_LIBRARIES apr-1)
    set(APRUTIL_LIBRARIES aprutil-1)
    set(APRICONV_LIBRARIES iconv)
  endif (WINDOWS)
-  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/apr-1)
+  set(APR_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/apr-1)
  if (LINUX)
    if (VIEWER)

--- a/indra/cmake/BerkeleyDB.cmake
+++ b/indra/cmake/BerkeleyDB.cmake
@@ -8,7 +8,8 @@ if (STANDALONE)
 else (STANDALONE)
  if (LINUX)
    # Need to add dependency pthread explicitely to support ld.gold.
-    set(DB_LIBRARIES db-4.2 pthread)
+    use_prebuilt_binary(db)
+    set(DB_LIBRARIES db-5.1 pthread)
  else (LINUX)
    set(DB_LIBRARIES db-4.2)
  endif (LINUX)

--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -10,23 +10,15 @@ if (STANDALONE)
  set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
  set(BOOST_REGEX_LIBRARY boost_regex-mt)
  set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+  set(BOOST_SYSTEM_LIBRARY boost_system-mt)
+  set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
 else (STANDALONE)
  use_prebuilt_binary(boost)
  set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
  if (WINDOWS)
-    set(BOOST_VERSION 1_39)
+    set(BOOST_VERSION 1_45)
-    if (MSVC71)
+    if(MSVC80)
-      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
-          optimized libboost_program_options-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_program_options-vc71-mt-sgd-${BOOST_VERSION})
-      set(BOOST_REGEX_LIBRARY
-          optimized libboost_regex-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_regex-vc71-mt-sgd-${BOOST_VERSION})
-      set(BOOST_SIGNALS_LIBRARY 
-          optimized libboost_signals-vc71-mt-s-${BOOST_VERSION}
-          debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION})
-    else (MSVC71)
      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
          optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
          debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
@@ -36,14 +28,31 @@ else (STANDALONE)
      set(BOOST_SIGNALS_LIBRARY 
          optimized libboost_signals-vc80-mt-${BOOST_VERSION}
          debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
-    endif (MSVC71)
+      set(BOOST_SYSTEM_LIBRARY 
-  elseif (DARWIN)
+          optimized libboost_system-vc80-mt-${BOOST_VERSION}
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
+          debug libboost_system-vc80-mt-gd-${BOOST_VERSION})
-    set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt)
+      set(BOOST_FILESYSTEM_LIBRARY 
-    set(BOOST_SIGNALS_LIBRARY boost_signals-xgcc40-mt)
+          optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
-  elseif (LINUX)
+          debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt)
+    else(MSVC80)
-    set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt)
+      # MSVC 10.0 config
-    set(BOOST_SIGNALS_LIBRARY boost_signals-gcc41-mt)
+      set(BOOST_PROGRAM_OPTIONS_LIBRARY 
+          optimized libboost_program_options-vc100-mt-${BOOST_VERSION}
+          debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION})
+      set(BOOST_REGEX_LIBRARY
+          optimized libboost_regex-vc100-mt-${BOOST_VERSION}
+          debug libboost_regex-vc100-mt-gd-${BOOST_VERSION})
+      set(BOOST_SYSTEM_LIBRARY 
+          optimized libboost_system-vc100-mt-${BOOST_VERSION}
+          debug libboost_system-vc100-mt-gd-${BOOST_VERSION})
+      set(BOOST_FILESYSTEM_LIBRARY 
+          optimized libboost_filesystem-vc100-mt-${BOOST_VERSION}
+          debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})    
+    endif (MSVC80)
+  elseif (DARWIN OR LINUX)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
+    set(BOOST_REGEX_LIBRARY boost_regex)
+    set(BOOST_SYSTEM_LIBRARY boost_system)
+    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
  endif (WINDOWS)
 endif (STANDALONE)
--- a/indra/cmake/CARes.cmake
+++ b/indra/cmake/CARes.cmake
@@ -13,10 +13,7 @@ else (STANDALONE)
    if (WINDOWS)
        set(CARES_LIBRARIES areslib)
    elseif (DARWIN)
-        set(CARES_LIBRARIES
+       set(CARES_LIBRARIES cares)
-          optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libcares.a
-          debug ${ARCH_PREBUILT_DIRS_DEBUG}/libcares.a
-          )
    else (WINDOWS)
        set(CARES_LIBRARIES cares)
    endif (WINDOWS)

--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -20,7 +20,6 @@ set(cmake_SOURCE_FILES
    CSharpMacros.cmake
    DBusGlib.cmake
    DirectX.cmake
-    ELFIO.cmake
    EXPAT.cmake
    FindAPR.cmake
    FindBerkeleyDB.cmake
@@ -29,7 +28,6 @@ set(cmake_SOURCE_FILES
    FindFMOD.cmake
    FindGooglePerfTools.cmake
    FindMono.cmake
-    FindMT.cmake
    FindMySQL.cmake
    FindOpenJPEG.cmake
    FindXmlRpcEpi.cmake
@@ -85,7 +83,6 @@ source_group("Shared Rules" FILES ${cmake_SOURCE_FILES})
 set(master_SOURCE_FILES
    ../CMakeLists.txt
-    ../develop.py
    )
 if (SERVER)

--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -5,6 +5,7 @@
 # VisualStudio.
 include(CMakeCopyIfDifferent)
+include(Linking)
 ###################################################################
 # set up platform specific lists of files that need to be copied
@@ -16,7 +17,7 @@ if(WINDOWS)
    #*******************************
    # VIVOX - *NOTE: no debug version
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-win32")
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
    set(vivox_files
        SLVoice.exe
        libsndfile-1.dll
@@ -30,24 +31,24 @@ if(WINDOWS)
    #*******************************
    # Misc shared libs 
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
-    # or ARCH_PREBUILT_DIRS
-    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug")
    set(debug_files
        openjpegd.dll
        libapr-1.dll
        libaprutil-1.dll
        libapriconv-1.dll
+        ssleay32.dll
+        libeay32.dll
        )
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    # or ARCH_PREBUILT_DIRS
-    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release")
    set(release_files
        openjpeg.dll
        libapr-1.dll
        libaprutil-1.dll
        libapriconv-1.dll
+        ssleay32.dll
+        libeay32.dll
        )
    if(USE_GOOGLE_PERFTOOLS)
@@ -121,6 +122,62 @@ if (MSVC80)
        set(third_party_targets ${third_party_targets} ${out_targets})
    endif (EXISTS ${release_msvc8_redist_path})
+elseif (MSVC_VERSION EQUAL 1600) # VisualStudio 2010
+    FIND_PATH(debug_msvc10_redist_path msvcr100d.dll
+        PATHS
+        ${MSVC_DEBUG_REDIST_PATH}
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC100.DebugCRT
+        NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
+        )
+    if(EXISTS ${debug_msvc10_redist_path})
+        set(debug_msvc10_files
+            msvcr100d.dll
+            msvcp100d.dll
+            )
+        copy_if_different(
+            ${debug_msvc10_redist_path}
+            "${SHARED_LIB_STAGING_DIR_DEBUG}"
+            out_targets
+            ${debug_msvc10_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
+    endif ()
+    FIND_PATH(release_msvc10_redist_path msvcr100.dll
+        PATHS
+        ${MSVC_REDIST_PATH}
+         [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\10.0\\Setup\\VC;ProductDir]/redist/x86/Microsoft.VC100.CRT
+        NO_DEFAULT_PATH
+        NO_DEFAULT_PATH
+        )
+    if(EXISTS ${release_msvc10_redist_path})
+        set(release_msvc10_files
+            msvcr100.dll
+            msvcp100.dll
+            )
+        copy_if_different(
+            ${release_msvc10_redist_path}
+            "${SHARED_LIB_STAGING_DIR_RELEASE}"
+            out_targets
+            ${release_msvc10_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
+        copy_if_different(
+            ${release_msvc10_redist_path}
+            "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
+            out_targets
+            ${release_msvc10_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
+    endif ()
 endif (MSVC80)
 elseif(DARWIN)
@@ -128,7 +185,7 @@ elseif(DARWIN)
    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/Resources")
    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/Release/Resources")
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/universal-darwin")
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
    set(vivox_files
        SLVoice
        libsndfile.dylib
@@ -137,20 +194,16 @@ elseif(DARWIN)
        libvivoxplatform.dylib
        libvivoxsdk.dylib
       )
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
-    # or ARCH_PREBUILT_DIRS
-    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_debug")
    set(debug_files
       )
-    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
-    # or ARCH_PREBUILT_DIRS
-    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release")
    set(release_files
-        libapr-1.0.3.7.dylib
+        libapr-1.0.dylib
        libapr-1.dylib
-        libaprutil-1.0.3.8.dylib
+        libaprutil-1.0.dylib
        libaprutil-1.dylib
-        libexpat.0.5.0.dylib
+        libexpat.1.5.2.dylib
        libexpat.dylib
        libllqtwebkit.dylib
        libndofdev.dylib
@@ -167,7 +220,7 @@ elseif(LINUX)
    set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
-    set(vivox_src_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")
+    set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
    set(vivox_files
        libsndfile.so.1
        libortp.so
@@ -178,20 +231,20 @@ elseif(LINUX)
       )
    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
    # or ARCH_PREBUILT_DIRS
-    set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_debug")
+    set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
    set(debug_files
       )
    # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
    # or ARCH_PREBUILT_DIRS
-    set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-linux/lib_release_client")
+    set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
    # *FIX - figure out what to do with duplicate libalut.so here -brad
    set(release_files
        libapr-1.so.0
        libaprutil-1.so.0
        libatk-1.0.so
        libbreakpad_client.so.0
-        libcrypto.so.0.9.7
+        libcrypto.so.0.9.8
-        libdb-4.2.so
+        libdb-5.1.so
        libexpat.so
        libexpat.so.1
        libgmock_main.so
@@ -203,10 +256,11 @@ elseif(LINUX)
        libopenal.so
        libopenjpeg.so
        libssl.so
-        libstacktrace.so
        libtcmalloc.so
-        libuuid.so.1
+        libuuid.so.16
-        libssl.so.0.9.7
+        libuuid.so.16.0.22
+        libssl.so.0.9.8
+        libfontconfig.so.1.4.4
       )
    if (FMOD)

--- a/indra/cmake/DBusGlib.cmake
+++ b/indra/cmake/DBusGlib.cmake
@@ -10,7 +10,7 @@ elseif (LINUX)
  use_prebuilt_binary(dbusglib)
  set(DBUSGLIB_FOUND ON FORCE BOOL)
  set(DBUSGLIB_INCLUDE_DIRS
-      ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
+      ${LIBS_PREBUILT_DIR}/include/dbus
      )
  # We don't need to explicitly link against dbus-glib itself, because
  # the viewer probes for the system's copy at runtime.

--- a/indra/cmake/DirectX.cmake
+++ b/indra/cmake/DirectX.cmake
@@ -3,6 +3,7 @@
 if (VIEWER AND WINDOWS)
  find_path(DIRECTX_INCLUDE_DIR dxdiag.h
            "$ENV{DXSDK_DIR}/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Include"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include"
@@ -24,6 +25,7 @@ if (VIEWER AND WINDOWS)
  find_path(DIRECTX_LIBRARY_DIR dxguid.lib
            "$ENV{DXSDK_DIR}/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2009)/Lib/x86"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86"
            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86"

--- a/indra/cmake/ELFIO.cmake
+++ b/indra/cmake/ELFIO.cmake
-# -*- cmake -*-
-include(Prebuilt)
-set(ELFIO_FIND_QUIETLY ON)
-if (STANDALONE)
-  include(FindELFIO)
-elseif (LINUX)
-  use_prebuilt_binary(elfio)
-  set(ELFIO_LIBRARIES ELFIO)
-  set(ELFIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
-  set(ELFIO_FOUND "YES")
-endif (STANDALONE)
-if (ELFIO_FOUND)
-  add_definitions(-DLL_ELFBIN=1)
-else (ELFIO_FOUND)
-  set(ELFIO_INCLUDE_DIR "")
-endif (ELFIO_FOUND)
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
 # -*- cmake -*-
+# FMOD can be set when launching the make using the argument -DFMOD:BOOL=ON
+# When building using proprietary binaries though (i.e. having access to LL private servers),
+# we always build with FMOD.
+# Open source devs should use the -DFMOD:BOOL=ON then if they want to build with FMOD, whether
+# they are using STANDALONE or not.
+if (INSTALL_PROPRIETARY)
  set(FMOD ON CACHE BOOL "Use FMOD sound library.")
+endif (INSTALL_PROPRIETARY)
 if (FMOD)
  if (STANDALONE)
+    # In that case, we use the version of the library installed on the system
    set(FMOD_FIND_REQUIRED ON)
    include(FindFMOD)
  else (STANDALONE)
-    if (INSTALL_PROPRIETARY)
+    if (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+	  # If the path have been specified in the arguments, use that
+      set(FMOD_LIBRARIES ${FMOD_LIBRARY})
+	  MESSAGE(STATUS "Using FMOD path: ${FMOD_LIBRARIES}, ${FMOD_INCLUDE_DIR}")
+    else (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
+	  # If not, we're going to try to get the package listed in autobuild.xml
+	  # Note: if you're not using INSTALL_PROPRIETARY, the package URL should be local (file:/// URL) 
+	  # as accessing the private LL location will fail if you don't have the credential
 	  include(Prebuilt)
 	  use_prebuilt_binary(fmod)    
-    endif (INSTALL_PROPRIETARY)
      if (WINDOWS)
        set(FMOD_LIBRARY fmod)
      elseif (DARWIN)
@@ -19,8 +32,8 @@ if (FMOD)
      elseif (LINUX)
        set(FMOD_LIBRARY fmod-3.75)
      endif (WINDOWS)
+      set(FMOD_LIBRARIES ${FMOD_LIBRARY})
-    SET(FMOD_LIBRARIES ${FMOD_LIBRARY})
      set(FMOD_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
+    endif (FMOD_LIBRARY AND FMOD_INCLUDE_DIR)
  endif (STANDALONE)
 endif (FMOD)
--- a/indra/cmake/FindAutobuild.cmake
+++ b/indra/cmake/FindAutobuild.cmake
+# -*- cmake -*-
+#
+# Find the autobuild tool
+#
+# Output variables:
+#
+#   AUTOBUILD_EXECUTABLE - path to autobuild or pautobuild executable
+# *TODO - if cmake was executed by autobuild, autobuild will have set the AUTOBUILD env var
+# update this to check for that case
+IF (NOT AUTOBUILD_EXECUTABLE)
+    IF(WIN32)
+      SET(AUTOBUILD_EXE_NAMES autobuild.cmd autobuild.exe)
+    ELSE(WIN32)
+      SET(AUTOBUILD_EXE_NAMES autobuild)
+    ENDIF(WIN32)
+    SET(AUTOBUILD_EXECUTABLE)
+    FIND_PROGRAM(
+      AUTOBUILD_EXECUTABLE 
+      NAMES ${AUTOBUILD_EXE_NAMES}
+      PATHS 
+	ENV PATH
+	${CMAKE_SOURCE_DIR}/.. 
+	${CMAKE_SOURCE_DIR}/../..
+	${CMAKE_SOURCE_DIR}/../../..
+      PATH_SUFFIXES "/autobuild/bin/"
+    )
+    IF (AUTOBUILD_EXECUTABLE)
+      GET_FILENAME_COMPONENT(_autobuild_name ${AUTOBUILD_EXECUTABLE} NAME_WE)
+      MESSAGE(STATUS "Using autobuild at: ${AUTOBUILD_EXECUTABLE}")
+    ELSE (AUTOBUILD_EXECUTABLE)
+      IF (AUTOBUILD_FIND_REQUIRED)
+	MESSAGE(FATAL_ERROR "Could not find autobuild executable")
+      ENDIF (AUTOBUILD_FIND_REQUIRED)
+    ENDIF (AUTOBUILD_EXECUTABLE)
+    MARK_AS_ADVANCED(AUTOBUILD_EXECUTABLE)
+ENDIF (NOT AUTOBUILD_EXECUTABLE)
--- a/indra/cmake/FindFMOD.cmake
+++ b/indra/cmake/FindFMOD.cmake
@@ -11,7 +11,7 @@
 FIND_PATH(FMOD_INCLUDE_DIR fmod.h PATH_SUFFIXES fmod)
-SET(FMOD_NAMES ${FMOD_NAMES} fmod fmodvc fmod-3.75)
+SET(FMOD_NAMES ${FMOD_NAMES} fmod fmodvc fmodex fmod-3.75)
 FIND_LIBRARY(FMOD_LIBRARY
  NAMES ${FMOD_NAMES}
  PATH_SUFFIXES fmod