[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [sysadmin/binary-factory-tooling] custom-jobs/krita: Switch to Mingw 8.1.0
From: Ben Cooksley <null () kde ! org>
Date: 2018-09-11 9:24:03
Message-ID: E1fzetv-0003kp-TF () code ! kde ! org
[Download RAW message or body]
Git commit 2e55229f9d9f0181e6fc2007749142da0fe5aef0 by Ben Cooksley.
Committed on 11/09/2018 at 09:23.
Pushed by bcooksley into branch 'master'.
Switch to Mingw 8.1.0
M +2 -2 custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline
M +1 -1 custom-jobs/krita/Krita_Nightly_Windows_Dependency_Build.pipeline
M +3 -3 custom-jobs/krita/Krita_Release_Windows32_Build.pipeline
M +1 -1 custom-jobs/krita/Krita_Release_Windows32_Dependency_Build.pipeline
M +3 -3 custom-jobs/krita/Krita_Release_Windows64_Build.pipeline
M +2 -2 custom-jobs/krita/Krita_Stable_Windows_Build.pipeline
https://commits.kde.org/sysadmin/binary-factory-tooling/2e55229f9d9f0181e6fc2007749142da0fe5aef0
diff --git a/custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline \
b/custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline index e78936e..c3fb338 \
100644
--- a/custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline
+++ b/custom-jobs/krita/Krita_Nightly_Windows_Build.pipeline
@@ -42,7 +42,7 @@ timestamps {
// Then we can run it
// We also set SIGNTOOL_SIGN_FLAGS which is used by the package signing script \
when invoking signtool.exe bat """
- set PATH=C:/MingW/x86_64-7.2.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
+ set PATH=C:/MingW/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH%
set SEVENZIP_EXE=C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/7za.exe
set GETTEXT_SEARCH_PATH=C:\\Craft\\Krita\\windows-msvc2017_64-cl\\bin
@@ -73,7 +73,7 @@ timestamps {
)
popd
- set PATH=C:/MingW/x86_64-7.2.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
+ set PATH=C:/MingW/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
set PACKAGE_NAME=krita-nightly-x64-%PACKAGE_SUFFIX%
cd C:\\Packaging\\KritaWS
diff --git a/custom-jobs/krita/Krita_Nightly_Windows_Dependency_Build.pipeline \
b/custom-jobs/krita/Krita_Nightly_Windows_Dependency_Build.pipeline index \
31ea2e4..4a481a6 100644
--- a/custom-jobs/krita/Krita_Nightly_Windows_Dependency_Build.pipeline
+++ b/custom-jobs/krita/Krita_Nightly_Windows_Dependency_Build.pipeline
@@ -28,7 +28,7 @@ timestamps {
// SEVENZIP_EXE set to guide it to 7-Zip's console utility. It's detection \
support doesn't work as our binary is named 7za.exe instead of the apparently \
standard 7z.exe // Then we can run it
bat """
- set PATH=C:/MingW/x86_64-7.2.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
+ set PATH=C:/MingW/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH%
set SEVENZIP_EXE=C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/7za.exe
set GETTEXT_SEARCH_PATH=C:/Craft/Krita/windows-msvc2017_64-cl/bin/
diff --git a/custom-jobs/krita/Krita_Release_Windows32_Build.pipeline \
b/custom-jobs/krita/Krita_Release_Windows32_Build.pipeline index 8fb5122..875e762 \
100644
--- a/custom-jobs/krita/Krita_Release_Windows32_Build.pipeline
+++ b/custom-jobs/krita/Krita_Release_Windows32_Build.pipeline
@@ -22,7 +22,7 @@ timestamps {
// Now we download the release tarball, unpack it and rename the directory to \
something more convenient to use everywhere else bat """
- set PATH=C:/MingW/i686-7.2.0-posix-dwarf-rt_v5-rev1/mingw32/bin;C:/PROGRA~2/Pytho \
n36-32/;C:/Craft/Krita/windows-msvc2017_32-cl/bin/;C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin/;%PATH%
+ set PATH=C:/MingW/i686-8.1.0-posix-dwarf-rt_v6-rev0/mingw32/bin;C:/PROGRA~2/Pyth \
on36-32/;C:/Craft/Krita/windows-msvc2017_32-cl/bin/;C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin/;%PATH%
set CA_CERT_BUNDLE=C:/Craft/Krita/windows-msvc2017_32-cl/etc/cacert.pem
wget --ca-certificate %CA_CERT_BUNDLE% \
"https://origin.download.kde.org/${buildParameters['Release']}/krita/${buildParameters['Version']}/krita-${buildParameters['Version']}.tar.gz"
@@ -56,7 +56,7 @@ timestamps {
// Then we can run it
// We also set SIGNTOOL_SIGN_FLAGS which is used by the package signing script \
when invoking signtool.exe bat """
- set PATH=C:/MingW/i686-7.2.0-posix-dwarf-rt_v5-rev1/mingw32/bin;C:/PROGRA~2/Pytho \
n36-32/;C:/Craft/Krita/windows-msvc2017_32-cl/bin/;C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin/;%PATH%
+ set PATH=C:/MingW/i686-8.1.0-posix-dwarf-rt_v6-rev0/mingw32/bin;C:/PROGRA~2/Pyth \
on36-32/;C:/Craft/Krita/windows-msvc2017_32-cl/bin/;C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin/;%PATH%
set SEVENZIP_EXE=C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin/7za.exe
set GETTEXT_SEARCH_PATH=C:/Craft/Krita/windows-msvc2017_32-cl/bin/;C:/PROGRA~2/Python36-32/
@@ -76,7 +76,7 @@ timestamps {
stage('Generating Installer') {
// Let's build an installer!
bat """
- set PATH=C:/MingW/i686-7.2.0-posix-dwarf-rt_v5-rev1/mingw32/bin;C:/PROGRA~2/Pytho \
n36-32/;C:/Craft/Krita/windows-msvc2017_32-cl/bin/;C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin/;%PATH%
+ set PATH=C:/MingW/i686-8.1.0-posix-dwarf-rt_v6-rev0/mingw32/bin;C:/PROGRA~2/Pyth \
on36-32/;C:/Craft/Krita/windows-msvc2017_32-cl/bin/;C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin/;%PATH%
set PACKAGE_NAME=krita-x86-${buildParameters['Version']}
cd C:\\Packaging\\KritaWS
diff --git a/custom-jobs/krita/Krita_Release_Windows32_Dependency_Build.pipeline \
b/custom-jobs/krita/Krita_Release_Windows32_Dependency_Build.pipeline index \
5931171..8b030fa 100644
--- a/custom-jobs/krita/Krita_Release_Windows32_Dependency_Build.pipeline
+++ b/custom-jobs/krita/Krita_Release_Windows32_Dependency_Build.pipeline
@@ -28,7 +28,7 @@ timestamps {
// SEVENZIP_EXE set to guide it to 7-Zip's console utility. It's detection \
support doesn't work as our binary is named 7za.exe instead of the apparently \
standard 7z.exe // Then we can run it
bat """
- set PATH=C:/MingW/i686-7.2.0-posix-dwarf-rt_v5-rev1/mingw32/bin;C:/PROGRA~2/Pytho \
n36-32/;C:/Craft/Krita/windows-msvc2017_32-cl/bin;C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin;%PATH%
+ set PATH=C:/MingW/i686-8.1.0-posix-dwarf-rt_v6-rev0/mingw32/bin;C:/PROGRA~2/Pyth \
on36-32/;C:/Craft/Krita/windows-msvc2017_32-cl/bin;C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin;%PATH%
set SEVENZIP_EXE=C:/Craft/Krita/windows-msvc2017_32-cl/dev-utils/bin/7za.exe
set GETTEXT_SEARCH_PATH=C:/Craft/Krita/windows-msvc2017_32-cl/bin/;C:/PROGRA~2/Python36-32/
diff --git a/custom-jobs/krita/Krita_Release_Windows64_Build.pipeline \
b/custom-jobs/krita/Krita_Release_Windows64_Build.pipeline index 1b8f3ed..9d063d0 \
100644
--- a/custom-jobs/krita/Krita_Release_Windows64_Build.pipeline
+++ b/custom-jobs/krita/Krita_Release_Windows64_Build.pipeline
@@ -22,7 +22,7 @@ timestamps {
// Now we download the release tarball, unpack it and rename the directory to \
something more convenient to use everywhere else bat """
- set PATH=C:/MingW/x86_64-7.2.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
+ set PATH=C:/MingW/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH%
set CA_CERT_BUNDLE=C:/Craft/Krita/windows-msvc2017_64-cl/etc/cacert.pem
wget --ca-certificate %CA_CERT_BUNDLE% \
"https://origin.download.kde.org/${buildParameters['Release']}/krita/${buildParameters['Version']}/krita-${buildParameters['Version']}.tar.gz"
@@ -56,7 +56,7 @@ timestamps {
// Then we can run it
// We also set SIGNTOOL_SIGN_FLAGS which is used by the package signing script \
when invoking signtool.exe bat """
- set PATH=C:/MingW/x86_64-7.2.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
+ set PATH=C:/MingW/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH%
set SEVENZIP_EXE=C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/7za.exe
set GETTEXT_SEARCH_PATH=C:\\Craft\\Krita\\windows-msvc2017_64-cl\\bin
@@ -75,7 +75,7 @@ timestamps {
stage('Generating Installer') {
// Let's build an installer!
bat """
- set PATH=C:/MingW/x86_64-7.2.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
+ set PATH=C:/MingW/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
set PACKAGE_NAME=krita-x64-${buildParameters['Version']}
cd C:\\Packaging\\KritaWS
diff --git a/custom-jobs/krita/Krita_Stable_Windows_Build.pipeline \
b/custom-jobs/krita/Krita_Stable_Windows_Build.pipeline index b1ea1c7..f979807 100644
--- a/custom-jobs/krita/Krita_Stable_Windows_Build.pipeline
+++ b/custom-jobs/krita/Krita_Stable_Windows_Build.pipeline
@@ -42,7 +42,7 @@ timestamps {
// Then we can run it
// We also set SIGNTOOL_SIGN_FLAGS which is used by the package signing script \
when invoking signtool.exe bat """
- set PATH=C:/MingW/x86_64-7.2.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
+ set PATH=C:/MingW/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH%
set SEVENZIP_EXE=C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/7za.exe
set GETTEXT_SEARCH_PATH=C:\\Craft\\Krita\\windows-msvc2017_64-cl\\bin
@@ -73,7 +73,7 @@ timestamps {
)
popd
- set PATH=C:/MingW/x86_64-7.2.0-posix-seh-rt_v5-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
+ set PATH=C:/MingW/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64/bin;C:/Craft/Krita/wi \
ndows-msvc2017_64-cl/bin/;C:/Craft/Krita/windows-msvc2017_64-cl/dev-utils/bin/;%PATH% \
set PACKAGE_NAME=krita-nightly-x64-%PACKAGE_SUFFIX%
cd C:\\Packaging\\KritaWS
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic