Further CI/CD & building sync with alchemy

Reorder Variables.cmake for mergeability Renames CMake Variables: FMODSTUDIO->USE_FMODSTUDIO, NVAPI->USE_NVAPI, VIEWER_CHANNEL_BASE->VIEWER_CHANNEL_TYPE VIEWER_BRANDING_ID->VIEWER_BINARY_NAME, VIEWER_PRODUCT_NAME->VIEWER_CHANNEL_BASE Remove unused variables: VIEWER_PACKAGE_ID, VIEWER_EXE_STRING, VIEWER_SHORTCUT_STRING, VERSION_BUILD PACKAGE now defaults to on, USE_FMODSTUDIO now defaults to off Use list append instead of set in some more places Adds support for Project channels.
2019-12-17 19:31:08 -05:00
parent f25577649a
commit f3609b06d7
7 changed files with 248 additions and 89 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 variables:
  GIT_SUBMODULE_STRATEGY: recursive

-build:staging:windows32:
+build:master:windows32:
  stage: build
  tags:
    - autobuild
@@ -13,17 +13,17 @@ build:staging:windows32:
  before_script:
    - pipenv install
  script:
-    - pipenv run autobuild configure -c Release -A32 -- -DFMODSTUDIO=ON -DNVAPI=ON -DUSE_LTO=OFF -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN" -DVIEWER_CHANNEL_BASE:STRING="Alpha" -DPACKAGE=ON
+    - pipenv run autobuild configure -c Release -A32 -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DVIEWER_CHANNEL_TYPE="Test"
    - pipenv run autobuild build -c Release -A32 --no-configure
-    - sentry-cli upload-dif SingularityAlphaViewer.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll glod.dll
  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 2 week
    paths:
      - build-vc-32/newview/Release/Singularity*Setup.exe
  only:
-    refs:
-      - master
-      
-build:staging:windows64:
+    - schedules
+
+build:master:windows64:
  stage: build
  tags:
    - autobuild
@@ -31,28 +31,191 @@ build:staging:windows64:
  before_script:
    - pipenv install
  script:
-    - pipenv run autobuild configure -c Release -A64 -- -DFMODSTUDIO=ON -DNVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN" -DVIEWER_CHANNEL_BASE:STRING="Alpha" -DPACKAGE=ON
+    - pipenv run autobuild configure -c Release -A64 -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DVIEWER_CHANNEL_TYPE="Test"
    - pipenv run autobuild build -c Release -A64 --no-configure
-    - sentry-cli upload-dif SingularityAlphaViewer.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb libhunspell.dll libhunspell.pdb vcruntime140.dll msvcp140.dll glod.dll
  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 2 week
    paths:
      - build-vc-64/newview/Release/Singularity*Setup.exe
  only:
