Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
4d5786bf
Commit
4d5786bf
authored
Oct 19, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved Jenkins Windows Builds to gitlab
parent
05400f4d
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
72 additions
and
274 deletions
+72
-274
.gitlab-ci.yml
.gitlab-ci.yml
+26
-1
CI/VS2013-Qt-5.5.1-x64.bat
CI/VS2013-Qt-5.5.1-x64.bat
+23
-0
CI/VS2015-Qt-5.6.0-x32.bat
CI/VS2015-Qt-5.6.0-x32.bat
+23
-0
JI/Build-VS2013-Qt-5.5.1-x64.bat
JI/Build-VS2013-Qt-5.5.1-x64.bat
+0
-5
JI/Build-VS2015-Qt-5.6.0-x32.bat
JI/Build-VS2015-Qt-5.6.0-x32.bat
+0
-5
JI/Build-VS2015-Qt-5.6.0-x64.bat
JI/Build-VS2015-Qt-5.6.0-x64.bat
+0
-7
JI/Configure-VS2015-Qt-5.6.0-x64.bat
JI/Configure-VS2015-Qt-5.6.0-x64.bat
+0
-36
JI/Package-VS2013-Qt-5.5.1-x64.bat
JI/Package-VS2013-Qt-5.5.1-x64.bat
+0
-14
JI/Package-VS2015-Qt-5.6.0-x32.bat
JI/Package-VS2015-Qt-5.6.0-x32.bat
+0
-14
JI/Package-VS2015-Qt-5.6.0-x64.bat
JI/Package-VS2015-Qt-5.6.0-x64.bat
+0
-15
JI/Test-VS2013-Qt-5.5.1-x64.bat
JI/Test-VS2013-Qt-5.5.1-x64.bat
+0
-7
JI/Test-VS2015-Qt-5.6.0-x32.bat
JI/Test-VS2015-Qt-5.6.0-x32.bat
+0
-7
JI/Test-VS2015-Qt-5.6.0-x64.bat
JI/Test-VS2015-Qt-5.6.0-x64.bat
+0
-9
Jenkinsfile
Jenkinsfile
+0
-154
No files found.
.gitlab-ci.yml
View file @
4d5786bf
...
...
@@ -20,9 +20,34 @@ cppcheck:
VS2015-Qt-5.6.0-x64
:
script
:
"
CI
\\
VS2015-Qt-5.6.0-x64.bat"
cache
:
-
rel/
tags
:
-
VS2015
-
Qt56
artifacts
:
paths
:
-
rel/*.exe
-
rel/Build/*.exe
VS2015-Qt-5.6.0-x32
:
script
:
"
CI
\\
VS2015-Qt-5.6.0-x32.bat"
cache
:
-
rel/
tags
:
-
VS2015
-
Qt56
artifacts
:
paths
:
-
rel/Build/*.exe
VS2013-Qt-5.5.1-x64
:
script
:
"
CI
\\
VS2013-Qt-5.5.1-x64.bat"
cache
:
-
rel/
tags
:
-
VS2013
-
Qt551
artifacts
:
paths
:
-
rel/Build/*.exe
J
I/
Configure-
VS2013-Qt-5.5.1-x64.bat
→
C
I/VS2013-Qt-5.5.1-x64.bat
View file @
4d5786bf
git
submodule
init
git
submodule
update
--remote
mkdir
rel
cd
rel
...
...
@@ -24,3 +28,22 @@ set GLEW_LIBRARY_DIR=C:\libs\VS2013\%ARCHITECTURE%\glew-1.10.0\lib\glew32.lib
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DGLUT
_INCLUDE_DIR
=
"
%GLUT_INCLUDE_DIR%
"
-DGLUT
_glut_LIBRARY
=
"
%GLUT_GLUT_LIBRARY%
"
-DGLEW
_INCLUDE_DIR
=
"
%GLEW_INCLUDE_DIR%
"
-DGLEW
_LIBRARY
=
"
%GLEW_LIBRARY_DIR%
"
"C:\Program Files (x86)\CMake\bin\cmake.exe"
-DGTEST
_PREFIX
=
"
%LIBPATH_BASE%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
-DOPENFLIPPER
_BUILD_UNIT_TESTS
=
TRUE
%CMAKE_CONFIGURATION%
..
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"ALL_BUILD"
cd
tests
copy
..\Build\Qt
*
.dll
testBinaries
copy
..\Build\icu
*
.dll
testBinaries
run_tests
.bat
cd
..
set
BUILD_PLATFORM
=
VS2013
del
*
.exe
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"PACKAGE"
move
OpenFlipper
-*
.exe
"OpenFlipper-Free-Git-Master-
%GIT_COMMIT%
-
%BUILD_PLATFORM%
-
%STRING_ARCH%
-
%QT_VERSION%
.exe"
J
I/
Configure-
VS2015-Qt-5.6.0-x32.bat
→
C
I/VS2015-Qt-5.6.0-x32.bat
View file @
4d5786bf
git
submodule
init
git
submodule
update
--remote
mkdir
rel
cd
rel
...
...
@@ -24,3 +28,22 @@ set GLEW_LIBRARY_DIR=C:\libs\VS2015\%ARCHITECTURE%\glew-1.13.0\lib\glew32.lib
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DGLUT
_INCLUDE_DIR
=
"
%GLUT_INCLUDE_DIR%
"
-DGLUT
_glut_LIBRARY
=
"
%GLUT_GLUT_LIBRARY%
"
-DGLEW
_INCLUDE_DIR
=
"
%GLEW_INCLUDE_DIR%
"
-DGLEW
_LIBRARY
=
"
%GLEW_LIBRARY_DIR%
"
"C:\Program Files (x86)\CMake\bin\cmake.exe"
-DGTEST
_PREFIX
=
"
%LIBPATH_BASE%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
-DOPENFLIPPER
_BUILD_UNIT_TESTS
=
TRUE
%CMAKE_CONFIGURATION%
..
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"ALL_BUILD"
cd
tests
copy
..\Build\Qt
*
.dll
testBinaries
copy
..\Build\icu
*
.dll
testBinaries
run_tests
.bat
cd
..
set
BUILD_PLATFORM
=
VS2015
del
*
.exe
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"PACKAGE"
move
OpenFlipper
-*
.exe
"OpenFlipper-Free-Git-Master-
%GIT_COMMIT%
-
%BUILD_PLATFORM%
-
%STRING_ARCH%
-
%QT_VERSION%
.exe"
JI/Build-VS2013-Qt-5.5.1-x64.bat
deleted
100644 → 0
View file @
05400f4d
cd
rel
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com"
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"ALL_BUILD"
JI/Build-VS2015-Qt-5.6.0-x32.bat
deleted
100644 → 0
View file @
05400f4d
cd
rel
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"ALL_BUILD"
JI/Build-VS2015-Qt-5.6.0-x64.bat
deleted
100644 → 0
View file @
05400f4d
cd
rel
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"ALL_BUILD"
cd
..
JI/Configure-VS2015-Qt-5.6.0-x64.bat
deleted
100644 → 0
View file @
05400f4d
git
submodule
init
git
submodule
update
--remote
mkdir
rel
cd
rel
set
ARCHITECTURE
=
x64
set
ARCH_VS
=
Win64
set
STRING_ARCH
=
64
-Bit
set
QT_REV
=
5
.6
set
QT_SUFFIX
=
set
LIBPATH_BASE
=
C
:\libs\VS2015
set
GTESTVERSION
=
gtest
-
1
.7.0
set
GENERATOR
=
Visual
Studio
14
%ARCH_VS%
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
set
QT_VERSION
=
Qt5
.6.0
set
QT_BASE_CONFIG
=
-DQT
5
_INSTALL_PATH
=
C
:\Qt\
%QT_VERSION%
-vs
2015
-
%STRING_ARCH%
\
%QT_REV%
\msvc2015_64
%QT_SUFFIX%
set
GLUT_INCLUDE_DIR
=
C
:\libs\VS2015\
%ARCHITECTURE%
\freeglut
-
3
.0.0\include
set
GLUT_GLUT_LIBRARY
=
C
:\libs\VS2015\
%ARCHITECTURE%
\freeglut
-
3
.0.0\lib\freeglut.lib
set
GLEW_INCLUDE_DIR
=
C
:\libs\VS2015\
%ARCHITECTURE%
\glew
-
1
.13.0\include
set
GLEW_LIBRARY_DIR
=
C
:\libs\VS2015\
%ARCHITECTURE%
\glew
-
1
.13.0\lib\glew32.lib
set
CMAKE_CONFIGURATION
=
%QT_BASE_CONFIG%
-DGLUT
_INCLUDE_DIR
=
"
%GLUT_INCLUDE_DIR%
"
-DGLUT
_glut_LIBRARY
=
"
%GLUT_GLUT_LIBRARY%
"
-DGLEW
_INCLUDE_DIR
=
"
%GLEW_INCLUDE_DIR%
"
-DGLEW
_LIBRARY
=
"
%GLEW_LIBRARY_DIR%
"
"C:\Program Files (x86)\CMake\bin\cmake.exe"
-DGTEST
_PREFIX
=
"
%LIBPATH_BASE%
\
%ARCHITECTURE%
\
%GTESTVERSION%
"
-G
"
%GENERATOR%
"
-DCMAKE
_BUILD_TYPE
=
Release
-DOPENFLIPPER
_BUILD_UNIT_TESTS
=
TRUE
%CMAKE_CONFIGURATION%
..
pwd
cd
..
pwd
JI/Package-VS2013-Qt-5.5.1-x64.bat
deleted
100644 → 0
View file @
05400f4d
cd
rel
set
STRING_ARCH
=
64
-Bit
set
BUILD_PLATFORM
=
VS2013
set
QT_VERSION
=
5
.5.1
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com"
del
*
.exe
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"PACKAGE"
move
OpenFlipper
-*
.exe
"OpenFlipper-Free-Git-Master-
%GIT_COMMIT%
-
%BUILD_PLATFORM%
-
%STRING_ARCH%
-
%QT_VERSION%
.exe"
JI/Package-VS2015-Qt-5.6.0-x32.bat
deleted
100644 → 0
View file @
05400f4d
cd
rel
set
STRING_ARCH
=
32
-Bit
set
BUILD_PLATFORM
=
VS2015
set
QT_VERSION
=
5
.6.0
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
del
*
.exe
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"PACKAGE"
move
OpenFlipper
-*
.exe
"OpenFlipper-Free-Git-Master-
%GIT_COMMIT%
-
%BUILD_PLATFORM%
-
%STRING_ARCH%
-
%QT_VERSION%
.exe"
JI/Package-VS2015-Qt-5.6.0-x64.bat
deleted
100644 → 0
View file @
05400f4d
cd
rel
set
STRING_ARCH
=
64
-Bit
set
BUILD_PLATFORM
=
VS2015
set
QT_VERSION
=
5
.6.0
set
VS_PATH
=
"C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com"
del
*
.exe
%VS_PATH%
/Build
"Release"
OpenFlipper
.sln
/Project
"PACKAGE"
move
OpenFlipper
-*
.exe
"OpenFlipper-Free-Git-Master-
%GIT_COMMIT%
-
%BUILD_PLATFORM%
-
%STRING_ARCH%
-
%QT_VERSION%
.exe"
cd
..
JI/Test-VS2013-Qt-5.5.1-x64.bat
deleted
100644 → 0
View file @
05400f4d
cd
rel
cd
tests
copy
..\Build\Qt
*
.dll
testBinaries
copy
..\Build\icu
*
.dll
testBinaries
run_tests
.bat
JI/Test-VS2015-Qt-5.6.0-x32.bat
deleted
100644 → 0
View file @
05400f4d
cd
rel
cd
tests
copy
..\Build\Qt
*
.dll
testBinaries
copy
..\Build\icu
*
.dll
testBinaries
run_tests
.bat
JI/Test-VS2015-Qt-5.6.0-x64.bat
deleted
100644 → 0
View file @
05400f4d
cd
rel
cd
tests
copy
..\Build\Qt
*
.dll
testBinaries
copy
..\Build\icu
*
.dll
testBinaries
run_tests
.bat
cd
..
cd
..
Jenkinsfile
deleted
100644 → 0
View file @
05400f4d
properties
properties:
[[
$class
:
'GitLabConnectionProperty'
,
gitLabConnection:
'graphics'
]]
parallel
(
'VS2015 Qt-5.6.0 x64'
:
{
node
(
'Qt5.6.0 && VS2015 '
)
{
String
VisualStudio
=
'VS2015'
;
String
QtVersion
=
'Qt-5.6.0'
;
String
Arch
=
'x64'
;
String
name
=
VisualStudio
+
' '
+
QtVersion
+
' '
+
Arch
;
String
stageName
=
VisualStudio
+
'-'
+
QtVersion
+
'-'
+
Arch
;
// Create a workspace that contains Project and branch name
// Required to get a shorter name working around max pathlength on windows
ws
(
"workspace/${env.JOB_NAME.replaceAll('/', '-')}/"
+
stageName
)
{
stage
(
'Checkout - '
+
name
)
{
// Configured in jenkins !!
checkout
scm
}
// Extract the current commit id and pass it to the environments
String
GITCOMMIT
=
bat
(
script:
'git rev-parse HEAD'
,
returnStdout:
true
).
trim
().
tokenize
(
' '
).
last
().
trim
()
env
.
GIT_COMMIT
=
GITCOMMIT
gitlabCommitStatus
{
stage
(
'Configure - '
+
name
)
{
bat
'JI\\Configure-'
+
stageName
+
'.bat'
}
stage
(
'Build - '
+
name
)
{
bat
'JI\\Build-'
+
stageName
+
'.bat'
}
stage
(
'Test - '
+
name
)
{
bat
'JI\\Test-'
+
stageName
+
'.bat'
}
stage
(
'Package - '
+
name
)
{
bat
'JI\\Package-'
+
stageName
+
'.bat'
}
}
archiveArtifacts
artifacts:
'**/rel/*.exe'
,
fingerprint:
true
}
}
}
,
'VS2015 Qt-5.6.0 x32'
:
{
node
(
'Qt5.6.0 && VS2015'
)
{
String
VisualStudio
=
'VS2015'
;
String
QtVersion
=
'Qt-5.6.0'
;
String
Arch
=
'x32'
;
String
name
=
VisualStudio
+
' '
+
QtVersion
+
' '
+
Arch
;
String
stageName
=
VisualStudio
+
'-'
+
QtVersion
+
'-'
+
Arch
;
// Create a workspace that contains Project and branch name
// Required to get a shorter name working around max pathlength on windows
ws
(
"workspace/${env.JOB_NAME.replaceAll('/', '-')}/"
+
stageName
)
{
stage
(
'Checkout - '
+
name
)
{
// Configured in jenkins !!
checkout
scm
}
// Extract the current commit id and pass it to the environments
String
GITCOMMIT
=
bat
(
script:
'git rev-parse HEAD'
,
returnStdout:
true
).
trim
().
tokenize
(
' '
).
last
().
trim
()
env
.
GIT_COMMIT
=
GITCOMMIT
stage
(
'Configure - '
+
name
)
{
bat
'JI\\Configure-'
+
stageName
+
'.bat'
}
stage
(
'Build - '
+
name
)
{
bat
'JI\\Build-'
+
stageName
+
'.bat'
}
stage
(
'Test - '
+
name
)
{
bat
'JI\\Test-'
+
stageName
+
'.bat'
}
stage
(
'Package - '
+
name
)
{
bat
'JI\\Package-'
+
stageName
+
'.bat'
}
archiveArtifacts
artifacts:
'**/rel/*.exe'
,
fingerprint:
true
}
}
}
,
'VS2013 Qt-5.5.1 x64'
:
{
node
(
'Qt5.5.1 && VS2013 '
)
{
String
VisualStudio
=
'VS2013'
;
String
QtVersion
=
'Qt-5.5.1'
;
String
Arch
=
'x64'
;
String
name
=
VisualStudio
+
' '
+
QtVersion
+
' '
+
Arch
;
String
stageName
=
VisualStudio
+
'-'
+
QtVersion
+
'-'
+
Arch
;
// Create a workspace that contains Project and branch name
// Required to get a shorter name working around max pathlength on windows
ws
(
"workspace/${env.JOB_NAME.replaceAll('/', '-')}/"
+
stageName
)
{
stage
(
'Checkout - '
+
name
)
{
// Configured in jenkins !!
checkout
scm
}
// Extract the current commit id and pass it to the environments
String
GITCOMMIT
=
bat
(
script:
'git rev-parse HEAD'
,
returnStdout:
true
).
trim
().
tokenize
(
' '
).
last
().
trim
()
env
.
GIT_COMMIT
=
GITCOMMIT
stage
(
'Configure - '
+
name
)
{
bat
'JI\\Configure-'
+
stageName
+
'.bat'
}
stage
(
'Build - '
+
name
)
{
bat
'JI\\Build-'
+
stageName
+
'.bat'
}
stage
(
'Test - '
+
name
)
{
bat
'JI\\Test-'
+
stageName
+
'.bat'
}
stage
(
'Package - '
+
name
)
{
bat
'JI\\Package-'
+
stageName
+
'.bat'
}
archiveArtifacts
artifacts:
'**/rel/*.exe'
,
fingerprint:
true
}
}
}
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment