From 3e9f124209162d78786c30488da71a7cdde0bd1f Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 14 Jan 2016 11:05:46 -0800
Subject: [PATCH] update packaging parameters for suggested jenkins setup

---
 cmake/macros/SetPackagingParameters.cmake | 20 ++++++++++----------
 cmake/templates/BuildInfo.h.in            |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 772dc2fc7c..104174c17d 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -16,30 +16,30 @@ macro(SET_PACKAGING_PARAMETERS)
   set(PRODUCTION_BUILD 0)
   set(DEV_BUILD 0)
 
-  if (DEFINED ENV{JOB_ID})
+  set(RELEASE_TYPE ENV{RELEASE_TYPE})
+  set(RELEASE_NUMBER ENV{RELEASE_NUMBER})
+
+  if (RELEASE_TYPE STREQUAL "PRODUCTION")
     set(DEPLOY_PACKAGE TRUE)
-    set(BUILD_SEQ $ENV{JOB_ID})
     set(PRODUCTION_BUILD 1)
     set(BUILD_ORGANIZATION "High Fidelity")
-    set(INSTALLER_NAME "interface-win64-${BUILD_SEQ}.exe")
+    set(BUILD_VERSION ${RELEASE_NUMBER})
     set(HIGH_FIDELITY_PROTOCOL "hifi")
     set(INTERFACE_BUNDLE_NAME "High Fidelity")
     set(INTERFACE_ICON_PREFIX "interface")
     set(CONSOLE_ICON "console.ico")
-  elseif (DEFINED ENV{ghprbPullId})
+  elseif (RELEASE_TYPE STREQUAL "PR")
     set(DEPLOY_PACKAGE TRUE)
     set(PR_BUILD 1)
-    set(BUILD_SEQ "PR-$ENV{ghprbPullId}")
-    set(BUILD_ORGANIZATION "High Fidelity - PR#$ENV{ghprbPullId}")
-    set(INSTALLER_NAME "pr-interface-win64-${BUILD_SEQ}.exe")
-    set(INTERFACE_BUNDLE_NAME "High Fidelity ${BUILD_SEQ}")
+    set(BUILD_VERSION "PR${RELEASE_NUMBER}")
+    set(BUILD_ORGANIZATION "High Fidelity - PR#${RELEASE_NUMBER}")
+    set(INTERFACE_BUNDLE_NAME "High Fidelity PR#${RELEASE_NUMBER}")
     set(INTERFACE_ICON_PREFIX "interface-beta")
     set(CONSOLE_ICON "console-beta.ico")
   else ()
-    set(BUILD_SEQ "dev")
     set(DEV_BUILD 1)
     set(BUILD_ORGANIZATION "High Fidelity - Dev")
-    set(INSTALLER_NAME "dev-interface-win64.exe")
+    set(BUILD_VERSION "dev")
     set(INTERFACE_BUNDLE_NAME "Interface")
     set(INTERFACE_ICON_PREFIX "interface-beta")
     set(CONSOLE_ICON "console-beta.ico")
diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in
index a531317354..3a462feb1a 100644
--- a/cmake/templates/BuildInfo.h.in
+++ b/cmake/templates/BuildInfo.h.in
@@ -11,5 +11,5 @@
 
 namespace BuildInfo {
     const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
-    const QString VERSION = "@BUILD_SEQ@";
+    const QString VERSION = "@BUILD_VERSION@";
 }