-    refs:
-      - master
-      
-deploy:staging:
+    - schedules
+
+build:project:windows32:
+  stage: build
+  tags:
+    - autobuild
+    - windows
+  before_script:
+    - pipenv install
+  script:
+    - $env:VIEWER_CHANNEL_CODENAME = $env:CI_COMMIT_REF_NAME[8..100] -join ''
+    - pipenv run autobuild configure -c Release -A32 -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN_NONPROD" -DVIEWER_CHANNEL_TYPE="Project" -DVIEWER_CHANNEL_CODENAME="$env:VIEWER_CHANNEL_CODENAME"
+    - pipenv run autobuild build -c Release -A32 --no-configure
+    - cd build-vc-32/newview/Release/
+    - $env:SENTRY_PROJECT = $env:SENTRY_PROJECT_NONPROD
+    - sentry-cli upload-dif singularity-bin.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll glod.dll
+  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 2 week
+    paths:
+      - build-vc-32/newview/Release/Singularity*Setup.exe
+  only:
+    - /^project-.*$/
+    - schedules
+  except:
+    - beta
+    - release
+
+build:project:windows64:
+  stage: build
+  tags:
+    - autobuild
+    - windows
+  before_script:
+    - pipenv install
+  script:
+    - $env:VIEWER_CHANNEL_CODENAME = $env:CI_COMMIT_REF_NAME[8..100] -join ''
+    - pipenv run autobuild configure -c Release -A64 -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN_NONPROD" -DVIEWER_CHANNEL_TYPE="Project" -DVIEWER_CHANNEL_CODENAME="$env:VIEWER_CHANNEL_CODENAME"
+    - pipenv run autobuild build -c Release -A64 --no-configure
+    - cd build-vc-64/newview/Release/
+    - $env:SENTRY_PROJECT = $env:SENTRY_PROJECT_NONPROD
+    - sentry-cli upload-dif singularity-bin.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll libhunspell.dll libhunspell.pdb glod.dll
+  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 2 week
+    paths:
+      - build-vc-64/newview/Release/Singularity*Setup.exe
+  only:
+    - /^project-.*$/
+    - schedules
+  except:
+    - beta
+    - release
+
+build:beta:windows32:
+  stage: build
+  tags:
+    - autobuild
+    - windows
+  before_script:
+    - pipenv install
+  script:
+    - pipenv run autobuild configure -c Release -A32 -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN_PROD" -DVIEWER_CHANNEL_TYPE="Beta"
+    - pipenv run autobuild build -c Release -A32 --no-configure
+    - cd build-vc-32/newview/Release/
+    - $env:SENTRY_PROJECT = $env:SENTRY_PROJECT_PROD
+    - sentry-cli upload-dif singularity-bin.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll glod.dll
+  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 2 week
+    paths:
+      - build-vc-32/newview/Release/Singularity*Setup.exe
+  only:
+    - beta
+    - schedules
+  except:
+    - /^project-.*$/
+    - release
+
+build:beta:windows64:
+  stage: build
+  tags:
+    - autobuild
+    - windows
+  before_script:
+    - pipenv install
+  script:
+    - pipenv run autobuild configure -c Release -A64 -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN_PROD" -DVIEWER_CHANNEL_TYPE="Beta"
+    - pipenv run autobuild build -c Release -A64 --no-configure
+    - cd build-vc-64/newview/Release/
+    - $env:SENTRY_PROJECT = $env:SENTRY_PROJECT_PROD
+    - sentry-cli upload-dif singularity-bin.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll libhunspell.dll libhunspell.pdb glod.dll
+  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 2 week
+    paths:
+      - build-vc-64/newview/Release/Singularity*Setup.exe
+  only:
+    - beta
+    - schedules
+  except:
+    - /^project-.*$/
+    - release
+
+build:release:windows32:
+  stage: build
+  tags:
+    - autobuild
+    - windows
+  before_script:
+    - pipenv install
+  script:
+    - pipenv run autobuild configure -c Release -A32 -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN_PROD" -DVIEWER_CHANNEL_TYPE="Beta"
+    - pipenv run autobuild build -c Release -A32 --no-configure
+    - cd build-vc-32/newview/Release/
+    - $env:SENTRY_PROJECT = $env:SENTRY_PROJECT_PROD
+    - sentry-cli upload-dif singularity-bin.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll glod.dll
+  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 2 week
+    paths:
+      - build-vc-32/newview/Release/Singularity*Setup.exe
+  only:
+    - release
+    - schedules
+  except:
+    - /^project-.*$/
+    - beta
+
+build:release:windows64:
+  stage: build
+  tags:
+    - autobuild
+    - windows
+  before_script:
+    - pipenv install
+  script:
+    - pipenv run autobuild configure -c Release -A64 -- -DUSE_FMODSTUDIO=ON -DUSE_NVAPI=ON -DUSE_LTO=ON -DVS_DISABLE_FATAL_WARNINGS=ON -DUSE_CRASHPAD=ON -DCRASHPAD_URL="$env:SENTRY_DSN_PROD" -DVIEWER_CHANNEL_TYPE="Beta"
+    - pipenv run autobuild build -c Release -A64 --no-configure
+    - cd build-vc-64/newview/Release/
+    - $env:SENTRY_PROJECT = $env:SENTRY_PROJECT_PROD
+    - sentry-cli upload-dif singularity-bin.exe singularity-bin.pdb crashpad_handler.exe crashpad_handler.pdb fmod.dll libcrypto-1_1-x64.dll libcrypto-1_1-x64.pdb libssl-1_1-x64.dll libssl-1_1-x64.pdb vcruntime140.dll msvcp140.dll libhunspell.dll libhunspell.pdb glod.dll
+  artifacts:
+    name: "$env:CI_COMMIT_REF_NAME-$env:CI_COMMIT_SHORT_SHA"
+    expire_in: 2 week
+    paths:
+      - build-vc-64/newview/Release/Singularity*Setup.exe
+  only:
+    - release
+    - schedules
+  except:
+    - /^project-.*$/
+    - beta
+
+deploy:nexus:
  stage: deploy
  tags:
    - autobuild
    - windows
  script:
