Git commit a0dbdcd659c0f04705550eb3b6dc61562c182a25 by Ben Cooksley. Committed on 14/05/2014 at 08:34. Pushed by bcooksley into branch 'production'. Add support for windows-mingw-w64 A +9 -0 config/build/windows-mingw-w64.cfg M +1 -1 tools/environment-generator.py M +1 -1 tools/perform-build.py M +1 -1 tools/prepare-environment.py M +1 -1 tools/shell.py http://commits.kde.org/websites/build-kde-org/a0dbdcd659c0f04705550eb3b6dc6= 1562c182a25 diff --git a/config/build/windows-mingw-w64.cfg b/config/build/windows-ming= w-w64.cfg new file mode 100644 index 0000000..57e1454 --- /dev/null +++ b/config/build/windows-mingw-w64.cfg @@ -0,0 +1,9 @@ +[DEFAULT] +opSys=3Dwindows +architecture=3Dx86_64 +compiler=3Dmingw +scriptsLocation=3DC:\Jenkins\scripts\ + +[General] + +installPrefix=3D:C\Jenkins\install\%(opSys)s\%(architecture)s\%(compiler)s\ diff --git a/tools/environment-generator.py b/tools/environment-generator.py index cad726f..37dcbae 100644 --- a/tools/environment-generator.py +++ b/tools/environment-generator.py @@ -9,7 +9,7 @@ parser.add_argument('--project', type=3Dstr, required=3DTru= e) parser.add_argument('--branchGroup', type=3Dstr, required=3DTrue) parser.add_argument('--sources', type=3Dstr, default=3D'/tmp') parser.add_argument('--variation', type=3Dstr) -parser.add_argument('--platform', type=3Dstr, choices=3D['linux64-g++', 'd= arwin-mavericks'], default=3D'linux64-g++') +parser.add_argument('--platform', type=3Dstr, choices=3D['linux64-g++', 'd= arwin-mavericks', 'windows-mingw-w64'], default=3D'linux64-g++') arguments =3D parser.parse_args() = # Load our configuration, projects and dependencies diff --git a/tools/perform-build.py b/tools/perform-build.py index 5857400..a709eea 100644 --- a/tools/perform-build.py +++ b/tools/perform-build.py @@ -9,7 +9,7 @@ parser.add_argument('--project', type=3Dstr) parser.add_argument('--branchGroup', type=3Dstr, default=3D'latest-qt4') parser.add_argument('--sources', type=3Dstr) parser.add_argument('--variation', type=3Dstr) -parser.add_argument('--platform', type=3Dstr, choices=3D['linux64-g++', 'd= arwin-mavericks'], default=3D'linux64-g++') +parser.add_argument('--platform', type=3Dstr, choices=3D['linux64-g++', 'd= arwin-mavericks', 'windows-mingw-w64'], default=3D'linux64-g++') = # Parse the arguments environmentArgs =3D check_jenkins_environment() diff --git a/tools/prepare-environment.py b/tools/prepare-environment.py index 3e42fc2..f31f66f 100644 --- a/tools/prepare-environment.py +++ b/tools/prepare-environment.py @@ -10,7 +10,7 @@ parser.add_argument('--project', type=3Dstr) parser.add_argument('--branchGroup', type=3Dstr, default=3D'latest-qt4') parser.add_argument('--sources', type=3Dstr) parser.add_argument('--delay', type=3Dint, default=3D10) -parser.add_argument('--platform', type=3Dstr, choices=3D['linux64-g++', 'd= arwin-mavericks'], default=3D'linux64-g++') +parser.add_argument('--platform', type=3Dstr, choices=3D['linux64-g++', 'd= arwin-mavericks', 'windows-mingw-w64'], default=3D'linux64-g++') = # Parse the arguments environmentArgs =3D check_jenkins_environment() diff --git a/tools/shell.py b/tools/shell.py index 351b229..00d54e9 100644 --- a/tools/shell.py +++ b/tools/shell.py @@ -9,7 +9,7 @@ parser.add_argument('--project', type=3Dstr, required=3DTru= e) parser.add_argument('--branchGroup', type=3Dstr, required=3DTrue) parser.add_argument('--sources', type=3Dstr, required=3DTrue) parser.add_argument('--variation', type=3Dstr) -parser.add_argument('--platform', type=3Dstr, choices=3D['linux64-g++', 'd= arwin-mavericks'], default=3D'linux64-g++') +parser.add_argument('--platform', type=3Dstr, choices=3D['linux64-g++', 'd= arwin-mavericks', 'windows-mingw-w64'], default=3D'linux64-g++') arguments =3D parser.parse_args() = # Load our configuration, projects and dependencies