summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@theqtcompany.com>2015-10-15 16:18:48 +0300
committerHeikki Halmet <heikki.halmet@theqtcompany.com>2015-10-15 13:20:58 +0000
commite94b7df446d2867eaa966795725d3a1227b2d3c0 (patch)
tree19524d92243d8339947e955fcfdf3308ae061b1e
parent81d3316ca1f2c3706da15bfdebecbd28b62500ed (diff)
Add msvc2015 configurations to CI
Change-Id: I9db3e6a3e67727d1b219eb936b9025edf2d2ad8b Reviewed-by: Heikki Halmet <heikki.halmet@theqtcompany.com>
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/CL1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/ENGINIO_CREDENTIALS_FILE_PATH1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/INCLUDE1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/LIB1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/LIBPATH1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/PATH1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make-check.args1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make-check.bin1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make.args1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make.bin1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.configure.args1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.configure.extra_args1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.qtqa-tests.enabled1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.tests.enabled1
-rw-r--r--projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/script1
15 files changed, 15 insertions, 0 deletions
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/CL b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/CL
new file mode 100644
index 00000000..b938620b
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/CL
@@ -0,0 +1 @@
+/MP5
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/ENGINIO_CREDENTIALS_FILE_PATH b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/ENGINIO_CREDENTIALS_FILE_PATH
new file mode 100644
index 00000000..6228f1c4
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/ENGINIO_CREDENTIALS_FILE_PATH
@@ -0,0 +1 @@
+c:\\Users\\qt\\enginio\\credentials
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/INCLUDE b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/INCLUDE
new file mode 100644
index 00000000..ccfb15fa
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/INCLUDE
@@ -0,0 +1 @@
+C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\INCLUDE;C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\ATLMFC\\INCLUDE;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.10240.0\\ucrt;C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6\\include\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.10240.0\\shared;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.10240.0\\um;C:\\Program Files (x86)\\Windows Kits\\10\\include\\10.0.10240.0\\winrt;${INCLUDE};
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/LIB b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/LIB
new file mode 100644
index 00000000..5e5af0fc
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/LIB
@@ -0,0 +1 @@
+C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\LIB;C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\ATLMFC\\LIB;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.10240.0\\ucrt\\x86;C:\\Program Files (x86)\\Windows Kits\\NETFXSDK\\4.6\\lib\\um\\x86;C:\\Program Files (x86)\\Windows Kits\\10\\lib\\10.0.10240.0\\um\\x86;${LIB}
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/LIBPATH b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/LIBPATH
new file mode 100644
index 00000000..52227588
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/LIBPATH
@@ -0,0 +1 @@
+C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\LIB;C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\ATLMFC\\LIB;C:\\Program Files (x86)\\Windows Kits\\10\\UnionMetadata;C:\\Program Files (x86)\\Windows Kits\\10\\References;C:\\Program Files (x86)\\Windows Kits\\10\\References\\Windows.Foundation.UniversalApiContract\\1.0.0.0;C:\\Program Files (x86)\\Windows Kits\\10\\References\\Windows.Foundation.FoundationContract\\1.0.0.0;C:\\Program Files (x86)\\Windows Kits\\10\\References\\indows.Networking.Connectivity.WwanContract\\1.0.0.0;C:\\Program Files (x86)\\Microsoft SDKs\\Windows Kits\\10\\ExtensionSDKs\\Microsoft.VCLibs\\14.0\\References\\CommonConfiguration\\neutral;
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/PATH b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/PATH
new file mode 100644
index 00000000..4107d914
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/environment/PATH
@@ -0,0 +1 @@
+C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\CommonExtensions\\Microsoft\\TestWindow;C:\\Program Files (x86)\\Microsoft SDKs\\F#\\4.0\\Framework\\v4.0\\;C:\\Program Files (x86)\\MSBuild\\14.0\\bin;C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\;C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\BIN;C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\Tools;C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319;C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\VCPackages;C:\\Program Files (x86)\\HTML Help Workshop;C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Team Tools\\Performance Tools;C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x86;C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6 Tools\\;${PATH}
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make-check.args b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make-check.args
new file mode 100644
index 00000000..a6f5c540
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make-check.args
@@ -0,0 +1 @@
+/NOLOGO /K
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make-check.bin b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make-check.bin
new file mode 100644
index 00000000..6f20b2f4
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make-check.bin
@@ -0,0 +1 @@
+nmake
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make.args b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make.args
new file mode 100644
index 00000000..1e50a6ac
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make.args
@@ -0,0 +1 @@
+/NOLOGO
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make.bin b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make.bin
new file mode 100644
index 00000000..2338fb94
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/make.bin
@@ -0,0 +1 @@
+jom
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.configure.args b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.configure.args
new file mode 100644
index 00000000..55d98a2e
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.configure.args
@@ -0,0 +1 @@
+-opensource -confirm-license -developer-build -qtnamespace TestNamespace -make libs -make tools -make examples -make tests
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.configure.extra_args b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.configure.extra_args
new file mode 100644
index 00000000..34009327
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.configure.extra_args
@@ -0,0 +1 @@
+-no-incredibuild-xge -release
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.qtqa-tests.enabled b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.qtqa-tests.enabled
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.qtqa-tests.enabled
@@ -0,0 +1 @@
+0
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.tests.enabled b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.tests.enabled
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/properties/qt.tests.enabled
@@ -0,0 +1 @@
+1
diff --git a/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/script b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/script
new file mode 100644
index 00000000..6a563d25
--- /dev/null
+++ b/projects/Qt_Modules_Continuous_Integration/stages/win64-msvc2015_developer-build_qtnamespace_Windows_10/script
@@ -0,0 +1 @@
+call perl _qtqa_latest/scripts/setup.pl --install && perl _qtqa_latest/scripts/qt/qtmod_test.pl