+    - $UploadDestDirLower = $env:CI_COMMIT_REF_NAME.ToLower().Replace("-", "/")
+    - $UploadDestDirLower
+    - $UploadDestVer = $($(Get-Content .\indra\newview\VIEWER_VERSION.txt) + "." + $(git rev-list HEAD --count | Out-String)).trim()
+    - $UploadDestVer
    - mkdir upload
    - cp build-vc-*/newview/Release/Singularity*Setup.exe upload/
-    - $FileNameWin32 = Get-ChildItem -Path . -Name -Include upload/Singularity*_i686_Setup.exe
-    - curl.exe -v --user "$env:AUTOBUILD_HTTP_USER:$env:AUTOBUILD_HTTP_PASS" --upload-file ./$FileNameWin32 https://pkg.alchemyviewer.org/repository/singularity-project/alpha/$FileNameWin32
-    - $FileNameWin64 = Get-ChildItem -Path . -Name -Include upload/Singularity*_x86_64_Setup.exe
-    - curl.exe -v --user "$env:AUTOBUILD_HTTP_USER:$env:AUTOBUILD_HTTP_PASS" --upload-file ./$FileNameWin64 https://pkg.alchemyviewer.org/repository/singularity-project/alpha/$FileNameWin64
+    - cd upload
+    - $FileNameWin32 = Get-ChildItem -Path . -Name -Include Singularity_*_i686_Setup.exe
+    - $FileNameWin32
+    - curl.exe -v --user "${env:AUTOBUILD_HTTP_USER}:${env:AUTOBUILD_HTTP_PASS}" --upload-file $FileNameWin32 "https://pkg.alchemyviewer.org/repository/viewer/singularity/${UploadDestDirLower}/${UploadDestVer}/${FileNameWin32}"
+    - $FileNameWin64 = Get-ChildItem -Path . -Name -Include Singularity_*_x86_64_Setup.exe
+    - $FileNameWin64
+    - curl.exe -v --user "${env:AUTOBUILD_HTTP_USER}:${env:AUTOBUILD_HTTP_PASS}" --upload-file $FileNameWin64 "https://pkg.alchemyviewer.org/repository/viewer/singularity/${UploadDestDirLower}/${UploadDestVer}/${FileNameWin64}"
+  when: manual
  only:
-    - master
-
+    - /^project-.*$/
+    - beta
+    - release
+  except:
+    - master
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -82,19 +82,19 @@ if(WINDOWS)
    endif(ADDRESS_SIZE EQUAL 64)
 		
    if(NOT DISABLE_TCMALLOC)
-      set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll)
-      set(release_files ${release_files} libtcmalloc_minimal.dll)
+      list(APPEND debug_files libtcmalloc_minimal-debug.dll)
+      list(APPEND release_files libtcmalloc_minimal.dll)
    endif(NOT DISABLE_TCMALLOC)

    if(OPENAL)
-      set(debug_files ${debug_files} alut.dll OpenAL32.dll)
-      set(release_files ${release_files} alut.dll OpenAL32.dll)
+      list(APPEND debug_files alut.dll OpenAL32.dll)
+      list(APPEND release_files alut.dll OpenAL32.dll)
    endif(OPENAL)

-    if (FMODSTUDIO)
-      set(debug_files ${debug_files} fmodL.dll)
-      set(release_files ${release_files} fmod.dll)
-    endif (FMODSTUDIO)
+    if (USE_FMODSTUDIO)
+      list(APPEND debug_files fmodL.dll)
+      list(APPEND release_files fmod.dll)
+    endif (USE_FMODSTUDIO)

    foreach(redistfullfile IN LISTS CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
        get_filename_component(redistfilepath ${redistfullfile} DIRECTORY )
@@ -191,13 +191,13 @@ elseif(LINUX)
       )

    if (USE_TCMALLOC)
