diff options
Diffstat (limited to 'Utilities/Release/win/x86/deps')
-rw-r--r-- | Utilities/Release/win/x86/deps/Dockerfile | 127 | ||||
-rwxr-xr-x | Utilities/Release/win/x86/deps/qt-build.bat | 47 | ||||
-rw-r--r-- | Utilities/Release/win/x86/deps/qt-install.patch | 26 |
3 files changed, 0 insertions, 200 deletions
diff --git a/Utilities/Release/win/x86/deps/Dockerfile b/Utilities/Release/win/x86/deps/Dockerfile deleted file mode 100644 index 4b294c1..0000000 --- a/Utilities/Release/win/x86/deps/Dockerfile +++ /dev/null @@ -1,127 +0,0 @@ -# escape=` - -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. - -# Produce an image with custom-built dependencies for portable CMake binaries. -# Build using the directory containing this file as its own build context. - -ARG FROM_IMAGE_NAME=kitware/cmake:build-win-x86-base-2020-04-27 -ARG FROM_IMAGE_DIGEST=@sha256:c5a8948d636319cdac0180266996558bb6fb037125792b5b837f069d02e53d7c -ARG FROM_IMAGE=$FROM_IMAGE_NAME$FROM_IMAGE_DIGEST - -# Qt Source -FROM $FROM_IMAGE AS qt-src - -# JOM -ADD http://download.qt-project.org/official_releases/jom/unstable-jom.zip C:\jom\jom.zip -RUN cd \jom ` - && powershell -Command " ` - if ($(Get-FileHash jom.zip).Hash -eq '128fdd846fe24f8594eed37d1d8929a0ea78df563537c0c1b1861a635013fff8') {` - Expand-Archive -Path jom.zip -DestinationPath .` - } else {` - exit 1 ` - }" ` - && del jom.zip - -# XZ -ADD https://tukaani.org/xz/xz-5.2.5-windows.zip C:\xz\xz.zip -RUN cd \xz ` - && powershell -Command " ` - if ($(Get-FileHash xz.zip).Hash -eq 'd83b82ca75dfab39a13dda364367b34970c781a9df4d41264db922ac3a8f622d') {` - Expand-Archive -Path xz.zip -DestinationPath .` - } else {` - exit 1 ` - }" ` - && del xz.zip - -# Git -ADD https://github.com/git-for-windows/git/releases/download/v2.26.2.windows.1/MinGit-2.26.2-busybox-64-bit.zip C:\git\git.zip -RUN cd \git ` - && powershell -Command " ` - if ($(Get-FileHash git.zip).Hash -eq 'e834ea73fe093fb180dc45f67a1f2a7a566dab53d1d45bc3cd150106f5c40520') {` - Expand-Archive -Path git.zip -DestinationPath .` - } else {` - exit 1 ` - }" ` - && del git.zip - -# Qt Source -ADD https://download.qt.io/official_releases/qt/5.12/5.12.1/single/qt-everywhere-src-5.12.1.tar.xz C:\qt-src\qt.tar.xz -RUN cd \qt-src ` - && powershell -Command " ` - if ($(Get-FileHash qt.tar.xz).Hash -eq 'caffbd625c7bc10ff8c5c7a27dbc7d84fa4de146975c0e1ffe904b514ccd6da4') {` - \xz\bin_x86-64\xz -d qt.tar.xz ` - } else {` - exit 1 ` - }" ` - && tar xvf qt.tar ` - && del qt.tar ` - && move qt-everywhere-src-5.12.1 qt -COPY qt-build.bat qt-install.patch C:\qt-src\ - -# Qt Build i386 -FROM qt-src as qt-i386 -RUN \qt-src\qt-build.bat i386 - -# Qt Build x86_64 -FROM qt-src as qt-x86_64 -RUN \qt-src\qt-build.bat x86_64 - -# Output Stage -FROM $FROM_IMAGE - -# Qt -COPY --from=qt-i386 C:\qt-i386 C:\qt-i386 -COPY --from=qt-x86_64 C:\qt-x86_64 C:\qt-x86_64 - -# WIX -ADD https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip C:\wix\wix.zip -RUN cd \wix ` - && powershell -Command " ` - if ($(Get-FileHash wix.zip).Hash -eq '2c1888d5d1dba377fc7fa14444cf556963747ff9a0a289a3599cf09da03b9e2e') {` - Expand-Archive -Path wix.zip -DestinationPath .` - } else {` - exit 1 ` - }" ` - && del wix.zip - -# Python and Sphinx -ADD https://www.python.org/ftp/python/3.8.2/python-3.8.2-embed-amd64.zip C:\python3\python3.zip -RUN cd \python3 ` - && powershell -Command " ` - if ($(Get-FileHash python3.zip).Hash -eq '2927a3a6d0fe1f6e047a86059220aeda374eed23113b9ef5355acb8452d56453') {` - Expand-Archive -Path python3.zip -DestinationPath .` - } else {` - exit 1 ` - }" ` - && del python3.zip ` - && curl -O https://bootstrap.pypa.io/get-pip.py ` - && python get-pip.py ` - && del python38._pth ` - && set "PY_LIBS=C:\python3\Lib;C:\Python3\Lib\site-packages" ` - && set "PY_PIP=C:\python3\Scripts" ` - && Scripts\pip install --no-warn-script-location sphinx==2.1.2 - -# Ninja -ADD https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip C:\ninja\ninja.zip -RUN cd \ninja ` - && powershell -Command " ` - if ($(Get-FileHash ninja.zip).Hash -eq '919fd158c16bf135e8a850bb4046ec1ce28a7439ee08b977cd0b7f6b3463d178') {` - Expand-Archive -Path ninja.zip -DestinationPath .` - } else {` - exit 1 ` - }" ` - && del ninja.zip - -# CMake -ADD https://github.com/Kitware/CMake/releases/download/v3.17.1/cmake-3.17.1-win64-x64.zip C:\cmake\cmake.zip -RUN cd \cmake ` - && powershell -Command " ` - if ($(Get-FileHash cmake.zip).Hash -eq 'a5af7a2fe73f34070456397e940042e4469f072126c82974f44333ac43d478b1') {` - Expand-Archive -Path cmake.zip -DestinationPath .` - } else {` - exit 1 ` - }" ` - && move cmake-*-win64-x64 cmake ` - && del cmake.zip diff --git a/Utilities/Release/win/x86/deps/qt-build.bat b/Utilities/Release/win/x86/deps/qt-build.bat deleted file mode 100755 index e8bfa81..0000000 --- a/Utilities/Release/win/x86/deps/qt-build.bat +++ /dev/null @@ -1,47 +0,0 @@ -set ARCH=%1 -call \msvc-%ARCH%.bat && @echo on || exit /b -mkdir \qt-src\qt-build && ^ -cd \qt-src\qt-build && ^ -..\qt\configure.bat ^ - -prefix C:/qt-%ARCH% ^ - -static ^ - -static-runtime ^ - -release ^ - -opensource -confirm-license ^ - -platform win32-msvc ^ - -mp ^ - -gui ^ - -widgets ^ - -qt-pcre ^ - -qt-zlib ^ - -qt-libpng ^ - -qt-libjpeg ^ - -no-gif ^ - -no-icu ^ - -no-pch ^ - -no-angle ^ - -no-opengl ^ - -no-dbus ^ - -no-harfbuzz ^ - -no-accessibility ^ - -skip declarative ^ - -skip multimedia ^ - -skip qtcanvas3d ^ - -skip qtconnectivity ^ - -skip qtdeclarative ^ - -skip qtlocation ^ - -skip qtmultimedia ^ - -skip qtsensors ^ - -skip qtserialport ^ - -skip qtsvg ^ - -skip qtwayland ^ - -skip qtwebchannel ^ - -skip qtwebengine ^ - -skip qtwebsockets ^ - -skip qtxmlpatterns ^ - -nomake examples -nomake tests ^ - && ^ -\jom\jom.exe -J %NUMBER_OF_PROCESSORS% && ^ -\jom\jom.exe install && ^ -cd \qt-%ARCH% && ^ -\git\cmd\git apply \qt-src\qt-install.patch diff --git a/Utilities/Release/win/x86/deps/qt-install.patch b/Utilities/Release/win/x86/deps/qt-install.patch deleted file mode 100644 index 39a649e..0000000 --- a/Utilities/Release/win/x86/deps/qt-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/lib/cmake/Qt5Core/Qt5CoreConfig.cmake b/lib/cmake/Qt5Core/Qt5CoreConfig.cmake -index 04ec302..75d5596 100644 ---- a/lib/cmake/Qt5Core/Qt5CoreConfig.cmake -+++ b/lib/cmake/Qt5Core/Qt5CoreConfig.cmake -@@ -118,7 +118,7 @@ if (NOT TARGET Qt5::Core) - list(REMOVE_DUPLICATES Qt5Core_COMPILE_DEFINITIONS) - list(REMOVE_DUPLICATES Qt5Core_EXECUTABLE_COMPILE_FLAGS) - -- set(_Qt5Core_LIB_DEPENDENCIES "") -+ set(_Qt5Core_LIB_DEPENDENCIES "${_qt5Core_install_prefix}/lib/qtpcre2.lib;netapi32.lib;version.lib") - - - add_library(Qt5::Core STATIC IMPORTED) -diff --git a/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake b/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake -index a07b953..2e07371 100644 ---- a/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake -+++ b/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake -@@ -118,7 +118,7 @@ if (NOT TARGET Qt5::Widgets) - list(REMOVE_DUPLICATES Qt5Widgets_COMPILE_DEFINITIONS) - list(REMOVE_DUPLICATES Qt5Widgets_EXECUTABLE_COMPILE_FLAGS) - -- set(_Qt5Widgets_LIB_DEPENDENCIES "Qt5::Gui;Qt5::Core") -+ set(_Qt5Widgets_LIB_DEPENDENCIES "Qt5::Gui;Qt5::Core;dwmapi.lib;uxtheme.lib") - - - add_library(Qt5::Widgets STATIC IMPORTED) |