Changes for SSL and icons

CMakeLists.txt

@@ -224,7 +224,16 @@ endif ()
 
 include_application_version()
 
-if (DEFINED ENV{ghprbPullId})
+if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE)
+  message(STATUS "+++++ Package for deployment will be generated on this build +++++")
+  
+  file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/full-stack-deployment)
+  
+  set (ICONPATH_INTERFACE "$INSTDIR/${PATH_INSTALL_DATA}/interface.ico")
+  set (ICONPATH_STACK_MANAGER "$INSTDIR/${PATH_INSTALL_DATA}/stack-manager.ico")
+  string (REPLACE "/" "\\\\" ICONPATH_INTERFACE ${ICONPATH_INTERFACE})
+  string (REPLACE "/" "\\\\" ICONPATH_STACK_MANAGER ${ICONPATH_STACK_MANAGER})
+
   set(CPACK_PACKAGE_NAME "High Fidelity")
   set(CPACK_PACKAGE_VENDOR "High Fidelity, Inc")
   set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "High Fidelity Interface and Stack")
@@ -233,8 +242,8 @@ if (DEFINED ENV{ghprbPullId})
   set(CPACK_PACKAGE_VERSION_MINOR "0")
   set(CPACK_PACKAGE_VERSION_PATCH "0")
   set(CPACK_PACKAGE_INSTALL_DIRECTORY "High Fidelity-${BUILD_SEQ}")
-  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Interface.lnk' '$INSTDIR\\\\interface.exe'")
+  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Interface.lnk' '$INSTDIR\\\\interface.exe' '${ICONPATH_INTERFACE}'")
-  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Stack Manager.lnk' '$INSTDIR\\\\stack-manager.exe'")
+  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Stack Manager.lnk' '$INSTDIR\\\\stack-manager.exe' '${ICONPATH_STACK_MANAGER}'")
 
   if (WIN32)
     install(DIRECTORY ${CMAKE_BINARY_DIR}/full-stack-deployment/ DESTINATION "./")

cmake/macros/ConsolidateStackComponents.cmake

@@ -1,11 +1,27 @@
 macro(CONSOLIDATE_STACK_COMPONENTS)
 
-  if (DEFINED ENV{ghprbPullId} AND WIN32)
+  if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE AND WIN32)
-  # Copy all the output for this target into the common deployment location
+  
-  add_custom_command(
+    # Copy all the output for this target into the common deployment location
-  	TARGET ${TARGET_NAME} POST_BUILD
+    add_custom_command(
-    COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/full-stack-deployment
+      TARGET ${TARGET_NAME} POST_BUILD
-  )
+      COMMAND "${CMAKE_COMMAND}" -E copy_directory $<TARGET_FILE_DIR:${TARGET_NAME}> ${CMAKE_BINARY_DIR}/full-stack-deployment
+    )
+
+    # Copy icon files for interface and stack manager
+    if (TARGET_NAME STREQUAL "interface" OR TARGET_NAME STREQUAL "stack-manager")
+      if (TARGET_NAME STREQUAL "interface")
+        set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/icon/interface.ico")
+        set (ICON_DESTINATION_NAME "interface.ico")
+      elseif (TARGET_NAME STREQUAL "stack-manager")
+        set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/assets/icon.ico")
+        set (ICON_DESTINATION_NAME "stack-manager.ico")
+      endif ()
+      add_custom_command(
+        TARGET ${TARGET_NAME} POST_BUILD
+        COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/full-stack-deployment/${ICON_DESTINATION_NAME}
+      )
+    endif ()
   endif ()
 
 endmacro()

cmake/macros/IncludeApplicationVersion.cmake

@@ -10,10 +10,15 @@
 # 
 
 macro(INCLUDE_APPLICATION_VERSION)
+  #
+  # We are relying on Jenkins defined environment variables to determine the origin of this build
+  # and will only package if this is a PR or Release build
   if (DEFINED ENV{JOB_ID})
+    set (DEPLOY_PACKAGE 1)
     set (BUILD_SEQ $ENV{JOB_ID})
   elseif (DEFINED ENV{ghprbPullId})
-    set (BUILD_SEQ "PR.$ENV{ghprbPullId}")
+    set (DEPLOY_PACKAGE 1)
+    set (BUILD_SEQ "PR-$ENV{ghprbPullId}")
   else ()
     set(BUILD_SEQ "dev")
   endif ()

cmake/modules/FindOpenSSL.cmake

@@ -250,16 +250,15 @@ else ()
   )
 endif ()
 
-
-    message(STATUS "++++++++++++++++++++++++++++")
-    message(STATUS "${OPENSSL_LIBRARIES}")
-    message(STATUS "${OPENSSL_DLL_PATH}")
 if (WIN32)
   add_paths_to_fixup_libs(${OPENSSL_DLL_PATH})
-  if (DEFINED ENV{ghprbPullId})
+  #
+  # For some reason fixup misses the following DLL and only copies libeay32. There's gotta be a better way to handle this
+  # but for now resorting to the following interm solution
+  if (DEFINED DEPLOY_PACKAGE AND DEPLOY_PACKAGE)
     add_custom_command(
       TARGET ${TARGET_NAME} POST_BUILD
-      COMMAND "${CMAKE_COMMAND}" -E copy ${OPENSSL_DLL_PATH}/ssleay32.dll ${CMAKE_BINARY_DIR}/full-stack-deployment
+      COMMAND "${CMAKE_COMMAND}" -E copy ${OPENSSL_DLL_PATH}/ssleay32.dll ${CMAKE_BINARY_DIR}/full-stack-deployment/
     )
   endif ()
 endif ()