-      set(release_files ${release_files} "libtcmalloc_minimal.so")
+      list(APPEND release_files "libtcmalloc_minimal.so")
    endif (USE_TCMALLOC)

-    if (FMODSTUDIO)
-      set(debug_files ${debug_files} "libfmodL.so")
-      set(release_files ${release_files} "libfmod.so")
-    endif (FMODSTUDIO)
+    if (USE_FMODSTUDIO)
+      list(APPEND debug_files "libfmodL.so")
+      list(APPEND release_files "libfmod.so")
+    endif (USE_FMODSTUDIO)

 else(WINDOWS)
    message(STATUS "WARNING: unrecognized platform for staging 3rd party libs, skipping...")
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -1,7 +1,7 @@
 # -*- cmake -*-

 include(Variables)
-if (FMODSTUDIO)
+if (USE_FMODSTUDIO)
  use_prebuilt_binary(fmodstudio)
  if(WINDOWS)
    set(lib_suffix .dll)
@@ -31,7 +31,7 @@ if (FMODSTUDIO)
    )

  set(FMODSTUDIO_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/fmodstudio)
-endif(FMODSTUDIO)
+endif(USE_FMODSTUDIO)

 if(FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)
  set(FMOD ON)
@@ -41,7 +41,7 @@ if(FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)
 else (FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)
  message(STATUS "No support for FMOD Studio audio (need to set FMODSTUDIO_SDK_DIR?)")
  set(FMOD OFF)
-  set(FMODSTUDIO OFF)
+  set(USE_FMODSTUDIO OFF)
 endif (FMOD_LIBRARY_RELEASE AND FMODSTUDIO_INCLUDE_DIR)

 if (FMOD)
--- a/indra/cmake/NVAPI.cmake
+++ b/indra/cmake/NVAPI.cmake
@@ -2,7 +2,7 @@
 include(Prebuilt)
 include(Variables)

-if (NVAPI)
+if (USE_NVAPI)
  if (WINDOWS)
    use_prebuilt_binary(nvapi)
    if (WORD_SIZE EQUAL 32)
@@ -13,7 +13,7 @@ if (NVAPI)
  else (WINDOWS)
    set(NVAPI_LIBRARY "")
  endif (WINDOWS)
-else (NVAPI)
+else (USE_NVAPI)
  set(NVAPI_LIBRARY "")
-endif (NVAPI)
+endif (USE_NVAPI)

--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -28,13 +28,15 @@ set(LIBS_OPEN_PREFIX)
 set(SCRIPTS_PREFIX ../scripts)
 set(VIEWER_PREFIX)
 set(INTEGRATION_TESTS_PREFIX)
+
 option(LL_TESTS "Build and run unit and integration tests (disable for build timing runs to reduce variation" OFF)
 option(BUILD_TESTING "Build test suite" OFF)
+option(UNATTENDED "Disable use of uneeded tooling for automated builds" OFF)

+# Compiler and toolchain options
 option(INCREMENTAL_LINK "Use incremental linking on win32 builds (enable for faster links on some machines)" OFF)
 option(USE_PRECOMPILED_HEADERS "Enable use of precompiled header directives where supported." ON)
-option(USE_LTO "Enable Whole Program Optimization and related folding and binary reduction routines" OFF)
-option(UNATTENDED "Disable use of uneeded tooling for automated builds" OFF)
+option(USE_LTO "Enable global and interprocedural optimizations" OFF)

 # Configure crash reporting
 option(USE_CRASHPAD "Build support for crashpad reporting engine" OFF)
