Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
2da038de
Commit
2da038de
authored
6 years ago
by
Dimitar Tasev
Browse files
Options
Downloads
Patches
Plain Diff
Removed todo and added 'the', re #23263
parent
2b881f59
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
buildconfig/CMake/WindowsNSIS.cmake
+6
-7
6 additions, 7 deletions
buildconfig/CMake/WindowsNSIS.cmake
buildconfig/Jenkins/buildscript.bat
+1
-1
1 addition, 1 deletion
buildconfig/Jenkins/buildscript.bat
with
7 additions
and
8 deletions
buildconfig/CMake/WindowsNSIS.cmake
+
6
−
7
View file @
2da038de
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
buildconfig/Jenkins/buildscript.bat
+
1
−
1
View file @
2da038de
...
...
@@ -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"
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment