Merge pull request #804 from wolfman2000/wolf-cmake-cpack-template

Modify the NSIS template for a better installer.

CMake/CPackSetup.cmake

@@ -1,3 +1,9 @@
+if(WITH_FULL_RELEASE)
+  set(NSIS_VERSION_FINAL "${SM_VERSION_TRADITIONAL}")
+else()
+  set(NSIS_VERSION_FINAL "${SM_VERSION_GIT}")
+endif()
+
 set(CPACK_PACKAGE_NAME "${SM_EXE_NAME}")
 set(CPACK_PACKAGE_VENDOR "StepMania")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Rhythm Game Simulator")
@@ -6,15 +12,32 @@ set(CPACK_PACKAGE_VERSION_MINOR "${SM_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${SM_VERSION_PATCH}")
 set(CPACK_PACKAGE_VERSION "${SM_VERSION_TRADITIONAL}")
 set(CPACK_NSIS_HELP_LINK "https://github.com/stepmania/stepmania/issues")
+set(CPACK_NSIS_PACKAGE_NAME "${SM_EXE_NAME} ${NSIS_VERSION_FINAL}")
 set(CPACK_NSIS_URL_INFO_ABOUT "http://www.stepmania.com/")
 set(CPACK_RESOURCE_FILE_README "${SM_ROOT_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${SM_CMAKE_DIR}/license_install.txt")
 set(CPACK_PACKAGE_EXECUTABLES
   "${SM_EXE_NAME}" "StepMania ${SM_VERSION_MAJOR}" 
 )
+set(CPACK_NSIS_MUI_ICON "${SM_INSTALLER_DIR}/install.ico")
+set(CPACK_NSIS_MUI_UNIICON "${SM_INSTALLER_DIR}/uninstall.ico")
+set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
+
+# Custom items for nsis go here.
+set(CPACK_SM_NSIS_REPOSITORY "https://github.com/stepmania/stepmania")
+set(CPACK_SM_NSIS_ROOT_DIR "${SM_ROOT_DIR}")
+set(CPACK_SM_NSIS_PRODUCT_ID "StepMania ${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}")
+set(CPACK_SM_NSIS_PRODUCT_VERSION "${SM_VERSION_TRADITIONAL}.0")
+set(CPACK_SM_NSIS_HEADER_BITMAP "${SM_INSTALLER_DIR}/header-sm5.bmp")
+set(CPACK_SM_NSIS_WELCOME_BITMAP "${SM_INSTALLER_DIR}/welcome-sm5.bmp")
+set(CPACK_SM_NSIS_GIT_VERSION "${SM_VERSION_GIT}")
 
 if(WIN32)
+  # The header and welcome bitmaps require backslashes.
+  string(REGEX REPLACE "/" "\\\\\\\\" CPACK_SM_NSIS_HEADER_BITMAP "${CPACK_SM_NSIS_HEADER_BITMAP}")
+  string(REGEX REPLACE "/" "\\\\\\\\" CPACK_SM_NSIS_WELCOME_BITMAP "${CPACK_SM_NSIS_WELCOME_BITMAP}")
 
+  set(CPACK_PACKAGE_FILE_NAME "${SM_EXE_NAME}-${NSIS_VERSION_FINAL}-win32")
   # By setting these install keys manually,
   # The default directory of "StepMania major.minor.patch" is lost.
   # This is currently done to maintain backwards compatibility.

CMake/SMDefs.cmake

@@ -12,10 +12,13 @@ execute_process(COMMAND git rev-parse --short HEAD
 )
 
 if(NOT (ret STREQUAL "0"))
+  message(WARNING "git was not found on your path. If you collect bug reports, please add git to your path and rerun cmake.")
   set(SM_VERSION_GIT_HASH "UNKNOWN")
   set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}")
+  set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-${SM_VERSION_GIT_HASH}")
 else()
   set(SM_VERSION_FULL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}")
+  set(SM_VERSION_GIT "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}-git-${SM_VERSION_GIT_HASH}")
 endif()
 
 if (CMAKE_MAJOR_VERSION STREQUAL "3")

StepmaniaCore.cmake

@@ -5,7 +5,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMake/CMakeMacros.cmake)
 # Set up helper variables for future configuring.
 set(SM_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}/CMake")
 set(SM_EXTERN_DIR "${CMAKE_CURRENT_LIST_DIR}/extern")
-set(SM_BUNDLE_DIR "${CMAKE_CURRENT_LIST_DIR}/bundle")
+set(SM_INSTALLER_DIR "${CMAKE_CURRENT_LIST_DIR}/Installer")
 set(SM_XCODE_DIR "${CMAKE_CURRENT_LIST_DIR}/Xcode")
 set(SM_PROGRAM_DIR "${CMAKE_CURRENT_LIST_DIR}/Program")
 set(SM_BUILD_DIR "${CMAKE_CURRENT_LIST_DIR}/Build")