diff options
| author | Heikki Halmet <heikki.halmet@digia.com> | 2014-02-19 10:18:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-19 10:35:13 +0100 |
| commit | 0386903cfceca8e21b322343bf1b7ec8011c5e3e (patch) | |
| tree | c7d64e3410d6cf3febcf1eddf38f0b093d136a8b | |
| parent | a3ff9807fea6af50bdcf51a11ad6bd46eda76ba7 (diff) | |
Add MinGW 4.8.2 to CI - and Packaging nodes
This module will install MinGW 4.8.2 to all Windows nodes.
Change-Id: I37d2b77cf4bac9845620488de621447c6411e6eb
Reviewed-by: Tony SarajΓ€rvi <tony.sarajarvi@digia.com>
| -rw-r--r-- | puppet/modules/ci_tester/manifests/windows.pp | 1 | ||||
| -rw-r--r-- | puppet/modules/mingw482/manifests/init.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/mingw482/manifests/windows.pp | 35 | ||||
| -rw-r--r-- | puppet/modules/mingw482/tests/mingw482.pp | 3 | ||||
| -rw-r--r-- | puppet/modules/packaging_tester/manifests/windows.pp | 1 |
5 files changed, 45 insertions, 0 deletions
diff --git a/puppet/modules/ci_tester/manifests/windows.pp b/puppet/modules/ci_tester/manifests/windows.pp index 68a4a2f..2aeeb8c 100644 --- a/puppet/modules/ci_tester/manifests/windows.pp +++ b/puppet/modules/ci_tester/manifests/windows.pp @@ -3,6 +3,7 @@ class ci_tester::windows inherits ci_tester::base { include activepython include mingw include mingw48 + include mingw482 include openssl include strawberryperl include strawberryperl_portable diff --git a/puppet/modules/mingw482/manifests/init.pp b/puppet/modules/mingw482/manifests/init.pp new file mode 100644 index 0000000..fa29dbe --- /dev/null +++ b/puppet/modules/mingw482/manifests/init.pp @@ -0,0 +1,5 @@ +class mingw482 { + case $::kernel { + windows: { include mingw482::windows } + } +} diff --git a/puppet/modules/mingw482/manifests/windows.pp b/puppet/modules/mingw482/manifests/windows.pp new file mode 100644 index 0000000..2553bbe --- /dev/null +++ b/puppet/modules/mingw482/manifests/windows.pp @@ -0,0 +1,35 @@ +# Downloads the 4.8.2 version of mingw from $input and installs to the specified $path. + +class mingw482::windows( + $version = '4.8.2', + $altversion = '482', + $path = 'C:\mingw482', + + # Additional options for installed MinGW version, See also: http://qt-project.org/wiki/MinGW-64-bit + # Note: Changing any of these won't trigger MinGW re-installation. + # + # either 'posix' or 'win32', we use 'posix' since it is more popular + $threading = 'posix', + + # either 'sjlj' or 'dwarf', we use 'dwarf' while requested on releasing ML + $exceptions = 'dwarf', + + # installed revision + $revision = 'rev2' +){ + # Match revision, match with both 'r8' and 'rev8' style patterns. + # Just for checking if correct revision is already installed. + $match_revision = regsubst($revision, 'rev', 'r(ev)?') + + # installer file URL + $url = "http://ci-files01-hki.ci.local/input/windows/i686-${version}-release-${threading}-${exceptions}-rt_v3-${revision}.7z" + + windows::zip_package { "mingw482": + url => $url, + version => $version, + version_flags => "-print-search-dirs", + version_expression => "i686-${altversion}-${threading}-${exceptions}-rt_v3-${match_revision}", + path => $path, + binary => "$path\\mingw32\\bin\\g++.exe" + } +}
\ No newline at end of file diff --git a/puppet/modules/mingw482/tests/mingw482.pp b/puppet/modules/mingw482/tests/mingw482.pp new file mode 100644 index 0000000..d847868 --- /dev/null +++ b/puppet/modules/mingw482/tests/mingw482.pp @@ -0,0 +1,3 @@ +include mingw482 + +selftest::expect_no_warnings { "no warnings from mingw482": } diff --git a/puppet/modules/packaging_tester/manifests/windows.pp b/puppet/modules/packaging_tester/manifests/windows.pp index b0c2712..7a37a6e 100644 --- a/puppet/modules/packaging_tester/manifests/windows.pp +++ b/puppet/modules/packaging_tester/manifests/windows.pp @@ -3,6 +3,7 @@ class packaging_tester::windows inherits packaging_tester::base { include activepython include mingw include mingw48 + include mingw482 include openssl include strawberryperl include strawberryperl_portable |