From 9f30a581d1249d6fa0ab4f6c73fce6b658440499 Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@gmail.com>
Date: Thu, 9 Nov 2017 16:29:21 +0000
Subject: [PATCH] Fix package names for Windows/OSX on builders
Refs #0
---
buildconfig/Jenkins/buildscript | 4 +++-
buildconfig/Jenkins/buildscript.bat | 6 +++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/buildconfig/Jenkins/buildscript b/buildconfig/Jenkins/buildscript
index 4ee625ef06b..a50806ace2a 100755
--- a/buildconfig/Jenkins/buildscript
+++ b/buildconfig/Jenkins/buildscript
@@ -181,7 +181,9 @@ fi
if [[ "$BUILDPKG" == true ]]; then
PACKAGINGVARS="-DPACKAGE_DOCS=ON"
# Set some variables relating to the linux packages
- if [[ ${ON_MACOS} != true ]]; then
+ if [[ "${ON_MACOS}" == true ]]; then
+ PACKAGINGVARS="${PACKAGINGVARS} -DCPACK_PACKAGE_SUFFIX="
+ else
# Use different suffix for linux builds
if [[ ${JOB_NAME} == *release* ]]; then
echo "Performing release build" # do nothing
diff --git a/buildconfig/Jenkins/buildscript.bat b/buildconfig/Jenkins/buildscript.bat
index 789b139e270..912a7210aa6 100755
--- a/buildconfig/Jenkins/buildscript.bat
+++ b/buildconfig/Jenkins/buildscript.bat
@@ -92,9 +92,9 @@ if EXIST %BUILD_DIR% (
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Packaging options
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-set PACKAGE_DOCS=
+set PACKAGE_OPTS=
if "%BUILDPKG%" == "yes" (
- set PACKAGE_DOCS=-DPACKAGE_DOCS=ON
+ set PACKAGE_OPTS=-DPACKAGE_DOCS=ON -DCPACK_PACKAGE_SUFFIX=
)
cd %BUILD_DIR%
@@ -127,7 +127,7 @@ if not "%JOB_NAME%"=="%JOB_NAME:debug=%" (
) else (
set VATES_OPT_VAL=ON
)
-call cmake.exe -G "%CM_GENERATOR%" -DCONSOLE=OFF -DENABLE_CPACK=ON -DMAKE_VATES=%VATES_OPT_VAL% -DParaView_DIR=%PARAVIEW_DIR% -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON -DENABLE_FILE_LOGGING=OFF %PACKAGE_DOCS% ..
+call cmake.exe -G "%CM_GENERATOR%" -DCONSOLE=OFF -DENABLE_CPACK=ON -DMAKE_VATES=%VATES_OPT_VAL% -DParaView_DIR=%PARAVIEW_DIR% -DMANTID_DATA_STORE=!MANTID_DATA_STORE! -DUSE_PRECOMPILED_HEADERS=ON -DENABLE_FILE_LOGGING=OFF %PACKAGE_OPTS% ..
if ERRORLEVEL 1 exit /B %ERRORLEVEL%
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
--
GitLab