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
64f084e1
Commit
64f084e1
authored
9 years ago
by
Gigg, Martyn Anthony
Browse files
Options
Downloads
Patches
Plain Diff
WIP changes to buildscript
If the compiler does not match what we used last time then it does a clean build.
parent
1aba6ffe
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
buildconfig/Jenkins/buildscript.bat
+23
-17
23 additions, 17 deletions
buildconfig/Jenkins/buildscript.bat
with
23 additions
and
17 deletions
buildconfig/Jenkins/buildscript.bat
+
23
−
17
View file @
64f084e1
...
...
@@ -6,22 +6,23 @@ setlocal enableextensions enabledelayedexpansion
::
:: WORKSPACE & JOB_NAME are environment variables that are set by Jenkins.
:: BUILD_THREADS & PARAVIEW_DIR should be set in the configuration of each slave.
:: CMake, git & git-lfs should be on the PATH
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
set
VS_VERSION
=
14
set
CM_GENERATOR
=
Visual
Studio
14
2015
Win64
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: All nodes currently have PARAVIEW_DIR=4.3.b40280 and PARAVIEW_NEXT_DIR=4.3.1
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
set
CMAKE_BIN_DIR
=
C
:\Program
Files
(
x86
)
\CMake
2
.8\bin
"
%CMAKE_BIN_DIR%
\cmake.exe"
--version
echo
%sha1
%
:: While we transition between VS 2012 & 2015 we need to be able to clean the build directory
:: if the previous build was not with the same compiler
for
/f
"delims="
%%I
in
(
'where git'
)
do
@set
GIT_EXE_DIR
=
%%~dpI
set
GIT_ROOT_DIR
=
%GIT
_EXE_DIR:
~
0
,-
4
%
set
GREP_EXE
=
%GIT_ROOT_DIR%
bin
\grep.exe
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Get or update the third party dependencies
:: All nodes currently have PARAVIEW_DIR=4.3.b40280, PARAVIEW_NEXT_DIR=4.3.1
:: and PARAVIEW_MSVC2015_DIR=4.3.b40280
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
cd
%WORKSPACE%
call
fetch_Third_Party
win64
cd
%WORKSPACE%
call
cmake
.exe
--version
echo
%sha1
%
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Set up the location for local object store outside of the build and source
...
...
@@ -59,7 +60,16 @@ if not "%JOB_NAME%" == "%JOB_NAME:pull_requests=%" (
:: the links helps keep it fresh
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
set
BUILD_DIR
=
%WORKSPACE%
\build
if
"
%CLEANBUILD%
"
==
"yes"
(
if
exist
%BUILD_DIR%
\CMakeCache.txt
(
"
%GREP_EXE%
"
CMAKE_LINKER
:FILEPATH
%BUILD_DIR%
\CMakeCache.txt
|
"
%GREP_EXE%
"
@VS_VERSION@
if
%ERRORLEVEL%
EQU
0
(
echo
Previous
build
was
with
Visual
Studio
2015
,
not
cleaning
build
directory
)
else
(
set
CLEANBUILD
=
yes
echo
Previous
build
was
with
Visual
Studio
2012
,
build
directory
will
be
cleaned
)
)
if
"
!CLEANBUILD!
"
==
"yes"
(
rmdir
/S /Q
%BUILD_DIR%
)
...
...
@@ -97,15 +107,11 @@ if not "%JOB_NAME%"=="%JOB_NAME:relwithdbg=%" (
)
else
(
set
BUILD_CONFIG
=
Release
))
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Update the PATH so that we can find everything
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
set
PATH
=
%WORKSPACE%
\Third_Party\lib\win64
;
%WORKSPACE%
\Third_Party\lib\win64\Python27
;
%WORKSPACE%
\Third_Party\lib\win64\mingw
;
%PARAVIEW_DIR%
\bin\
%BUILD_CONFIG%
;
%PATH%
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: CMake configuration
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
"
%CMAKE_BIN_DIR%
\cmake.exe"
-G
"
Visual Studio 11 Win64
"
-DCONSOLE
=
OFF
-DENABLE
_CPACK
=
ON
-DMAKE
_VATES
=
ON
-DParaView
_DIR
=
%PARAVIEW_DIR%
-DMANTID
_DATA_STORE
=
!MANTID_DATA_STORE!
-DUSE
_PRECOMPILED_HEADERS
=
ON
%PACKAGE_DOCS%
..
"
%CMAKE_BIN_DIR%
\cmake.exe"
-G
"
@CM_GENERATOR@
"
-DCONSOLE
=
OFF
-DENABLE
_CPACK
=
ON
-DMAKE
_VATES
=
ON
-DParaView
_DIR
=
%PARAVIEW_DIR%
-DMANTID
_DATA_STORE
=
!MANTID_DATA_STORE!
-DUSE
_PRECOMPILED_HEADERS
=
ON
%PACKAGE_DOCS%
..
if
ERRORLEVEL
1
exit
/B
%ERRORLEVEL%
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
...
...
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