Commit 54036dd3 authored by Ben Cooksley's avatar Ben Cooksley

Initial preparations for the jump to MSVC with Qt 5.10

parent e3fdc2c4
......@@ -9,7 +9,7 @@ server:
archiveDirectory: "/srv/production/"
cacheLocation:
WindowsMSVCQt5.9: "C:\\Archives\\Production\\WindowsMSVCQt5.9\\"
WindowsMSVCQt5.10: "C:\\CI\\archives\\WindowsMSVCQt5.10\\"
SUSEQt5.7: "/srv/archives/production/SUSEQt5.7/"
SUSEQt5.9: "/srv/archives/production/SUSEQt5.9/"
SUSEQt5.10: "/srv/archives/production/SUSEQt5.10/"
......
......@@ -9,7 +9,7 @@ server:
archiveDirectory: "/srv/sandbox/"
cacheLocation:
WindowsMSVCQt5.9: "C:\\Archives\\Production\\WindowsMSVCQt5.9\\"
WindowsMSVCQt5.10: "C:\\CI\\sandbox-archives\\WindowsMSVCQt5.10\\"
SUSEQt5.7: "/srv/archives/sandbox/SUSEQt5.7/"
SUSEQt5.9: "/srv/archives/sandbox/SUSEQt5.9/"
SUSEQt5.10: "/srv/archives/sandbox/SUSEQt5.10/"
......
......@@ -6,7 +6,7 @@ def knownStructure = new groovy.json.JsonSlurper().parseText( structureToParse )
def supportedOSes = [
'Linux': '.* SUSEQt5.[7|9|10]$',
'FreeBSD': '.* FreeBSDQt5.9$',
'Windows': '.* WindowsMSVCQt5.9$'
'Windows': '.* WindowsMSVCQt5.10$'
]
// Iterate over all of the known structures and create the necessary jobs to build the dependencies
......
......@@ -13,7 +13,7 @@ arguments = parser.parse_args()
allPlatforms = {
'SUSEQt5.7': 'Linux',
'FreeBSDQt5.9': 'FreeBSD',
'WindowsMSVCQt5.9': 'Windows',
'WindowsMSVCQt5.10': 'Windows',
None: 'MacOSX',
'AndroidQt5.9': 'Android'
}
......
......@@ -5,7 +5,7 @@
platforms:
- "SUSEQt5.7"
- "SUSEQt5.10"
- "WindowsMSVCQt5.9"
- "WindowsMSVCQt5.10"
- "FreeBSDQt5.9"
- repositories:
- "frameworks/extra-cmake-modules"
......@@ -95,7 +95,7 @@
- "kde/kdesdk/umbrello"
- "kde/kdeutils/filelight"
platforms:
- "WindowsMSVCQt5.9"
- "WindowsMSVCQt5.10"
branchGroups:
- "kf5-qt5"
- "stable-kf5-qt5"
......@@ -168,7 +168,7 @@
- "extragear/utils/krename"
platforms:
- "SUSEQt5.9"
- "WindowsMSVCQt5.9"
- "WindowsMSVCQt5.10"
- "FreeBSDQt5.9"
branchGroups:
- "kf5-qt5"
......@@ -208,7 +208,7 @@
platforms:
- "SUSEQt5.9"
- "FreeBSDQt5.9"
- "WindowsMSVCQt5.9"
- "WindowsMSVCQt5.10"
"branchGroups":
- "kf5-qt5"
- "stable-kf5-qt5"
......@@ -5,7 +5,7 @@
- 'kdesupport/qca'
'SUSEQt5.10':
- 'kdesupport/qca'
'WindowsMSVCQt5.9':
'WindowsMSVCQt5.10':
- 'kdesupport/polkit-qt-1'
- 'kdesupport/qca'
- 'frameworks/networkmanager-qt'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment