diff --git a/.travis.yml b/.travis.yml index 7721ab0..8d2d632 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - name: Windows (VS2017 Win32) os: windows env: - - ARCH: x86 + - PLATFORM: x86 - CMAKE_BUILD_TYPE: Release - PYTHON_BASE_DIR: "'/c/Python37'" - PYTHON_PACKAGE: "'python3 --version 3.7.0 --forcex86'" @@ -30,7 +30,7 @@ matrix: - name: Windows (VS2017 x64) os: windows env: - - ARCH: x64 + - PLATFORM: x64 - CMAKE_BUILD_TYPE: Release - PYTHON_BASE_DIR: "'/c/Python37'" - PYTHON_PACKAGE: "'python3 --version 3.7.0'" @@ -46,7 +46,7 @@ before_install: brew update; fi - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then - export ARCH=${ARCH}; + export PLATFORM=${PLATFORM}; export PATH=$PATH:${QT5_BASE_DIR}/bin:${MSBUILD_PATH}; export PYTHON_PACKAGE=${PYTHON_PACKAGE}; export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}; @@ -71,14 +71,14 @@ install: wget https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.9.2.tar.gz; 7z x libressl-2.9.2.tar.gz && 7z x libressl-2.9.2.tar; cd libressl-2.9.2; - cmake . -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${ARCH}; + cmake . -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${PLATFORM}; cmake --build . --config $CMAKE_BUILD_TYPE --target install; export OPENSSL_ROOT_DIR=$(pwd); cd ..; wget http://www.zlib.net/zlib1211.zip; unzip zlib1211.zip; cd zlib-1.2.11; - cmake . -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${ARCH}; + cmake . -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${PLATFORM}; cmake --build . --config $CMAKE_BUILD_TYPE --target install; export ZLIB_BASE_DIR=$(pwd); cd ..; @@ -86,7 +86,7 @@ install: unzip quazip-0.7.3.zip; cd quazip-0.7.3; sed -i '/ZLIB_LIBRARIES ""/d' ./CMakeLists.txt; - cmake . -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${ARCH} -DCMAKE_PREFIX_PATH=${QT5_BASE_DIR}/lib/cmake -DZLIB_INCLUDE_DIRS=${ZLIB_BASE_DIR} -DZLIB_LIBRARIES=${ZLIB_BASE_DIR}/Release/zlib.lib; + cmake . -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${PLATFORM} -DCMAKE_PREFIX_PATH=${QT5_BASE_DIR}/lib/cmake -DZLIB_INCLUDE_DIRS=${ZLIB_BASE_DIR} -DZLIB_LIBRARIES=${ZLIB_BASE_DIR}/Release/zlib.lib; cmake --build . --config $CMAKE_BUILD_TYPE --target install; export QUAZIP_BASE_DIR=$(pwd); cd ..; @@ -118,7 +118,7 @@ script: cmake . -DCMAKE_PREFIX_PATH="$(brew --prefix qt)" -DPYTHON_INCLUDE_DIR=./pythonincludes -DPythonQt_Python3=OFF -DPYTHONQT_WITH_WEBKIT=OFF -DBUILD_SHARED_LIBS=ON; sudo cmake --build . --config $CMAKE_BUILD_TYPE --target install; elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then - cmake . -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${ARCH} -DPythonQt_Python3=ON -DPYTHONQT_WITH_WEBKIT=OFF -DBUILD_SHARED_LIBS=ON -DPYTHON_INCLUDE_DIR=${PYTHON_BASE_DIR}/include -DPYTHON_LIBRARY=${PYTHON_BASE_DIR}/libs/python37.lib; + cmake . -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${PLATFORM} -DPythonQt_Python3=ON -DPYTHONQT_WITH_WEBKIT=OFF -DBUILD_SHARED_LIBS=ON -DPYTHON_INCLUDE_DIR=${PYTHON_BASE_DIR}/include -DPYTHON_LIBRARY=${PYTHON_BASE_DIR}/libs/python37.lib; cmake --build . --config $CMAKE_BUILD_TYPE --target install; fi - export PYTHONQT_BASE_DIR=$(pwd) @@ -137,7 +137,7 @@ script: cmake .. -DCMAKE_PREFIX_PATH="$(brew --prefix qt)" -DPYTHON_USE_PYTHON3=OFF -DPYTHON_INCLUDE_DIR=./PythonQt/pythonincludes -DPYTHONQT_LIBRARY=/usr/local/lib/libQt5Python27.dylib -DPYTHONQT_INCLUDE_DIR=/usr/local/include/Qt5Python27/PythonQt -DPYTHONQT_QTALL_LIBRARY=/usr/local/lib/libQt5Python27_QtAll.dylib -DPYTHONQT_QTALL_INCLUDE_DIR=/usr/local/include/Qt5Python27/PythonQt; make; elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then - cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${ARCH} -DCMAKE_PREFIX_PATH=${QT5_BASE_DIR}/lib/cmake -DZLIB_INCLUDE_DIRS=${ZLIB_BASE_DIR} -DQUAZIP_INCLUDE_DIR=${QUAZIP_BASE_DIR}/include/quazip5 -DQUAZIP_LIBRARY=${QUAZIP_BASE_DIR}/lib/quazip5.lib -DPYTHON_INCLUDE_DIR=${PYTHON_BASE_DIR}/include -DPYTHON_LIBRARY=${PYTHON_BASE_DIR}/libs/python37.lib -DPYTHONQT_INCLUDE_DIR=${PYTHONQT_BASE_DIR}/src -DPYTHONQT_LIBRARY=${PYTHONQT_BASE_DIR}/lib/Qt5Python37.lib -DPYTHONQT_QTALL_INCLUDE_DIR=${PYTHONQT_BASE_DIR}/extensions/PythonQt_QtAll -DPYTHONQT_QTALL_LIBRARY=${PYTHONQT_BASE_DIR}/lib/Qt5Python37_QtAll.lib; + cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DCMAKE_GENERATOR_PLATFORM=${PLATFORM} -DCMAKE_PREFIX_PATH=${QT5_BASE_DIR}/lib/cmake -DZLIB_INCLUDE_DIRS=${ZLIB_BASE_DIR} -DQUAZIP_INCLUDE_DIR=${QUAZIP_BASE_DIR}/include/quazip5 -DQUAZIP_LIBRARY=${QUAZIP_BASE_DIR}/lib/quazip5.lib -DPYTHON_INCLUDE_DIR=${PYTHON_BASE_DIR}/include -DPYTHON_LIBRARY=${PYTHON_BASE_DIR}/libs/python37.lib -DPYTHONQT_INCLUDE_DIR=${PYTHONQT_BASE_DIR}/src -DPYTHONQT_LIBRARY=${PYTHONQT_BASE_DIR}/lib/Qt5Python37.lib -DPYTHONQT_QTALL_INCLUDE_DIR=${PYTHONQT_BASE_DIR}/extensions/PythonQt_QtAll -DPYTHONQT_QTALL_LIBRARY=${PYTHONQT_BASE_DIR}/lib/Qt5Python37_QtAll.lib; cmake --build . --config $CMAKE_BUILD_TYPE; fi diff --git a/tools/qt-installer-windows.qs b/tools/qt-installer-windows.qs index 5438670..8164790 100644 --- a/tools/qt-installer-windows.qs +++ b/tools/qt-installer-windows.qs @@ -1,6 +1,6 @@ /* * Qt Installer script for a non-interactive installation of Qt5 on Windows. - * Installs the 64-bit package if environment variable ARCH="x64". + * Installs the 64-bit package if environment variable PLATFORM="x64". */ // jshint strict:false @@ -13,7 +13,7 @@ // https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/qt5_5123/Updates.xml // Unfortunately it is not possible to disable deps like qt.tools.qtcreator var INSTALL_COMPONENTS = [ - installer.environmentVariable("ARCH") == "x64" ? + installer.environmentVariable("PLATFORM") == "x64" ? "qt.qt5.5123.win64_msvc2017_64" : "qt.qt5.5123.win32_msvc2017", ];