@@ -44,7 +46,6 @@ set(VIEWER_SYMBOL_FILE "" CACHE STRING "Name of tarball into which to place symb
 # Media Plugins
 option(ENABLE_MEDIA_PLUGINS "Turn off building media plugins if they are imported by third-party library mechanism" ON)
 option(LIBVLCPLUGIN "Turn off building support for libvlc plugin" ON)
-
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set(LIBVLCPLUGIN OFF)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -54,13 +55,11 @@ set(DISABLE_TCMALLOC OFF CACHE BOOL "Disable linkage of TCMalloc. (64bit builds
 set(DISABLE_FATAL_WARNINGS TRUE CACHE BOOL "Set this to FALSE to enable fatal warnings.")

 # Audio Engines
-option(FMODSTUDIO "Build with support for the FMOD Studio audio engine" ON)
-
-# Window implementation
-option(LLWINDOW_SDL2 "Use SDL2 for window and input handling" OFF)
+option(USE_FMODSTUDIO "Build with support for the FMOD Studio audio engine" OFF)

 # Proprietary Library Features
-option(NVAPI "Use nvapi driver interface library" OFF)
+option(USE_NVAPI "Use nvapi driver interface library" OFF)
+

 if(LIBS_CLOSED_DIR)
  file(TO_CMAKE_PATH "${LIBS_CLOSED_DIR}" LIBS_CLOSED_DIR)
@@ -200,46 +199,44 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
  set(LL_ARCH_DIR universal-darwin)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

+# Platform specific
+if (WINDOWS)
+  option(LLWINDOW_SDL2 "Use SDL2 for window and input handling. Windows only" OFF)
+endif()
+
 # Default deploy grid
 set(GRID agni CACHE STRING "Target Grid")

-set(VIEWER_PRODUCT_NAME "Singularity" CACHE STRING "Viewer Base Name")
-string(TOLOWER ${VIEWER_PRODUCT_NAME} VIEWER_PRODUCT_NAME_LOWER)
+set(VIEWER_CHANNEL_BASE "Singularity" CACHE STRING "Viewer Channel Base Name")
+set(VIEWER_CHANNEL_TYPE "Test" CACHE STRING "Viewer Channel Type Name")
+set(VIEWER_CHANNEL_CODENAME "Default" CACHE STRING "Viewer Channel Code Name for Project type")
+
+if("${VIEWER_CHANNEL_TYPE}" STREQUAL "Project")
+set(VIEWER_CHANNEL "${VIEWER_CHANNEL_BASE} ${VIEWER_CHANNEL_TYPE} ${VIEWER_CHANNEL_CODENAME}" CACHE INTERNAL "Viewer Channel Combined Name" FORCE)
+else()
+set(VIEWER_CHANNEL "${VIEWER_CHANNEL_BASE} ${VIEWER_CHANNEL_TYPE}" CACHE INTERNAL "Viewer Channel Combined Name" FORCE)
+endif()
+
+set(VIEWER_BINARY_NAME "singularity" CACHE STRING
+    "The name of the viewer executable to create.")

-set(VIEWER_CHANNEL_BASE "Test" CACHE STRING "Viewer Channel Name")
-set(VIEWER_CHANNEL "${VIEWER_PRODUCT_NAME} ${VIEWER_CHANNEL_BASE}")
-string(TOLOWER ${VIEWER_CHANNEL} VIEWER_CHANNEL_LOWER)
 string(REPLACE " " "" VIEWER_CHANNEL_ONEWORD ${VIEWER_CHANNEL})
+set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_ONEWORD} CACHE STRING "Prefix used for resulting artifacts.")

 option(VIEWER_CHANNEL_GRK "Greek character(s) to represent the viewer channel for support purposes, override only for special branches" "")
 if (NOT VIEWER_CHANNEL_GRK)
-    if (VIEWER_CHANNEL_BASE MATCHES "Test")
+    if (VIEWER_CHANNEL_TYPE MATCHES "Test")
        set(VIEWER_CHANNEL_GRK "\\u03C4") # "τ"
-    elseif (VIEWER_CHANNEL_BASE MATCHES "Alpha")
+    elseif (VIEWER_CHANNEL_TYPE MATCHES "Alpha")
        set(VIEWER_CHANNEL_GRK "\\u03B1") # "α"
-    elseif (VIEWER_CHANNEL_BASE MATCHES "Beta")
+    elseif (VIEWER_CHANNEL_TYPE MATCHES "Beta")
        set(VIEWER_CHANNEL_GRK "\\u03B2") # "β"
    endif ()
 endif (NOT VIEWER_CHANNEL_GRK)

