From 0fedc97f3f9bb83e93624343072c9b3dd62c63ae Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 30 May 2018 10:32:47 -0400
Subject: always run tests

---
 build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.sh b/build.sh
index cf18c3f541..1196cb3813 100755
--- a/build.sh
+++ b/build.sh
@@ -125,7 +125,6 @@ pre_build()
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
      -DVIEWER_CHANNEL:STRING="${viewer_channel}" \
      -DGRID:STRING="\"$viewer_grid\"" \
-     -DLL_TESTS:BOOL="$run_tests" \
      -DTEMPLATE_VERIFIER_OPTIONS:STRING="$template_verifier_options" $template_verifier_master_url \
      "${SIGNING[@]}" \
     || fatal "$variant configuration failed"
-- 
cgit v1.2.3


From 837ca22924a4fc3ade6d592bc75c7921a6f4e668 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 30 May 2018 10:36:23 -0400
Subject: set shell nullglob option

so that when a glob has no expansion you don't get the glob back (
*.sh expands to empty rather than to "*.sh")
---
 build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.sh b/build.sh
index 1196cb3813..b85e254c15 100755
--- a/build.sh
+++ b/build.sh
@@ -204,6 +204,8 @@ then
     exit 1
 fi
 
+shopt -s nullglob # if nothing matches a glob, expand to nothing
+
 initialize_build # provided by master buildscripts build.sh
 
 begin_section "autobuild initialize"
-- 
cgit v1.2.3


From d2fa5a53e8b91bd0aba10ab3917c722dc360b610 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Wed, 30 May 2018 13:14:43 -0400
Subject: remove unused UNATTENDED cmake variable that generates warnings

---
 build.sh                     |  1 -
 indra/cmake/Variables.cmake  |  1 -
 indra/newview/CMakeLists.txt | 26 ++++++++++++--------------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/build.sh b/build.sh
index b85e254c15..efe96a0a6a 100755
--- a/build.sh
+++ b/build.sh
@@ -120,7 +120,6 @@ pre_build()
 
     "$autobuild" configure --quiet -c $variant -- \
      -DPACKAGE:BOOL=ON \
-     -DUNATTENDED:BOOL=ON \
      -DHAVOK:BOOL="$HAVOK" \
      -DRELEASE_CRASH_REPORTING:BOOL="$RELEASE_CRASH_REPORTING" \
      -DVIEWER_CHANNEL:STRING="${viewer_channel}" \
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index bd69c49856..b913d6398e 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -209,7 +209,6 @@ set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if
 
 set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
 set(USESYSTEMLIBS OFF CACHE BOOL "Use libraries from your system rather than Linden-supplied prebuilt libraries.")
-set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.")
 
 set(USE_PRECOMPILED_HEADERS ON CACHE BOOL "Enable use of precompiled header directives where supported.")
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index cf275ef4b5..6b3db36efe 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1853,23 +1853,21 @@ if (WINDOWS)
 
     add_dependencies(${VIEWER_BINARY_NAME}
       SLPlugin
-   windows-crash-logger
+      windows-crash-logger
     )
 
     # sets the 'working directory' for debugging from visual studio.
-    if (NOT UNATTENDED)
-        add_custom_command(
-            TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-            COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
-            ARGS
-              --solution
-              ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
-              --workingdir
-              ${VIEWER_BINARY_NAME}
-              "${CMAKE_CURRENT_SOURCE_DIR}"
-            COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
-            )
-    endif (NOT UNATTENDED)
+    add_custom_command(
+        TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+        COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
+        ARGS
+          --solution
+          ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.sln
+          --workingdir
+          ${VIEWER_BINARY_NAME}
+          "${CMAKE_CURRENT_SOURCE_DIR}"
+        COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
+        )
 
     if (PACKAGE)
       add_custom_command(
-- 
cgit v1.2.3