From 2da038de93399d1444af3748a2e892458e71254e Mon Sep 17 00:00:00 2001
From: Dimitar Tasev <dimitar.tasev@stfc.ac.uk>
Date: Fri, 21 Sep 2018 10:34:29 +0100
Subject: [PATCH] Removed todo and added 'the', re #23263
---
buildconfig/CMake/WindowsNSIS.cmake | 13 ++++++-------
buildconfig/Jenkins/buildscript.bat | 2 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/buildconfig/CMake/WindowsNSIS.cmake b/buildconfig/CMake/WindowsNSIS.cmake
index f3dd8b39360..247de5ff76f 100644
--- a/buildconfig/CMake/WindowsNSIS.cmake
+++ b/buildconfig/CMake/WindowsNSIS.cmake
@@ -16,18 +16,17 @@ set( CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\images\\\\MantidPlot
# Choose the proper suffix for the build.
if ( CPACK_PACKAGE_SUFFIX STREQUAL "nightly" )
-# TODO probably needs a better name than windows icon suffix
- set ( WINDOWS_ICON_SUFFIX "Nightly" )
+ set ( WINDOWS_CAPITALIZED_PACKAGE_SUFFIX "Nightly" )
elseif ( CPACK_PACKAGE_SUFFIX STREQUAL "unstable" )
- set ( WINDOWS_ICON_SUFFIX "Unstable" )
+ set ( WINDOWS_CAPITALIZED_PACKAGE_SUFFIX "Unstable" )
else()
# this is the release suffix, which is empty
- set ( WINDOWS_ICON_SUFFIX "" )
+ set ( WINDOWS_CAPITALIZED_PACKAGE_SUFFIX "" )
endif()
# have the properly capitalsed name for the start menu and install folder
-set( CPACK_NSIS_DISPLAY_NAME "Mantid${WINDOWS_ICON_SUFFIX}")
-set( CPACK_PACKAGE_INSTALL_DIRECTORY "MantidInstall${WINDOWS_ICON_SUFFIX}")
+set( CPACK_NSIS_DISPLAY_NAME "Mantid${WINDOWS_CAPITALIZED_PACKAGE_SUFFIX}")
+set( CPACK_PACKAGE_INSTALL_DIRECTORY "MantidInstall${WINDOWS_CAPITALIZED_PACKAGE_SUFFIX}")
###########################################################################
# Deployment type - currently only works for Release!
@@ -165,7 +164,7 @@ install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/buildconfig/CMake/Packaging/launch_m
###########################################################################
# On install. The blank lines seem to be required or it doesn't create the shortcut
-set ( MANTIDPLOT_LINK_NAME "MantidPlot${WINDOWS_ICON_SUFFIX}.lnk" )
+set ( MANTIDPLOT_LINK_NAME "MantidPlot${WINDOWS_CAPITALIZED_PACKAGE_SUFFIX}.lnk" )
set (CPACK_NSIS_CREATE_ICONS_EXTRA "
CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${MANTIDPLOT_LINK_NAME}' '$SYSDIR\\\\wscript.exe' '\\\"$INSTDIR\\\\bin\\\\launch_mantidplot.vbs\\\"' '$INSTDIR\\\\bin\\\\MantidPlot.exe' 0
diff --git a/buildconfig/Jenkins/buildscript.bat b/buildconfig/Jenkins/buildscript.bat
index 4eb1b4e360b..0647b4b3c74 100755
--- a/buildconfig/Jenkins/buildscript.bat
+++ b/buildconfig/Jenkins/buildscript.bat
@@ -205,7 +205,7 @@ echo Note: not running doc-test target as it currently takes too long
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Create the install kit if required
:: Disabled while it takes 10 minutes to create & 5-10 mins to archive!
-:: If install kit needs to be built, create the docs to check they work
+:: If the install kit needs to be built, create the docs to check they work
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
if "%BUILDPKG%" == "yes" (
--
GitLab