-if(VIEWER_CHANNEL_LOWER MATCHES "^${VIEWER_PRODUCT_NAME_LOWER} release")
-  set(VIEWER_PACKAGE_ID "${VIEWER_PRODUCT_NAME}Release")
-  set(VIEWER_EXE_STRING "${VIEWER_PRODUCT_NAME}Viewer")
-  set(VIEWER_SHORTCUT_STRING "${VIEWER_PRODUCT_NAME} Viewer")
-else()
-  set(VIEWER_PACKAGE_ID ${VIEWER_CHANNEL_ONEWORD})
-  set(VIEWER_EXE_STRING ${VIEWER_CHANNEL_ONEWORD})
-  set(VIEWER_SHORTCUT_STRING ${VIEWER_CHANNEL})
-endif()
-
-set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_ONEWORD} CACHE STRING "Prefix used for resulting artifacts.")
-
-set(VIEWER_BRANDING_ID "singularity" CACHE STRING "Viewer branding id")
-
 option(ENABLE_SIGNING "Enable signing the viewer" OFF)
 set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")

-set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
 # Compiler and toolchain options
 option(USESYSTEMLIBS "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
 option(STANDALONE "Use libraries from your system rather than Linden-supplied prebuilt libraries." OFF)
@@ -250,7 +247,6 @@ elseif (STANDALONE)
 endif (USESYSTEMLIBS)


-
 source_group("CMake Rules" FILES CMakeLists.txt)

 endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -43,7 +43,7 @@ set(llaudio_HEADER_FILES
    llwindgen.h
    )

-if (FMODSTUDIO)
+if (USE_FMODSTUDIO)
    include_directories(
        ${FMODSTUDIO_INCLUDE_DIR}
        )
@@ -58,7 +58,7 @@ if (FMODSTUDIO)
         lllistener_fmodstudio.h
         llstreamingaudio_fmodstudio.h
         )
-endif (FMODSTUDIO)
+endif (USE_FMODSTUDIO)

 if (OPENAL)
  list(APPEND llaudio_SOURCE_FILES
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -51,9 +51,9 @@ include(ZLIB)
 include(URIPARSER)


-if(FMODSTUDIO)
+if(USE_FMODSTUDIO)
  include_directories(${FMODSTUDIO_INCLUDE_DIR})
-endif(FMODSTUDIO)
+endif(USE_FMODSTUDIO)

 if(USE_CRASHPAD)
  include_directories(${CRASHPAD_INCLUDE_DIRS})
@@ -1239,11 +1239,11 @@ if (WINDOWS)
         llwindebug.h
         )

-  if (NVAPI)
+  if (USE_NVAPI)
    set(APPVWRW32_COMPILE_FLAGS "${APPVWRW32_COMPILE_FLAGS} -DUSE_NVAPI=1")
-  else (NVAPI)
+  else (USE_NVAPI)
    set(APPVWRW32_COMPILE_FLAGS "${APPVWRW32_COMPILE_FLAGS} -UUSE_NVAPI")
-  endif (NVAPI)
+  endif (USE_NVAPI)
  set_source_files_properties(llappviewerwin32.cpp PROPERTIES COMPILE_FLAGS "${APPVWRW32_COMPILE_FLAGS}")

    # Replace the icons with the appropriate ones for the channel
@@ -1434,9 +1434,9 @@ if (OPENAL)
  list(APPEND LLSTARTUP_COMPILE_DEFINITIONS "LL_OPENAL=1")
 endif (OPENAL)

-if (FMODSTUDIO)
+if (USE_FMODSTUDIO)
  list(APPEND LLSTARTUP_COMPILE_DEFINITIONS "LL_FMODSTUDIO=1")
-endif (FMODSTUDIO)
+endif (USE_FMODSTUDIO)

 set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_DEFINITIONS "${LLSTARTUP_COMPILE_DEFINITIONS}")

@@ -1535,7 +1535,7 @@ if (WINDOWS)
            )
    endif (ADDRESS_SIZE EQUAL 64)

