From 5832884b58725dfbf5b53f33403e91cbcda0f1d5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 5 Jan 2016 10:27:46 -0800
Subject: [PATCH] handle beta icon usage while packaging console

---
 cmake/macros/SetPackagingParameters.cmake | 7 +++++--
 console/CMakeLists.txt                    | 6 +++++-
 console/packager.js                       | 8 ++++++--
 console/src/main.js                       | 1 -
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index ef50e98967..7f071f4c87 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -16,6 +16,7 @@ macro(SET_PACKAGING_PARAMETERS)
   if (DEFINED ENV{JOB_ID})
     set(DEPLOY_PACKAGE 1)
     set(BUILD_SEQ $ENV{JOB_ID})
+    set(BUILD_TAGGED_BETA FALSE)
     set(INSTALLER_COMPANY "High Fidelity")
     set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
     set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe")
@@ -23,19 +24,21 @@ macro(SET_PACKAGING_PARAMETERS)
     set(CONSOLE_ICON "console.ico")
   elseif (DEFINED ENV{ghprbPullId})
     set(DEPLOY_PACKAGE 1)
+    set(BUILD_TAGGED_BETA TRUE)
     set(BUILD_SEQ "PR-$ENV{ghprbPullId}")
     set(INSTALLER_COMPANY "High Fidelity - PR")
     set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}\\${BUILD_SEQ}")
     set(INSTALLER_NAME "pr-interface-win64-${BUILD_SEQ}.exe")
     set(INTERFACE_ICON "interface-beta.ico")
-    set(CONSOLE_ICON "console.ico")
+    set(CONSOLE_ICON "console-beta.ico")
   else ()
     set(BUILD_SEQ "dev")
+    set(BUILD_TAGGED_BETA TRUE)
     set(INSTALLER_COMPANY "High Fidelity - Dev")
     set(INSTALLER_DIRECTORY "${INSTALLER_COMPANY}")
     set(INSTALLER_NAME "dev-interface-win64.exe")
     set(INTERFACE_ICON "interface-beta.ico")
-    set(CONSOLE_ICON "console.ico")
+    set(CONSOLE_ICON "console-beta.ico")
   endif ()
 
   # create a header file our targets can use to find out the application version
diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 4f457b3712..490f59acc6 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -1,8 +1,12 @@
 set(TARGET_NAME package-console)
 
+if (BUILD_TAGGED_BETA)
+  set(BETA_OPTION "--beta")
+endif()
+
 # add a target that will package the console
 add_custom_target(${TARGET_NAME}
-  COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR}
+  COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} ${BETA_OPTION}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
diff --git a/console/packager.js b/console/packager.js
index e592b5cd5d..43a01f693e 100644
--- a/console/packager.js
+++ b/console/packager.js
@@ -8,6 +8,11 @@ if (osType == "Darwin" || osType == "Linux") {
     platform = "win32"
 }
 
+var argv = require('yargs').argv;
+
+// check which icon we should use, beta or regular
+var iconName = argv.beta ? "console-beta" : "console"
+
 // setup the common options for the packager
 var options = {
     dir: __dirname,
@@ -17,7 +22,7 @@ var options = {
     prune: true,
     arch: "x64",
     platform: platform,
-    icon: "resources/console"
+    icon: "resources/" + iconName
 }
 
 const EXEC_NAME = "server-console";
@@ -37,7 +42,6 @@ if (osType == "Darwin") {
 }
 
 // check if we were passed a custom out directory, pass it along if so
-var argv = require('yargs').argv;
 if (argv.out) {
     options.out = argv.out
 }
diff --git a/console/src/main.js b/console/src/main.js
index f93aa18698..d12286a289 100644
--- a/console/src/main.js
+++ b/console/src/main.js
@@ -25,7 +25,6 @@ var path = require('path');
 
 const TRAY_FILENAME = (osType == "Darwin" ? "console-tray-Template.png" : "console-tray.png");
 const TRAY_ICON = path.join(__dirname, '../resources/' + TRAY_FILENAME);
-const APP_ICON = path.join(__dirname, '../resources/console.png');
 
 // print out uncaught exceptions in the console
 process.on('uncaughtException', console.log.bind(console));