-    if (FMODSTUDIO)
+    if (USE_FMODSTUDIO)
      if (WORD_SIZE EQUAL 64)
        list(APPEND COPY_INPUT_DEPENDENCIES
             ${SHARED_LIB_STAGING_DIR}/Release/fmod64.dll
@@ -1548,7 +1548,7 @@ if (WINDOWS)
             ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod.dll
            )
      endif (WORD_SIZE EQUAL 64)
-    endif (FMODSTUDIO)
+    endif (USE_FMODSTUDIO)

    if(MSVC_IDE)
      set(VIEWER_BUILD_DEST_DIR "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
@@ -1564,10 +1564,10 @@ if (WINDOWS)
        --actions=copy
        --arch=${ARCH}
        --artwork=${ARTWORK_DIR}
-        --branding_id=${VIEWER_BRANDING_ID}
+        --branding_id=${VIEWER_BINARY_NAME}
        --build=${CMAKE_CURRENT_BINARY_DIR}
        --buildtype=${CMAKE_BUILD_TYPE}
-	--configuration=${VIEWER_BUILD_DEST_DIR}
+        --configuration=${VIEWER_BUILD_DEST_DIR}
        --dest=${VIEWER_BUILD_DEST_DIR}
        --grid=${GRID}
        --channel=${VIEWER_CHANNEL}
@@ -1606,12 +1606,12 @@ if (WINDOWS)
          ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
          --arch=${ARCH}
          --artwork=${ARTWORK_DIR}
-          --branding_id=${VIEWER_BRANDING_ID}
+          --branding_id=${VIEWER_BINARY_NAME}
          --build=${CMAKE_CURRENT_BINARY_DIR}
          --buildtype=${CMAKE_BUILD_TYPE}
          --channel=${VIEWER_CHANNEL}
          --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
-	  --configuration=${VIEWER_BUILD_DEST_DIR}
+          --configuration=${VIEWER_BUILD_DEST_DIR}
          --dest=${VIEWER_BUILD_DEST_DIR}
          --grid=${GRID}
          --source=${CMAKE_CURRENT_SOURCE_DIR}
@@ -1711,7 +1711,7 @@ if (LINUX)
        ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
        --arch=${ARCH}
        --artwork=${ARTWORK_DIR}
-        --branding_id=${VIEWER_BRANDING_ID}
+        --branding_id=${VIEWER_BINARY_NAME}
        --build=${CMAKE_CURRENT_BINARY_DIR}
        --buildtype=${CMAKE_BUILD_TYPE}
        --channel=${VIEWER_CHANNEL}
@@ -1735,7 +1735,7 @@ if (LINUX)
        --arch=${ARCH}
        --actions=copy
        --artwork=${ARTWORK_DIR}
-        --branding_id=${VIEWER_BRANDING_ID}
+        --branding_id=${VIEWER_BINARY_NAME}
        --build=${CMAKE_CURRENT_BINARY_DIR}
        --buildtype=${CMAKE_BUILD_TYPE}
        --configuration=${CMAKE_CFG_INTDIR}
@@ -1793,7 +1793,7 @@ if (DARWIN)
      ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
      --actions=copy
      --artwork=${ARTWORK_DIR}
-      --branding_id=${VIEWER_BRANDING_ID}
+      --branding_id=${VIEWER_BINARY_NAME}
      --build=${CMAKE_CURRENT_BINARY_DIR}
      --buildtype=${CMAKE_BUILD_TYPE}
      --configuration=${CMAKE_CFG_INTDIR}
@@ -1868,7 +1868,7 @@ if (FALSE)
  if (LINUX)
    list(APPEND SYMBOL_SEARCH_DIRS "${CMAKE_CURRENT_BINARY_DIR}/packaged")
    set(VIEWER_SYMBOL_FILE "${SYMBOL_NAME}-${AUTOBUILD_PLATFORM_NAME}.tar.bz2")
-    set(VIEWER_EXE_GLOBS "${VIEWER_BRANDING_ID}-do-not-run-directly SLPlugin")
+    set(VIEWER_EXE_GLOBS "${VIEWER_BINARY_NAME}-do-not-run-directly SLPlugin")
    set(VIEWER_LIB_GLOB "*${CMAKE_SHARED_MODULE_SUFFIX}*")
    set(VIEWER_COPY_MANIFEST copy_l_viewer_manifest)
  endif (LINUX)